diff options
| author | 2020-06-12 16:44:44 +0000 | |
|---|---|---|
| committer | 2020-06-12 16:44:44 +0000 | |
| commit | 7883b53e283cd69c8e556773a212b6c0e59fe9ac (patch) | |
| tree | 740c4c0ee0276a8e6f1d2f88714a7b6ec916894f | |
| parent | 7048655cbe27f612b1462f9f8931f0a730f7aca5 (diff) | |
| parent | cb32080a8f57e3052b45368d6acc01de6328e630 (diff) | |
Merge "Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi" into rvc-dev
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rwxr-xr-x | core/java/android/provider/Settings.java | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index 1142fb631891..795d873ec69c 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -3323,6 +3323,7 @@ package android.provider { field public static final String NFC_PAYMENT_DEFAULT_COMPONENT = "nfc_payment_default_component"; field public static final String NOTIFICATION_BADGING = "notification_badging"; field public static final String POWER_MENU_LOCKED_SHOW_CONTENT = "power_menu_locked_show_content"; + field public static final String SHOW_IME_WITH_HARD_KEYBOARD = "show_ime_with_hard_keyboard"; field @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static final String SYNC_PARENT_SOUNDS = "sync_parent_sounds"; field public static final String USER_SETUP_COMPLETE = "user_setup_complete"; field public static final String VOICE_INTERACTION_SERVICE = "voice_interaction_service"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index e10fceaa5bc7..4f0a9728fcf8 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -24,6 +24,7 @@ import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; +import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.TestApi; import android.annotation.UserIdInt; @@ -6238,6 +6239,8 @@ public final class Settings { * determines if the IME should be shown when a hard keyboard is attached. * @hide */ + @TestApi + @SuppressLint("NoSettingsProvider") public static final String SHOW_IME_WITH_HARD_KEYBOARD = "show_ime_with_hard_keyboard"; /** |