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

Commit b8f5cae1 authored by Tim Kilbourn's avatar Tim Kilbourn Committed by Android (Google) Code Review
Browse files

Merge "Add KEYCODE_PAIRING."

parents 3a483594 87cd0dc4

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30829,6 +30829,7 @@ package android.view { 
    field public static final int KEYCODE_P = 44; // 0x2c

    field public static final int KEYCODE_PAGE_DOWN = 93; // 0x5d

    field public static final int KEYCODE_PAGE_UP = 92; // 0x5c

    field public static final int KEYCODE_PAIRING = 225; // 0xe1

    field public static final int KEYCODE_PERIOD = 56; // 0x38

    field public static final int KEYCODE_PICTSYMBOLS = 94; // 0x5e

    field public static final int KEYCODE_PLUS = 81; // 0x51

core/java/android/provider/Settings.java

+12 −1
Original line number Diff line number Diff line
@@ -773,13 +773,24 @@ public final class Settings { 
     * Activity Action: Show Device Name Settings.

     * <p>

     * In some cases, a matching Activity may not exist, so ensure you safeguard

     * against ithis.

     * against this.

     *

     * @hide

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String DEVICE_NAME_SETTINGS = "android.settings.DEVICE_NAME";



    /**

     * Activity Action: Show pairing settings.

     * <p>

     * In some cases, a matching Activity may not exist, so ensure you safeguard

     * against this.

     *

     * @hide

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_PAIRING_SETTINGS = "android.settings.PAIRING_SETTINGS";



    // End of Intent actions for Settings



    /**

core/java/android/view/KeyEvent.java

+6 −1
Original line number Diff line number Diff line
@@ -639,8 +639,13 @@ public class KeyEvent extends InputEvent implements Parcelable { 
     * Wakes up the device.  Behaves somewhat like {@link #KEYCODE_POWER} but it

     * has no effect if the device is already awake. */

    public static final int KEYCODE_WAKEUP          = 224;

    /** Key code constant: Pairing key.

     * Initiates peripheral pairing mode. Useful for pairing remote control

     * devices or game controllers, especially if no other input mode is

     * available. */

    public static final int KEYCODE_PAIRING         = 225;



    private static final int LAST_KEYCODE = KEYCODE_WAKEUP;

    private static final int LAST_KEYCODE = KEYCODE_PAIRING;



    // NOTE: If you add a new keycode here you must also add it to:

    //  isSystem()

core/res/res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -1672,6 +1672,7 @@ 
        <enum name="KEYCODE_MEDIA_AUDIO_TRACK" value="222" />

        <enum name="KEYCODE_MEDIA_SLEEP" value="223" />

        <enum name="KEYCODE_MEDIA_WAKEUP" value="224" />

        <enum name="KEYCODE_PAIRING" value="225" />

    </attr>



    <!-- ***************************************************************** -->