From a456e52220a0e0c77b4fb925df521af955eb8dce Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 9 Feb 2023 18:04:15 +0800 Subject: [PATCH] Add an item in OptionsPopupView to jump to system settings (#3295) --- lawnchair/res/values-zh-rCN/strings.xml | 1 + lawnchair/res/values/strings.xml | 2 ++ .../android/launcher3/views/OptionsPopupView.java | 15 ++++++++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lawnchair/res/values-zh-rCN/strings.xml b/lawnchair/res/values-zh-rCN/strings.xml index 12339eba94..774fbeef53 100644 --- a/lawnchair/res/values-zh-rCN/strings.xml +++ b/lawnchair/res/values-zh-rCN/strings.xml @@ -399,4 +399,5 @@ 无效的备份文件。 %1$d × %2$d %s & %s + 系统设置 diff --git a/lawnchair/res/values/strings.xml b/lawnchair/res/values/strings.xml index d5f7af342e..a16929948e 100644 --- a/lawnchair/res/values/strings.xml +++ b/lawnchair/res/values/strings.xml @@ -496,4 +496,6 @@ %1$d × %2$d %s & %s + + System Settings diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java index 797c68e597..2ebea543bb 100644 --- a/src/com/android/launcher3/views/OptionsPopupView.java +++ b/src/com/android/launcher3/views/OptionsPopupView.java @@ -28,6 +28,7 @@ import android.content.Intent; import android.graphics.Rect; import android.graphics.RectF; import android.graphics.drawable.Drawable; +import android.provider.Settings; import android.util.ArrayMap; import android.util.AttributeSet; import android.view.MotionEvent; @@ -195,9 +196,14 @@ public class OptionsPopupView extends ArrowPopup IGNORE, OptionsPopupView::toggleHomeScreenLock)); } + options.add(new OptionItem(launcher, + R.string.system_settings, + R.drawable.ic_setting, + IGNORE, + OptionsPopupView::startSystemSettings)); options.add(new OptionItem(launcher, R.string.settings_button_text, - R.drawable.ic_setting, + R.drawable.ic_home_screen, LAUNCHER_SETTINGS_BUTTON_TAP_OR_LONGPRESS, OptionsPopupView::startSettings)); if (!lockHomeScreen && !WidgetsModel.GO_DISABLE_WIDGETS) { @@ -281,6 +287,13 @@ public class OptionsPopupView extends ArrowPopup return true; } + private static boolean startSystemSettings(View view) { + final Launcher launcher = Launcher.getLauncher(view.getContext()); + final Intent intent = new Intent(Settings.ACTION_SETTINGS); + launcher.startActivity(intent); + return true; + } + static WorkspaceItemInfo placeholderInfo(Intent intent) { WorkspaceItemInfo placeholderInfo = new WorkspaceItemInfo(); placeholderInfo.intent = intent;