Merge "Add secure setting for Global Actions Panel debug mode." into qt-dev (4abf4bd5) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -6513,6 +6513,13 @@ public final class Settings {
		public static final String GLOBAL_ACTIONS_PANEL_AVAILABLE =
		"global_actions_panel_available";

		/**
		* Enables debug mode for the Global Actions Panel.
		* @hide
		*/
		public static final String GLOBAL_ACTIONS_PANEL_DEBUG_ENABLED =
		"global_actions_panel_debug_enabled";

		/**
		* Whether the hush gesture has ever been used
		* @hide

+1 −0

Original line number	Diff line number	Diff line
		@@ -637,6 +637,7 @@ public class SettingsBackupTest {
		Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES,
		Settings.Secure.ENABLED_PRINT_SERVICES,
		Settings.Secure.GLOBAL_ACTIONS_PANEL_AVAILABLE,
		Settings.Secure.GLOBAL_ACTIONS_PANEL_DEBUG_ENABLED,
		Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS,
		Settings.Secure.INCALL_BACK_BUTTON_BEHAVIOR,
		Settings.Secure.INPUT_METHOD_SELECTOR_VISIBILITY,

+9 −2

Original line number	Diff line number	Diff line
		@@ -1775,13 +1775,20 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		}
		}

		/**
		* Determines whether or not debug mode has been activated for the Global Actions Panel.
		*/
		private static boolean isPanelDebugModeEnabled(Context context) {
		return Settings.Secure.getInt(context.getContentResolver(),
		Settings.Secure.GLOBAL_ACTIONS_PANEL_DEBUG_ENABLED, 0) == 1;
		}

		/**
		* Determines whether or not the Global Actions menu should be forced to
		* use the newer grid-style layout.
		*/
		private static boolean isForceGridEnabled(Context context) {
		return FeatureFlagUtils.isEnabled(context,
		FeatureFlagUtils.FORCE_GLOBAL_ACTIONS_GRID_ENABLED);
		return isPanelDebugModeEnabled(context);
		}

		/**