webapps: utilize manifest theme colors

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInfo.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.webapps;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
@@ skipping 11 matching lines @@
  * Stores info about a web app.
  */
 public class WebappInfo {
     private boolean mIsInitialized;
     private String mId;
     private Bitmap mIcon;
     private Uri mUri;
     private String mTitle;
     private int mOrientation;
     private int mSource;
+    private long mThemeColor;
 
     public static WebappInfo createEmpty() {
         return new WebappInfo();
     }
 
     /**
      * Construct a WebappInfo.
      * @param intent Intent containing info about the app.
      */
     public static WebappInfo create(Intent intent) {
         String id = intent.getStringExtra(ShortcutHelper.EXTRA_ID);
         String icon = intent.getStringExtra(ShortcutHelper.EXTRA_ICON);
         String title = intent.getStringExtra(ShortcutHelper.EXTRA_TITLE);
         String url = intent.getStringExtra(ShortcutHelper.EXTRA_URL);
         int orientation = intent.getIntExtra(
                 ShortcutHelper.EXTRA_ORIENTATION, ScreenOrientationValues.DEFAULT);
         int source = intent.getIntExtra(
                 ShortcutHelper.EXTRA_SOURCE, ShortcutHelper.SOURCE_UNKNOWN);
-        return create(id, url, icon, title, orientation, source);
+        long themeColor = intent.getLongExtra(ShortcutHelper.EXTRA_THEME_COLOR,
+                ShortcutHelper.THEME_COLOR_INVALID_OR_MISSING);
+        return create(id, url, icon, title, orientation, source, themeColor);
     }
 
     /**
      * Construct a WebappInfo.
      * @param id ID for the webapp.
      * @param url URL for the webapp.
      * @param icon Icon to show for the webapp.
      * @param title Title of the webapp.
+     * @param themeColor The theme color of the webapp.
      * @param orientation Orientation of the webapp.
      * @param source Source where the webapp was added from.
      */
     public static WebappInfo create(String id, String url, String icon, String title,
-            int orientation, int source) {
+            int orientation, int source, long themeColor) {
         if (id == null || url == null) {
             Log.e("WebappInfo", "Data passed in was incomplete: " + id + ", " + url);
             return null;
         }
 
         Bitmap favicon = null;
         if (!TextUtils.isEmpty(icon)) {
             byte[] decoded = Base64.decode(icon, Base64.DEFAULT);
             favicon = BitmapFactory.decodeByteArray(decoded, 0, decoded.length);
         }
 
         Uri uri = Uri.parse(url);
-        return new WebappInfo(id, uri, favicon, title, orientation, source);
+        return new WebappInfo(id, uri, favicon, title, orientation, source, themeColor);
     }
 
-    private WebappInfo(String id, Uri uri, Bitmap icon, String title, int orientation, int source) {
+    private WebappInfo(String id, Uri uri, Bitmap icon, String title,
+            int orientation, int source, long themeColor) {
         mIcon = icon;
         mId = id;
         mTitle = title;
         mUri = uri;
         mOrientation = orientation;
         mSource = source;
+        mThemeColor = themeColor;
         mIsInitialized = mUri != null;
     }
 
     private WebappInfo() {
     }
 
     /**
      * Writes all of the data about the webapp into the given Bundle.
      * @param outState Bundle to write data into.
      */
     void writeToBundle(Bundle outState) {
         if (!mIsInitialized) return;
 
         outState.putString(ShortcutHelper.EXTRA_ID, mId);
         outState.putString(ShortcutHelper.EXTRA_URL, mUri.toString());
         outState.putParcelable(ShortcutHelper.EXTRA_ICON, mIcon);
         outState.putString(ShortcutHelper.EXTRA_TITLE, mTitle);
         outState.putInt(ShortcutHelper.EXTRA_ORIENTATION, mOrientation);
         outState.putInt(ShortcutHelper.EXTRA_SOURCE, mSource);
+        outState.putLong(ShortcutHelper.EXTRA_THEME_COLOR, mThemeColor);
     }
 
     /**
      * Copies all the fields from the given WebappInfo into this instance.
      * @param newInfo Information about the new webapp.
      */
     void copy(WebappInfo newInfo) {
         mIsInitialized = newInfo.mIsInitialized;
         mIcon = newInfo.mIcon;
         mId = newInfo.mId;
         mUri = newInfo.mUri;
         mTitle = newInfo.mTitle;
+        mThemeColor = newInfo.mThemeColor;
         mOrientation = newInfo.mOrientation;
         mSource = newInfo.mSource;
+        mThemeColor = newInfo.mThemeColor;

[mlamouri (slow - plz ping), 2015/07/20 13:03:30]

You still have one too many mThemeColor here.

[Lalit Maganti, 2015/07/20 13:15:19]

Not sure why the previous patch didn't have that. Maybe the file didn't save?
Anyway done.

     }
 
     public boolean isInitialized() {
         return mIsInitialized;
     }
 
     public String id() {
         return mId;
     }
 
@@ skipping 10 matching lines @@
     }
 
     public int orientation() {
         return mOrientation;
     }
 
     public int source() {
         return mSource;
     }
 
+    public long themeColor() {
+        return mThemeColor;
+    }
+
     // This is needed for clients that want to send the icon trough an intent.
     public String getEncodedIcon() {
         if (mIcon == null) return "";
 
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
         mIcon.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream);
         byte[] byteArray = byteArrayOutputStream.toByteArray();
         return Base64.encodeToString(byteArray, Base64.DEFAULT);
     }
 }