[Custom Tabs] Allow clients to display RemoteViews on the bottom bar

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.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.customtabs;
 
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.app.PendingIntent.CanceledException;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.support.customtabs.CustomTabsIntent;
 import android.text.TextUtils;
 import android.util.Pair;
+import android.widget.RemoteViews;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.chrome.browser.widget.TintedDrawable;
 
@@ skipping 36 matching lines @@
     private int mToolbarColor;
     private int mBottomBarColor;
     private boolean mEnableUrlBarHiding;
     private List<CustomButtonParams> mCustomButtonParams;
     private Drawable mCloseButtonIcon;
     private List<Pair<String, PendingIntent>> mMenuEntries = new ArrayList<>();
     private Bundle mAnimationBundle;
     private boolean mShowShareItem;
     private CustomButtonParams mToolbarButton;
     private List<CustomButtonParams> mBottombarButtons = new ArrayList<>(2);
+    private RemoteViews mRemoteViews;
     // OnFinished listener for PendingIntents. Used for testing only.
     private PendingIntent.OnFinished mOnFinished;
 
     /** Herb: "Open in Browser" will send the Tab to the Browser and kill this Activity. */
     private boolean mFinishAfterOpeningInBrowser;
 
     /** Herb: Whether or not this CustomTabActivity was opened by the Browser directly. */
     private boolean mIsOpenedByBrowser;
 
     /**
@@ skipping 37 matching lines @@
                 mMenuEntries.add(new Pair<String, PendingIntent>(title, pendingIntent));
             }
         }
 
         mAnimationBundle = IntentUtils.safeGetBundleExtra(
                 intent, CustomTabsIntent.EXTRA_EXIT_ANIMATION_BUNDLE);
         mTitleVisibilityState = IntentUtils.safeGetIntExtra(intent,
                 CustomTabsIntent.EXTRA_TITLE_VISIBILITY_STATE, CustomTabsIntent.NO_TITLE);
         mShowShareItem = IntentUtils.safeGetBooleanExtra(intent,
                 CustomTabsIntent.EXTRA_DEFAULT_SHARE_MENU_ITEM, false);
+        mRemoteViews = IntentUtils.safeGetParcelableExtra(intent,
+                CustomTabsIntent.EXTRA_SECONDARY_TOOLBAR_REMOTEVIEWS);
     }
 
     /**
      * Gets custom buttons from the intent and updates {@link #mCustomButtonParams},
      * {@link #mBottombarButtons} and {@link #mToolbarButton}.
      */
     private void retrieveCustomButtons(Intent intent, Context context) {
         mCustomButtonParams = CustomButtonParams.fromIntent(context, intent);
         if (mCustomButtonParams != null) {
             for (CustomButtonParams params : mCustomButtonParams) {
@@ skipping 102 matching lines @@
      * @return The list of params representing the buttons on the bottombar.
      */
     public List<CustomButtonParams> getCustomButtonsOnBottombar() {
         return mBottombarButtons;
     }
 
     /**
      * @return Whether the bottom bar should be shown.
      */
     public boolean shouldShowBottomBar() {
-        return !mBottombarButtons.isEmpty();
+        return !mBottombarButtons.isEmpty() || mRemoteViews != null;
     }
 
     /**
      * @return The color of the bottom bar, or {@link #getToolbarColor()} if not specified.
      */
     public int getBottomBarColor() {
         return mBottomBarColor;
     }
 
     /**
+     * @return The {@link RemoteViews} to show on the bottom bar, or null if the extra is not
+     *         specified.
+     */
+    public RemoteViews getBottomBarRemoteViews() {
+        return mRemoteViews;
+    }
+
+    /**
      * Gets params for all custom buttons, which is the combination of
      * {@link #getCustomButtonsOnBottombar()} and {@link #getCustomButtonOnToolbar()}.
      */
     public List<CustomButtonParams> getAllCustomButtons() {
         return mCustomButtonParams;
     }
 
     /**
      * @return The {@link CustomButtonParams} having the given id. Returns null if no such params
      *         can be found.
@@ skipping 121 matching lines @@
      */
     private void parseHerbExtras(Intent intent) {
         if (TextUtils.isEmpty(ChromePreferenceManager.getHerbFlavor())) return;
 
         mFinishAfterOpeningInBrowser =  IntentUtils.safeGetBooleanExtra(
                 intent, EXTRA_FINISH_AFTER_OPENING_IN_BROWSER, false);
         mIsOpenedByBrowser = IntentUtils.safeGetBooleanExtra(
                 intent, EXTRA_OPENED_BY_BROWSER, false);
     }
 }