From 1b01c60c4969f1f7c392116db5045219073e9672 Mon Sep 17 00:00:00 2001 From: Jing-wei Wu Date: Thu, 28 Sep 2017 11:27:46 +0800 Subject: [PATCH] Bug 1403437 - Use MenuUtils#safeSetVisible to hide '.*_add_to_launcher' safely. r=nechen MozReview-Commit-ID: iraSQCSvPw --HG-- extra : rebase_source : a7769fed5217a05da2df86745b83b859712f3aa6 --- .../base/java/org/mozilla/gecko/home/HomeFragment.java | 7 ++----- .../java/org/mozilla/gecko/toolbar/BrowserToolbar.java | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/home/HomeFragment.java b/mobile/android/base/java/org/mozilla/gecko/home/HomeFragment.java index 83f0a18cd46f..f278d97dccbf 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/HomeFragment.java +++ b/mobile/android/base/java/org/mozilla/gecko/home/HomeFragment.java @@ -31,6 +31,7 @@ import org.mozilla.gecko.reader.ReadingListHelper; import org.mozilla.gecko.restrictions.Restrictable; import org.mozilla.gecko.restrictions.Restrictions; import org.mozilla.gecko.util.Clipboard; +import org.mozilla.gecko.util.MenuUtils; import org.mozilla.gecko.util.StringUtils; import org.mozilla.gecko.util.ThreadUtils; import org.mozilla.gecko.util.UIAsyncTask; @@ -208,11 +209,7 @@ public abstract class HomeFragment extends Fragment { menu.findItem(R.id.home_open_private_tab).setVisible(false); menu.findItem(R.id.home_copyurl).setVisible(false); menu.findItem(R.id.home_share).setVisible(false); - - final MenuItem addToLauncherItem = menu.findItem(R.id.home_add_to_launcher); - if (addToLauncherItem != null) { - addToLauncherItem.setVisible(false); - } + MenuUtils.safeSetVisible(menu, R.id.home_add_to_launcher, false); menu.findItem(R.id.home_set_as_homepage).setVisible(false); menu.findItem(R.id.home_as_pin).setVisible(false); diff --git a/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java b/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java index 2e29e99751a6..325c8f9ed0a5 100644 --- a/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java +++ b/mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java @@ -262,7 +262,7 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout String url = tab.getURL(); if (url == null) { menu.findItem(R.id.copyurl).setVisible(false); - menu.findItem(R.id.add_to_launcher).setVisible(false); + MenuUtils.safeSetVisible(menu, R.id.add_to_launcher, false); menu.findItem(R.id.set_as_homepage).setVisible(false); } @@ -273,7 +273,7 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout } else { // if there is no tab, remove anything tab dependent menu.findItem(R.id.copyurl).setVisible(false); - menu.findItem(R.id.add_to_launcher).setVisible(false); + MenuUtils.safeSetVisible(menu, R.id.add_to_launcher, false); menu.findItem(R.id.set_as_homepage).setVisible(false); MenuUtils.safeSetVisible(menu, R.id.subscribe, false); MenuUtils.safeSetVisible(menu, R.id.add_search_engine, false);