Replace return button with close button on custom tab toolbar

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;
@@ skipping 35 matching lines @@
             "android.support.CUSTOM_TABS:session_id";
 
     /**
      * Extra used to keep the caller alive. Its value is an Intent.
      */
     public static final String EXTRA_CUSTOM_TABS_KEEP_ALIVE =
             "android.support.CUSTOM_TABS:keep_alive";
 
     /**
      * Extra that changes the background color for the omnibox. colorRes is an int that specifies a
-     * color
+     * color.
      */
     public static final String EXTRA_CUSTOM_TABS_TOOLBAR_COLOR =
             "android.support.CUSTOM_TABS:toolbar_color";
 
     /**
+     * Extra int that specifies the style of the back button on the toolbar. Default is showing a
+     * cross icon.
+     */
+    public static final String EXTRA_CUSTOM_TABS_CLOSE_BUTTON_STYLE =
+            "android.support.CUSTOM_TABS:close_button_style";
+
+    /**
+     * Uses 'X'-like cross icon for close button.
+     */
+    public static final int CUSTOM_TAB_CLOSE_BUTTON_CROSS = 0;
+
+    /**
+     * Uses '<'-like chevron arrow icon for close button.
+     */
+    public static final int CUSTOM_TAB_CLOSE_BUTTON_ARROW = 1;
+
+    /**
      * Extra int that specifies state for showing the page title. Default is showing only the domain
      * and no information about the title.
      */
     public static final String EXTRA_CUSTOM_TABS_TITLE_VISIBILITY_STATE =
             "android.support.CUSTOM_TABS:title_visibility";
 
     /**
      * Don't show any title. Shows only the domain.
      */
     public static final int CUSTOM_TAB_NO_TITLE = 0;
@@ skipping 47 matching lines @@
      * An invalid session ID, used when none is provided in the intent.
      */
     public static final long INVALID_SESSION_ID = -1;
 
     private static final String BUNDLE_PACKAGE_NAME = "android:packageName";
     private static final String BUNDLE_ENTER_ANIMATION_RESOURCE = "android:animEnterRes";
     private static final String BUNDLE_EXIT_ANIMATION_RESOURCE = "android:animExitRes";
     private final long mSessionId;
     private final Intent mKeepAliveServiceIntent;
     private final int mTitleVisibilityState;
+    private final int mCloseButtonRes;
     private int mToolbarColor;
     private Bitmap mIcon;
     private PendingIntent mActionButtonPendingIntent;
     private List<Pair<String, PendingIntent>> mMenuEntries = new ArrayList<>();
     private Bundle mAnimationBundle;
     // OnFinished listener for PendingIntents. Used for testing only.
     private PendingIntent.OnFinished mOnFinished;
 
     /**
      * Constructs a {@link CustomTabIntentDataProvider}.
@@ skipping 29 matching lines @@
                 PendingIntent pendingIntent = IntentUtils.safeGetParcelable(
                         bundle, KEY_CUSTOM_TABS_PENDING_INTENT);
                 if (TextUtils.isEmpty(title) || pendingIntent == null) continue;
                 mMenuEntries.add(new Pair<String, PendingIntent>(title, pendingIntent));
             }
         }
 
         mAnimationBundle = IntentUtils.safeGetBundleExtra(
                 intent, EXTRA_CUSTOM_TABS_EXIT_ANIMATION_BUNDLE);
 
+        int closeButtonStyle = IntentUtils.safeGetIntExtra(intent,
+                EXTRA_CUSTOM_TABS_CLOSE_BUTTON_STYLE, CUSTOM_TAB_CLOSE_BUTTON_CROSS);
+        switch(closeButtonStyle) {
+            case CustomTabIntentDataProvider.CUSTOM_TAB_CLOSE_BUTTON_ARROW:
+                mCloseButtonRes = R.drawable.btn_chevron_left;
+                break;
+            case CustomTabIntentDataProvider.CUSTOM_TAB_CLOSE_BUTTON_CROSS:
+            default:
+                mCloseButtonRes = R.drawable.btn_close;

[Yusuf, 2015/06/29 23:05:58]

mCloseButtonResId

[Ian Wen, 2015/06/29 23:56:00]

Done.

+        }
+
         mTitleVisibilityState = IntentUtils.safeGetIntExtra(
                 intent, EXTRA_CUSTOM_TABS_TITLE_VISIBILITY_STATE, CUSTOM_TAB_NO_TITLE);
     }
 
     /**
      * Processes the color passed from the client app and updates {@link #mToolbarColor}.
      */
     private void retrieveToolbarColor(Intent intent, Context context) {
         int color = IntentUtils.safeGetIntExtra(intent, EXTRA_CUSTOM_TABS_TOOLBAR_COLOR,
                 context.getResources().getColor(R.color.default_primary_color));
@@ skipping 24 matching lines @@
 
     /**
      * @return The toolbar color specified in the intent. Will return the color of
      *         default_primary_color, if not set in the intent.
      */
     public int getToolbarColor() {
         return mToolbarColor;
     }
 
     /**
+     * @return The resource id of the close button shown in the custom tab toolbar.
+     */
+    public int getCloseButtonIconRes() {

[Yusuf, 2015/06/29 23:05:58]

getCloseButtonIconResId

[Ian Wen, 2015/06/29 23:56:00]

Done.

+        return mCloseButtonRes;
+    }
+
+    /**
      * @return The title visibility state for the toolbar.
      *         Default is {@link CustomTabIntentDataProvider#CUSTOM_TAB_NO_TITLE}.
      */
     public int getTitleVisibilityState() {
         return mTitleVisibilityState;
     }
 
     /**
      * @return Whether the client app has provided sufficient info for the toolbar to show the
      *         action button.
@@ skipping 106 matching lines @@
 
     /**
      * Set the callback object for {@link PendingIntent}s that are sent in this class. For testing
      * purpose only.
      */
     @VisibleForTesting
     void setPendingIntentOnFinishedForTesting(PendingIntent.OnFinished onFinished) {
         mOnFinished = onFinished;
     }
 }