Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Settings.Secure values for Software Cursor settings for hiding

Browse Source 
trigger hints and for shifting the trigger region when the keyboard is
opened.

More context for these settings: https://docs.google.com/document/d/1hh2eY1a6wsOmOajxOUm8Xt8DT29oUvH9x0mCH83pnvk/edit#heading=h.e572ymeclvtl

Bug: 242218807
Test: SettingsBackupTest
Change-Id: I67e6d1ed0261a592aba0cb75a8e900c07683f667
This commit is contained in:
Lauren Winston
2022-08-18 21:07:07 +00:00
parent c4e0aa3376
commit 36e81f298f
5 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/provider/Settings.java
View File

@@ -10830,6 +10830,23 @@ public final class Settings {
public static final String ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED =
"accessibility_software_cursor_enabled";
/**
* Software Cursor settings that specifies whether trigger hints are enabled.
*
* @hide
*/
public static final String ACCESSIBILITY_SOFTWARE_CURSOR_TRIGGER_HINTS_ENABLED =
"accessibility_software_cursor_trigger_hints_enabled";
/**
* Software Cursor settings that specifies whether triggers are shifted when the keyboard
* is shown.
*
* @hide
*/
public static final String ACCESSIBILITY_SOFTWARE_CURSOR_KEYBOARD_SHIFT_ENABLED =
"accessibility_software_cursor_keyboard_shift_enabled";
/**
* Whether the Adaptive connectivity option is enabled.
*

8
core/proto/android/providers/settings/secure.proto
View File

@@ -89,6 +89,14 @@ message SecureSettingsProto {
// Setting for accessibility magnification for following typing.
optional SettingProto accessibility_magnification_follow_typing_enabled = 43 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto accessibility_software_cursor_enabled = 44 [ (android.privacy).dest = DEST_AUTOMATIC ];
message SoftwareCursorSettings {
optional SettingProto trigger_hints_enabled = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto keyboard_shift_enabled = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
}
optional SoftwareCursorSettings accessibility_software_cursor_settings = 45 [ (android.privacy).dest = DEST_AUTOMATIC ];
}
optional Accessibility accessibility = 2;

4
packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java
View File

@@ -212,6 +212,8 @@ public class SecureSettings {
Settings.Secure.STATUS_BAR_SHOW_VIBRATE_ICON,
Settings.Secure.WEAR_TALKBACK_ENABLED,
Settings.Secure.HBM_SETTING_KEY,
Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED
Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED,
Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_TRIGGER_HINTS_ENABLED,
Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_KEYBOARD_SHIFT_ENABLED,
};
}

4
packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
View File

@@ -346,5 +346,9 @@ public class SecureSettingsValidators {
VALIDATORS.put(Secure.WEAR_TALKBACK_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.HBM_SETTING_KEY, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(
Secure.ACCESSIBILITY_SOFTWARE_CURSOR_TRIGGER_HINTS_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(
Secure.ACCESSIBILITY_SOFTWARE_CURSOR_KEYBOARD_SHIFT_ENABLED, BOOLEAN_VALIDATOR);
}
}

6
packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
View File

@@ -1828,6 +1828,12 @@ class SettingsProtoDumpUtil {
dumpSetting(s, p,
Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED,
SecureSettingsProto.Accessibility.ACCESSIBILITY_SOFTWARE_CURSOR_ENABLED);
dumpSetting(s, p,
Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_TRIGGER_HINTS_ENABLED,
SecureSettingsProto.Accessibility.SoftwareCursorSettings.TRIGGER_HINTS_ENABLED);
dumpSetting(s, p,
Settings.Secure.ACCESSIBILITY_SOFTWARE_CURSOR_KEYBOARD_SHIFT_ENABLED,
SecureSettingsProto.Accessibility.SoftwareCursorSettings.KEYBOARD_SHIFT_ENABLED);
p.end(accessibilityToken);
final long adaptiveSleepToken = p.start(SecureSettingsProto.ADAPTIVE_SLEEP);