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

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.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.PendingIntent;
 import android.app.PendingIntent.CanceledException;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.IBinder;
 import android.os.StrictMode;
 import android.support.customtabs.CustomTabsCallback;
 import android.support.customtabs.CustomTabsIntent;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.ViewStub;
 import android.view.Window;
 import android.widget.ImageButton;
+import android.widget.RemoteViews;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.IntentHandler;
@@ skipping 111 matching lines @@
      */
     static boolean updateCustomButton(IBinder session, int id, Bitmap bitmap, String description) {
         ThreadUtils.assertOnUiThread();
         // Do nothing if there is no activity or the activity does not belong to this session.
         if (sActiveContentHandler == null || !sActiveContentHandler.getSession().equals(session)) {
             return false;
         }
         return sActiveContentHandler.updateCustomButton(id, bitmap, description);
     }
 
+    /**
+     * Checks whether the active {@link CustomTabContentHandler} belongs to the given session, and
+     * if true, updates {@link RemoteViews} on the secondary toolbar.
+     * @return Whether the update is successful.
+     */
+    static boolean updateRemoteViews(IBinder session, RemoteViews remoteViews) {
+        ThreadUtils.assertOnUiThread();
+        // Do nothing if there is no activity or the activity does not belong to this session.
+        if (sActiveContentHandler == null || !sActiveContentHandler.getSession().equals(session)) {
+            return false;
+        }
+        return sActiveContentHandler.updateRemoteViews(remoteViews);
+    }
+
     @Override
     public boolean isCustomTab() {
         return true;
     }
 
     @Override
     public void onStart() {
         super.onStart();
         CustomTabsConnection.getInstance(getApplication())
                 .keepAliveForSession(mIntentDataProvider.getSession(),
@@ skipping 100 matching lines @@
                 if (params.showOnToolbar()) {
                     if (!CustomButtonParams.doesIconFitToolbar(CustomTabActivity.this, bitmap)) {
                         return false;
                     }
                     showCustomButtonOnToolbar();
                 } else {
                     updateBottomBarButton(params);
                 }
                 return true;
             }
+
+            @Override
+            public boolean updateRemoteViews(RemoteViews rv) {
+                if (mIntentDataProvider.getBottomBarRemoteViews() == null) {
+                    // Update only makes sense if we are already showing a RemoteViews.
+                    return false;
+                }
+                ViewGroup bottomBar = (ViewGroup) findViewById(R.id.bottombar);
+                View view = rv.apply(CustomTabActivity.this, bottomBar);
+                bottomBar.removeAllViews();
+                bottomBar.addView(view);
+                return true;
+            }
         };
         DataUseTabUIManager.onCustomTabInitialNavigation(mainTab,
                 CustomTabsConnection.getInstance(getApplication())
                         .getClientPackageNameForSession(mSession),
                 IntentHandler.getUrlFromIntent(getIntent()));
         mainTab.setAppAssociatedWith(CustomTabsConnection.getInstance(getApplication())
                 .getClientPackageNameForSession(mSession));
         recordClientPackageName();
         loadUrlInCurrentTab(new LoadUrlParams(IntentHandler.getUrlFromIntent(getIntent())),
                 IntentHandler.getTimestampFromIntent(getIntent()));
@@ skipping 213 matching lines @@
         if (!mIntentDataProvider.shouldShowBottomBar()) return;
 
         ViewStub bottomBarStub = ((ViewStub) findViewById(R.id.bottombar_stub));
         bottomBarStub.setLayoutResource(R.layout.custom_tabs_bottombar);
         bottomBarStub.inflate();
 
         View shadow = findViewById(R.id.bottombar_shadow);
         shadow.setVisibility(View.VISIBLE);
 
         ViewGroup bottomBar = (ViewGroup) findViewById(R.id.bottombar);
-        bottomBar.setBackgroundColor(mIntentDataProvider.getBottomBarColor());
-        List<CustomButtonParams> items = mIntentDataProvider.getCustomButtonsOnBottombar();
-        for (CustomButtonParams params : items) {
-            if (params.showOnToolbar()) continue;
-            final PendingIntent pendingIntent = params.getPendingIntent();
-            OnClickListener clickListener = null;
-            if (pendingIntent != null) {
-                clickListener = new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        Intent addedIntent = new Intent();
-                        addedIntent.setData(Uri.parse(getActivityTab().getUrl()));
-                        try {
-                            pendingIntent.send(CustomTabActivity.this, 0, addedIntent, null, null);
-                        } catch (CanceledException e) {
-                            Log.e(TAG,
-                                    "CanceledException while sending pending intent in custom tab");
+        RemoteViews remoteViews = mIntentDataProvider.getBottomBarRemoteViews();
+        if (remoteViews != null) {
+            //TODO(ianwen): add UMA to see the usage of RemoteViews.
+            View inflatedView = remoteViews.apply(this, bottomBar);
+            bottomBar.addView(inflatedView);
+        } else {
+            bottomBar.setBackgroundColor(mIntentDataProvider.getBottomBarColor());
+            List<CustomButtonParams> items = mIntentDataProvider.getCustomButtonsOnBottombar();
+            for (CustomButtonParams params : items) {
+                if (params.showOnToolbar()) continue;
+                final PendingIntent pendingIntent = params.getPendingIntent();
+                OnClickListener clickListener = null;
+                if (pendingIntent != null) {
+                    clickListener = new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            Intent addedIntent = new Intent();
+                            addedIntent.setData(Uri.parse(getActivityTab().getUrl()));
+                            try {
+                                pendingIntent.send(CustomTabActivity.this, 0, addedIntent, null,
+                                        null);
+                            } catch (CanceledException e) {
+                                Log.e(TAG,
+                                        "CanceledException while sending pending intent.");
+                            }
                         }
-                    }
-                };
+                    };
+                }
+                ImageButton button = params.buildBottomBarButton(this, bottomBar, clickListener);
+                bottomBar.addView(button);
             }
-            ImageButton button = params.buildBottomBarButton(this, bottomBar, clickListener);
-            bottomBar.addView(button);
         }
     }
 
     @Override
     public boolean shouldShowAppMenu() {
         return getActivityTab() != null && getToolbarManager().isInitialized();
     }
 
     @Override
     protected void showAppMenuForKeyboardEvent() {
@@ skipping 123 matching lines @@
             case RESULT_CLOSED:
                 break;
 
             default:
                 assert false;
         }
 
         setResult(result, resultIntent);
     }
 }