[Custom Tabs] Implement Bottombar

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.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.IBinder;
 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 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;
 import org.chromium.chrome.browser.IntentHandler.ExternalAppId;
 import org.chromium.chrome.browser.KeyboardShortcuts;
 import org.chromium.chrome.browser.WebContentsFactory;
 import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel.StateChangeReason;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerDocument;
 import org.chromium.chrome.browser.datausage.DataUseTabUIManager;
 import org.chromium.chrome.browser.rappor.RapporServiceBridge;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabIdManager;
 import org.chromium.chrome.browser.tab.TopControlsVisibilityDelegate;
 import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
 import org.chromium.chrome.browser.tabmodel.TabModelObserver;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorImpl;
 import org.chromium.chrome.browser.toolbar.ToolbarControlContainer;
 import org.chromium.chrome.browser.util.ColorUtils;
 import org.chromium.chrome.browser.util.IntentUtils;
+import org.chromium.chrome.browser.widget.FadingShadow;
+import org.chromium.chrome.browser.widget.FadingShadowView;
 import org.chromium.chrome.browser.widget.findinpage.FindToolbarManager;
 import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.common.Referrer;
 import org.chromium.ui.base.PageTransition;
 
+import java.util.List;
+
 /**
  * The activity for custom tabs. It will be launched on top of a client's task.
  */
 public class CustomTabActivity extends ChromeActivity {
     private static final String TAG = "CustomTabActivity";
     private static CustomTabContentHandler sActiveContentHandler;
 
     private FindToolbarManager mFindToolbarManager;
     private CustomTabIntentDataProvider mIntentDataProvider;
     private IBinder mSession;
@@ skipping 53 matching lines @@
 
         String url = IntentHandler.getUrlFromIntent(intent);
         if (TextUtils.isEmpty(url)) return false;
         sActiveContentHandler.loadUrlAndTrackFromTimestamp(new LoadUrlParams(url),
                 IntentHandler.getTimestampFromIntent(intent));
         return true;
     }
 
     /**
      * Checks whether the active {@link CustomTabContentHandler} belongs to the given session, and
-     * if true, update toolbar's action button.
+     * if true, update toolbar's custom button.
      * @param session     The {@link IBinder} that the calling client represents.
      * @param bitmap      The new icon for action button.
      * @param description The new content description for the action button.
      * @return Whether the update is successful.
      */
-    static boolean updateActionButton(IBinder session, Bitmap bitmap, String description) {
+    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.updateActionButton(bitmap, description);
+        return sActiveContentHandler.updateCustomButton(id, bitmap, description);
     }
 
     @Override
     public boolean isCustomTab() {
         return true;
     }
 
     @Override
     public void onStart() {
         super.onStart();
@@ skipping 16 matching lines @@
         mIntentDataProvider = new CustomTabIntentDataProvider(getIntent(), this);
         supportRequestWindowFeature(Window.FEATURE_ACTION_MODE_OVERLAY);
     }
 
     @Override
     public void postInflationStartup() {
         super.postInflationStartup();
         setTabModelSelector(new TabModelSelectorImpl(this, 0, getWindowAndroid(), false));
         getToolbarManager().setCloseButtonDrawable(mIntentDataProvider.getCloseButtonDrawable());
         getToolbarManager().setShowTitle(mIntentDataProvider.getTitleVisibilityState()
-                == CustomTabIntentDataProvider.SHOW_PAGE_TITLE);
+                == CustomTabsIntent.SHOW_PAGE_TITLE);
         int toolbarColor = mIntentDataProvider.getToolbarColor();
         getToolbarManager().updatePrimaryColor(toolbarColor);
         if (toolbarColor != ApiCompatibilityUtils.getColor(
                 getResources(), R.color.default_primary_color)) {
             ApiCompatibilityUtils.setStatusBarColor(getWindow(),
                     ColorUtils.getDarkenedColorForStatusBar(toolbarColor));
         }
 
         // Setting task title and icon to be null will preserve the client app's title and icon.
         ApiCompatibilityUtils.setTaskDescription(this, null, null, toolbarColor);
-        showActionButton();
+        showCustomButtonOnToolbar();
+        showBottombarIfNecessary();
     }
 
     @Override
     public void finishNativeInitialization() {
         mSession = mIntentDataProvider.getSession();
         // If extra headers have been passed, cancel any current prerender, as
         // prerendering doesn't support extra headers.
         if (IntentHandler.getExtraHeadersFromIntent(getIntent()) != null) {
             CustomTabsConnection.getInstance(getApplication()).cancelPrerender(mSession);
         }
@@ skipping 31 matching lines @@
             public IBinder getSession() {
                 return mSession;
             }
 
             @Override
             public boolean shouldIgnoreIntent(Intent intent) {
                 return mIntentHandler.shouldIgnoreIntent(CustomTabActivity.this, intent);
             }
 
             @Override
-            public boolean updateActionButton(Bitmap bitmap, String description) {
-                mIntentDataProvider.getActionButtonParams().update(bitmap, description);
-                return showActionButton();
+            public boolean updateCustomButton(int id, Bitmap bitmap, String description) {
+                List<CustomButtonParams> list = mIntentDataProvider.getAllCustomButtons();
+                for (CustomButtonParams params : list) {
+                    if (params.getId() == id) {
+                        params.update(bitmap, description);
+                    }
+                }
+                // TODO(ianwen): support bottombar here.

[Yusuf, 2016/01/06 23:02:55]

so right now, we can't change icons on the bottom bar, is that right?

[Ian Wen, 2016/01/07 03:09:50]

In this CL it is not implemented. Will upload a follow-up CL today to finish it.

+                return showCustomButtonOnToolbar();
             }
         };
         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())),
@@ skipping 171 matching lines @@
             if (getCurrentTabModel().getCount() > 1) {
                 getCurrentTabModel().closeTab(getActivityTab(), false, false, false);
             } else {
                 finish();
             }
         }
         return true;
     }
 
     /**
-     * Properly setup action button on the toolbar. Does nothing if invalid data is provided by
-     * clients.
+     * Configures the custom button on toolbar. Does nothing if invalid data is provided by clients.
      */
-    private boolean showActionButton() {
-        if (!mIntentDataProvider.shouldShowActionButton()) return false;
-        ActionButtonParams params = mIntentDataProvider.getActionButtonParams();
+    private boolean showCustomButtonOnToolbar() {
+        CustomButtonParams params = mIntentDataProvider.getCustomButtonOnToolbar();
+        if (params == null) return false;
         getToolbarManager().setCustomActionButton(
                 params.getIcon(getResources()),
                 params.getDescription(),
                 new OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         mIntentDataProvider.sendButtonPendingIntentWithUrl(
                                 getApplicationContext(), getActivityTab().getUrl());
                         RecordUserAction.record("CustomTabsCustomActionButtonClick");
                     }
                 });
         return true;
     }
 
+    /**
+     * Inflates the bottom bar {@link ViewStub} and its shadow, and populates it with items.
+     */
+    private void showBottombarIfNecessary() {
+        if (!mIntentDataProvider.shouldShowBottomBar()) return;
+
+        ViewStub bottombarStub = ((ViewStub) findViewById(R.id.buttombar_stub));
+        bottombarStub.setLayoutResource(R.layout.custom_tabs_bottombar);
+        bottombarStub.inflate();
+
+        // Unlike others, this shadow docks itself at bottom and casts graphics upwards.
+        FadingShadowView shadow = (FadingShadowView) findViewById(R.id.bottombar_shadow);
+        shadow.setVisibility(View.VISIBLE);
+        shadow.init(ApiCompatibilityUtils.getColor(getResources(),
+                R.color.toolbar_shadow_color), FadingShadow.POSITION_BOTTOM);
+
+        ViewGroup bottomBar = (ViewGroup) findViewById(R.id.bottombar);
+        bottomBar.setBackgroundColor(mIntentDataProvider.getToolbarColor());
+        List<CustomButtonParams> items = mIntentDataProvider.getCustomButtonsOnBottombar();
+        for (CustomButtonParams params : items) {
+            if (params.showOnToolbar()) continue;
+            ImageButton button = params.toBottomBarButton(this, bottomBar);
+            bottomBar.addView(button);
+        }
+    }
+
     @Override
     public boolean shouldShowAppMenu() {
         return getActivityTab() != null && getToolbarManager().isInitialized();
     }
 
     @Override
     protected void showAppMenuForKeyboardEvent() {
         if (!shouldShowAppMenu()) return;
         super.showAppMenuForKeyboardEvent();
     }
@@ skipping 81 matching lines @@
 
     /**
      * @return The {@link CustomTabIntentDataProvider} for this {@link CustomTabActivity}. For test
      *         purposes only.
      */
     @VisibleForTesting
     CustomTabIntentDataProvider getIntentDataProvider() {
         return mIntentDataProvider;
     }
 }