Added settings screens for Power Menu
This CL adds a new Preference in Gestures (Power Menu), moves Global
Actions to it (now renamed Cards & passes) and adds a new Preference for
Device controls.
Missing:
* Explanation video for Device controls
* Privacy settings
Test: robotests
Test: manual change settings
Bug: 152212779
Bug: 152329723
Change-Id: Ia8f69565307a5961c8435bc1f441abeb389acf8b
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index d25d7e9..f5494fa 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -218,6 +218,8 @@
public static class WifiCallingDisclaimerActivity extends SettingsActivity { /* empty */ }
public static class MobileNetworkListActivity extends SettingsActivity {}
public static class GlobalActionsPanelSettingsActivity extends SettingsActivity {}
+ public static class PowerMenuSettingsActivity extends SettingsActivity {}
+ public static class QuickControlsSettingsActivity extends SettingsActivity {}
/**
* Activity for BugReportHandlerPicker.
*/
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 8c49e58..fea32cf 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -88,12 +88,14 @@
import com.android.settings.fuelgauge.batterysaver.BatterySaverScheduleSettings;
import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings;
import com.android.settings.gestures.AssistGestureSettings;
+import com.android.settings.gestures.DeviceControlsSettings;
import com.android.settings.gestures.DoubleTapPowerSettings;
import com.android.settings.gestures.DoubleTapScreenSettings;
import com.android.settings.gestures.DoubleTwistGestureSettings;
import com.android.settings.gestures.GestureNavigationSettingsFragment;
import com.android.settings.gestures.GlobalActionsPanelSettings;
import com.android.settings.gestures.PickupGestureSettings;
+import com.android.settings.gestures.PowerMenuSettings;
import com.android.settings.gestures.SwipeToNotificationSettings;
import com.android.settings.gestures.SystemNavigationGestureSettings;
import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
@@ -294,7 +296,9 @@
PreviouslyConnectedDeviceDashboardFragment.class.getName(),
BatterySaverScheduleSettings.class.getName(),
MobileNetworkListFragment.class.getName(),
+ PowerMenuSettings.class.getName(),
GlobalActionsPanelSettings.class.getName(),
+ DeviceControlsSettings.class.getName(),
DarkModeSettingsFragment.class.getName(),
BugReportHandlerPicker.class.getName(),
GestureNavigationSettingsFragment.class.getName(),
diff --git a/src/com/android/settings/gestures/DeviceControlsPreferenceController.java b/src/com/android/settings/gestures/DeviceControlsPreferenceController.java
new file mode 100644
index 0000000..e588e86
--- /dev/null
+++ b/src/com/android/settings/gestures/DeviceControlsPreferenceController.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import com.android.internal.annotations.VisibleForTesting;
+
+public class DeviceControlsPreferenceController extends GesturePreferenceController {
+ private static final String PREF_KEY_VIDEO = "device_controls_video";
+
+ @VisibleForTesting
+ protected static final String ENABLED_SETTING = Settings.Secure.CONTROLS_ENABLED;
+
+ @VisibleForTesting
+ protected static final String TOGGLE_KEY = "gesture_device_controls_switch";
+
+ public DeviceControlsPreferenceController(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ return Settings.Secure.putInt(mContext.getContentResolver(), ENABLED_SETTING,
+ isChecked ? 1 : 0);
+ }
+
+ @Override
+ protected String getVideoPrefKey() {
+ return PREF_KEY_VIDEO;
+ }
+
+ @Override
+ public boolean isSliceable() {
+ return TextUtils.equals(getPreferenceKey(), TOGGLE_KEY);
+ }
+
+ @Override
+ public boolean isPublicSlice() {
+ return true;
+ }
+
+ @Override
+ public boolean isChecked() {
+ int enabled = Settings.Secure.getInt(mContext.getContentResolver(), ENABLED_SETTING, 1);
+ return enabled == 1;
+ }
+}
diff --git a/src/com/android/settings/gestures/DeviceControlsSettings.java b/src/com/android/settings/gestures/DeviceControlsSettings.java
new file mode 100644
index 0000000..df36717
--- /dev/null
+++ b/src/com/android/settings/gestures/DeviceControlsSettings.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.app.settings.SettingsEnums;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+@SearchIndexable
+public class DeviceControlsSettings extends DashboardFragment {
+
+ private static final String TAG = "QuickControlsSettings";
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.DEVICE_CONTROLS_SETTINGS;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.device_controls_settings;
+ }
+
+ public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider(R.xml.device_controls_settings);
+}
diff --git a/src/com/android/settings/gestures/PowerMenuPreferenceController.java b/src/com/android/settings/gestures/PowerMenuPreferenceController.java
new file mode 100644
index 0000000..e65d140
--- /dev/null
+++ b/src/com/android/settings/gestures/PowerMenuPreferenceController.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+public class PowerMenuPreferenceController extends BasePreferenceController {
+
+ private static final String KEY = "gesture_power_menu_summary";
+ private static final String CONTROLS_ENABLED_SETTING = Settings.Secure.CONTROLS_ENABLED;
+ private static final String CARDS_ENABLED_SETTING =
+ Settings.Secure.GLOBAL_ACTIONS_PANEL_ENABLED;
+ private static final String CARDS_AVAILABLE_SETTING =
+ Settings.Secure.GLOBAL_ACTIONS_PANEL_AVAILABLE;
+
+ public PowerMenuPreferenceController(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ boolean controlsEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
+ CONTROLS_ENABLED_SETTING, 1) == 1;
+ boolean cardsEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
+ CARDS_ENABLED_SETTING, 0) == 1;
+ boolean cardsVisible = cardsEnabled && Settings.Secure.getInt(mContext.getContentResolver(),
+ CARDS_AVAILABLE_SETTING, 0) == 1;
+ if (controlsEnabled && cardsVisible) {
+ return mContext.getText(R.string.power_menu_cards_passes_device_controls);
+ } else if (controlsEnabled) {
+ return mContext.getText(R.string.power_menu_device_controls);
+ } else if (cardsVisible) {
+ return mContext.getText(R.string.power_menu_cards_passes);
+ } else {
+ return mContext.getText(R.string.power_menu_none);
+ }
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+}
diff --git a/src/com/android/settings/gestures/PowerMenuSettings.java b/src/com/android/settings/gestures/PowerMenuSettings.java
new file mode 100644
index 0000000..3b4c5c3
--- /dev/null
+++ b/src/com/android/settings/gestures/PowerMenuSettings.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.app.settings.SettingsEnums;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+
+public class PowerMenuSettings extends DashboardFragment {
+
+ private static final String TAG = "PowerMenuSettings";
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.power_menu_settings;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.POWER_MENU_SETTINGS;
+ }
+
+ public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider(R.xml.power_menu_settings);
+}