diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-11-06 01:41:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-11-06 01:41:59 +0000 |
| commit | 9b5b417e6465257a4ff8c1b5c3220cf3cc26452a (patch) | |
| tree | 758c1c4b8b0e0e92b2d47952e4b51f6bba56420b /src | |
| parent | 06bca75d01313e59c7e3cdb854aecf8722d023a4 (diff) | |
| parent | 9ed67ddc5036caaafe211ae20d9f63b125c1e607 (diff) | |
| download | android_packages_apps_Trebuchet-9b5b417e6465257a4ff8c1b5c3220cf3cc26452a.tar.gz android_packages_apps_Trebuchet-9b5b417e6465257a4ff8c1b5c3220cf3cc26452a.tar.bz2 android_packages_apps_Trebuchet-9b5b417e6465257a4ff8c1b5c3220cf3cc26452a.zip | |
Merge "Disable Shortcuts menu item for Android Go devices." into ub-launcher3-master
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/views/OptionsPopupView.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java index c540b59c1..6ba2f4069 100644 --- a/src/com/android/launcher3/views/OptionsPopupView.java +++ b/src/com/android/launcher3/views/OptionsPopupView.java @@ -34,6 +34,7 @@ import android.widget.Toast; import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.Utilities; +import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.popup.ArrowPopup; import com.android.launcher3.shortcuts.DeepShortcutView; import com.android.launcher3.userevent.nano.LauncherLogProto.Action; @@ -151,8 +152,10 @@ public class OptionsPopupView extends ArrowPopup ArrayList<OptionItem> options = new ArrayList<>(); options.add(new OptionItem(R.string.wallpaper_button_text, R.drawable.ic_wallpaper, ControlType.WALLPAPER_BUTTON, OptionsPopupView::startWallpaperPicker)); - options.add(new OptionItem(R.string.widget_button_text, R.drawable.ic_widget, - ControlType.WIDGETS_BUTTON, OptionsPopupView::onWidgetsClicked)); + if (!FeatureFlags.GO_DISABLE_WIDGETS) { + options.add(new OptionItem(R.string.widget_button_text, R.drawable.ic_widget, + ControlType.WIDGETS_BUTTON, OptionsPopupView::onWidgetsClicked)); + } options.add(new OptionItem(R.string.settings_button_text, R.drawable.ic_setting, ControlType.SETTINGS_BUTTON, OptionsPopupView::startSettings)); |