From 514e4c750ffe8e9049f64fe86c61a7e5d6872f15 Mon Sep 17 00:00:00 2001 From: Joey Date: Sun, 4 Feb 2018 11:36:32 +0100 Subject: Trebuchet: allow disabling workspace edit Change-Id: I503e19cbc512eac0e4a8c8bccc16a6ccc0e805da Signed-off-by: Joey --- res/values/lineage_strings.xml | 6 ++++++ res/xml/launcher_preferences.xml | 8 ++++++++ src/com/android/launcher3/SettingsActivity.java | 4 +++- src/com/android/launcher3/Utilities.java | 5 +++++ src/com/android/launcher3/dragndrop/DragController.java | 9 +++++++++ src/com/android/launcher3/popup/PopupContainerWithArrow.java | 3 +++ src/com/android/launcher3/popup/SystemShortcut.java | 5 +++++ src/com/android/launcher3/views/OptionsPopupView.java | 6 ++++-- 8 files changed, 43 insertions(+), 3 deletions(-) diff --git a/res/values/lineage_strings.xml b/res/values/lineage_strings.xml index de030f9fb..ab5863426 100644 --- a/res/values/lineage_strings.xml +++ b/res/values/lineage_strings.xml @@ -43,6 +43,12 @@ Show icon labels on desktop Show icon labels in drawer + + Allow edit + Icons and widgets can be added, removed and moved on the homescreen + Icons and widgets can\'t be added, removed and moved on the homescreen + It\'s not possible to add widgets to the home screen + Google Play diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml index f87d0a046..343b40033 100644 --- a/res/xml/launcher_preferences.xml +++ b/res/xml/launcher_preferences.xml @@ -16,6 +16,14 @@ + + extends Ite @Override public View.OnClickListener getOnClickListener(final Launcher launcher, final ItemInfo itemInfo) { + if (!Utilities.isWorkspaceEditAllowed(launcher.getApplicationContext())) { + return null; + } + final List widgets = launcher.getPopupDataProvider().getWidgetsForPackageUser(new PackageUserKey( itemInfo.getTargetComponent().getPackageName(), itemInfo.user)); diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java index db4c49226..29020e739 100644 --- a/src/com/android/launcher3/views/OptionsPopupView.java +++ b/src/com/android/launcher3/views/OptionsPopupView.java @@ -144,8 +144,10 @@ public class OptionsPopupView extends ArrowPopup ArrayList 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 (Utilities.isWorkspaceEditAllowed(launcher)) { + 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)); -- cgit v1.2.3