Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 806e4e12 authored Jan 26, 2021 by Jason Hsu Committed by Android (Google) Code Review Jan 26, 2021

Merge "Add key ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED"

parents e8fc1994 85bdea9e

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -9225,6 +9225,14 @@ public final class Settings {
		public static final String ACCESSIBILITY_FLOATING_MENU_ICON_TYPE =
		"accessibility_floating_menu_icon_type";

		/**
		* Whether the fade effect for the accessibility floating menu is enabled.
		*
		* @hide
		*/
		public static final String ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED =
		"accessibility_floating_menu_fade_enabled";

		/**
		* The opacity value for the accessibility floating menu fade out effect, from 0.0
		* (transparent) to 1.0 (opaque).

core/proto/android/providers/settings/secure.proto

+1 −0

Original line number	Diff line number	Diff line
		@@ -84,6 +84,7 @@ message SecureSettingsProto {
		optional SettingProto accessibility_floating_menu_size = 38 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto accessibility_floating_menu_icon_type = 39 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto accessibility_floating_menu_opacity = 40 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto accessibility_floating_menu_fade_enabled = 41 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}
		optional Accessibility accessibility = 2;

packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -184,6 +184,7 @@ public class SecureSettings {
		Settings.Secure.ACCESSIBILITY_BUTTON_MODE,
		Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE,
		Settings.Secure.ACCESSIBILITY_FLOATING_MENU_ICON_TYPE,
		Settings.Secure.ACCESSIBILITY_FLOATING_MENU_OPACITY
		Settings.Secure.ACCESSIBILITY_FLOATING_MENU_OPACITY,
		Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED,
		};
		}

packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -278,5 +278,6 @@ public class SecureSettingsValidators {
		new DiscreteValueValidator(new String[] {"0", "1"}));
		VALIDATORS.put(Secure.ACCESSIBILITY_FLOATING_MENU_OPACITY,
		new InclusiveFloatRangeValidator(0.0f, 1.0f));
		VALIDATORS.put(Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED, BOOLEAN_VALIDATOR);
		}
		}

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -1825,6 +1825,9 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_FLOATING_MENU_OPACITY,
		SecureSettingsProto.Accessibility.ACCESSIBILITY_FLOATING_MENU_OPACITY);
		dumpSetting(s, p,
		Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED,
		SecureSettingsProto.Accessibility.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED);
		p.end(accessibilityToken);

		final long adaptiveSleepToken = p.start(SecureSettingsProto.ADAPTIVE_SLEEP);