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

Commit ccfcf3ba authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "resolved conflicts for merge of ca2b552d to master"

parents 5944b6a4 7218d830

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ package android { 
    field public static final java.lang.String SET_ANIMATION_SCALE = "android.permission.SET_ANIMATION_SCALE";

    field public static final java.lang.String SET_DEBUG_APP = "android.permission.SET_DEBUG_APP";

    field public static final java.lang.String SET_ORIENTATION = "android.permission.SET_ORIENTATION";

    field public static final java.lang.String SET_POINTER_SPEED = "android.permission.SET_POINTER_SPEED";

    field public static final deprecated java.lang.String SET_PREFERRED_APPLICATIONS = "android.permission.SET_PREFERRED_APPLICATIONS";

    field public static final java.lang.String SET_PROCESS_LIMIT = "android.permission.SET_PROCESS_LIMIT";

    field public static final java.lang.String SET_TIME = "android.permission.SET_TIME";

core/java/android/provider/Settings.java

+11 −0
Original line number Diff line number Diff line
@@ -1808,6 +1808,16 @@ public final class Settings { 
         */

        public static final String SIP_ASK_ME_EACH_TIME = "SIP_ASK_ME_EACH_TIME";



        /**

         * Pointer speed setting.

         * This is an integer value in a range between -7 and +7, so there are 15 possible values.

         *   -7 = slowest

         *    0 = default speed

         *   +7 = fastest

         * @hide

         */

        public static final String POINTER_SPEED = "pointer_speed";



        /**

         * Settings to backup. This is here so that it's in the same place as the settings

         * keys and easy to update.
@@ -1872,6 +1882,7 @@ public final class Settings { 
            USE_PTP_INTERFACE,

            SIP_CALL_OPTIONS,

            SIP_RECEIVE_CALLS,

            POINTER_SPEED,

        };



        // Settings moved to Settings.Secure

core/java/android/view/IWindowManager.aidl

+5 −0
Original line number Diff line number Diff line
@@ -205,4 +205,9 @@ interface IWindowManager 
     * Called by the status bar to notify Views of changes to System UI visiblity.

     */

    void statusBarVisibilityChanged(int visibility);



    /**

     * Called by the settings application to temporarily set the pointer speed.

     */

    void setPointerSpeed(int speed);

}

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -1098,6 +1098,13 @@ 
        android:description="@string/permdesc_setOrientation"

        android:protectionLevel="signature" />



    <!-- Allows low-level access to setting the pointer speed.

         Not for use by normal applications. -->

    <permission android:name="android.permission.SET_POINTER_SPEED"

        android:label="@string/permlab_setPointerSpeed"

        android:description="@string/permdesc_setPointerSpeed"

        android:protectionLevel="signature" />



    <!-- Allows an application to install packages. -->

    <permission android:name="android.permission.INSTALL_PACKAGES"

        android:label="@string/permlab_installPackages"

core/res/res/values/strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -711,6 +711,13 @@ 
        the rotation of the screen at any time. Should never be needed for

        normal applications.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->

    <string name="permlab_setPointerSpeed">change pointer speed</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE] -->

    <string name="permdesc_setPointerSpeed">Allows an application to change

        the mouse or trackpad pointer speed at any time. Should never be needed for

        normal applications.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_signalPersistentProcesses">send Linux signals to applications</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->