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
--- 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();
}
});