Bug 1359098 - fix getDrawable method missing problem in CustomTabs draft
authorJulian_Chu <walkingice0204@gmail.com>
Tue, 25 Apr 2017 10:06:15 +0800
changeset 567460 601e3f63e3e5d6ba6a2af182c870a556d33ad613
parent 567425 abdcc8dfc28397b95338245390e12c56658ad182
child 625657 532775a6d5463e827543309f226852f6b04cf58b
push id55581
push userbmo:walkingice0204@gmail.com
push dateTue, 25 Apr 2017 02:08:26 +0000
bugs1359098
milestone55.0a1
Bug 1359098 - fix getDrawable method missing problem in CustomTabs The method Context.getDrawable was introduced in API 21. To be compatible with Kitkat, should use Resources.getDrawable instead. MozReview-Commit-ID: 1ZajYWPTVj0
mobile/android/base/java/org/mozilla/gecko/customtabs/ActionBarPresenter.java
mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java
--- a/mobile/android/base/java/org/mozilla/gecko/customtabs/ActionBarPresenter.java
+++ b/mobile/android/base/java/org/mozilla/gecko/customtabs/ActionBarPresenter.java
@@ -174,17 +174,22 @@ public class ActionBarPresenter {
      */
     public void setTextLongClickListener(View.OnLongClickListener listener) {
         mTitleView.setOnLongClickListener(listener);
         mUrlView.setOnLongClickListener(listener);
     }
 
     private void initIndicator() {
         mActionBar.setDisplayHomeAsUpEnabled(true);
-        final Drawable icon = mActionBar.getThemedContext().getDrawable(R.drawable.ic_close_light);
+
+        @SuppressWarnings("deprecation")
+        final Drawable icon = mActionBar.getThemedContext()
+                .getResources()
+                .getDrawable(R.drawable.ic_close_light);
+
         DrawableCompat.setTint(icon, mTextPrimaryColor);
         mActionBar.setHomeAsUpIndicator(icon);
     }
 
     /**
      * To update appearance of CustomView of ActionBar, includes its icon, title and url text.
      *
      * @param identity SiteIdentity for current website. Could be null if don't want to show icon.
--- a/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java
+++ b/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java
@@ -236,17 +236,20 @@ public class CustomTabsActivity extends 
                         public void onClick(View v) {
                             onActionButtonClicked();
                         }
                     });
         }
 
         // insert an action button for menu. click it to show popup menu
         popupMenu = createCustomPopupMenu();
-        actionBarPresenter.addActionButton(menu, getDrawable(R.drawable.ab_menu), true)
+
+        @SuppressWarnings("deprecation")
+        Drawable icon = getResources().getDrawable(R.drawable.ab_menu);
+        actionBarPresenter.addActionButton(menu, icon, true)
                 .setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View anchor) {
                         popupMenu.setAnchor(anchor);
                         popupMenu.show();
                     }
                 });