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

Commit 47e56496 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi" into rvc-dev am:... 

Merge "Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi" into rvc-dev am: 7883b53e am: 42c810bd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838104

Change-Id: Id5c822de5a74a31d153a48c1cbeb390f2676a182
parents 3c38b25d 42c810bd

api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -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 NFC_PAYMENT_DEFAULT_COMPONENT = "nfc_payment_default_component";

    field public static final String NOTIFICATION_BADGING = "notification_badging";

    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 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 @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 USER_SETUP_COMPLETE = "user_setup_complete";

    field public static final String VOICE_INTERACTION_SERVICE = "voice_interaction_service";

    field public static final String VOICE_INTERACTION_SERVICE = "voice_interaction_service";

core/java/android/provider/Settings.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import android.annotation.Nullable; 
import android.annotation.RequiresPermission;

import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.annotation.TestApi;

import android.annotation.UserIdInt;

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.

         * determines if the IME should be shown when a hard keyboard is attached.

         * @hide

         * @hide

         */

         */

        @TestApi

        @SuppressLint("NoSettingsProvider")

        public static final String SHOW_IME_WITH_HARD_KEYBOARD = "show_ime_with_hard_keyboard";

        public static final String SHOW_IME_WITH_HARD_KEYBOARD = "show_ime_with_hard_keyboard";

















        /**







        /**