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

Commit 12578a8d authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Rotary lockscreen" into froyo

parents 42d63ad2 276430cc

core/java/android/provider/Settings.java

+7 −1
Original line number Diff line number Diff line
@@ -2253,6 +2253,12 @@ public final class Settings { 
         */

        public static final String LOCKSCREEN_MESSAGING_TAB_APP = "lockscreen_messaging_tab_app";



        /**

         * Sets the lockscreen style

         * @hide

         */

        public static final String LOCKSCREEN_STYLE_PREF = "lockscreen_style_pref";



        /**

         * Whether to use a custom pull-down notification screen

         * @hide

core/java/com/android/internal/widget/RotarySelector.java

+2 −2
Original line number Diff line number Diff line
@@ -106,8 +106,8 @@ public class RotarySelector extends View { 


    // Vibration (haptic feedback)

    private Vibrator mVibrator;

    private static final long VIBRATE_SHORT = 20;  // msec

    private static final long VIBRATE_LONG = 20;  // msec

    private static final long VIBRATE_SHORT = 30;  // msec

    private static final long VIBRATE_LONG = 40;  // msec



    /**

     * The drawable for the arrows need to be scrunched this many dips towards the rotary bg below

core/res/res/layout/keyguard_screen_tab_unlock.xml

+9 −0
Original line number Diff line number Diff line
@@ -179,6 +179,15 @@ 
            android:layout_marginBottom="60dip"

            />



        <com.android.internal.widget.RotarySelector

            android:id="@+id/rotary_selector"

            android:orientation="horizontal"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_alignParentBottom="true"

            android:layout_marginBottom="60dip"

            />



        <!-- emergency call button shown when sim is PUKd and tab_selector is

             hidden -->

        <Button

core/res/res/layout/keyguard_screen_tab_unlock_land.xml

+9 −0
Original line number Diff line number Diff line
@@ -228,6 +228,15 @@ 
        android:layout_marginRight="60dip"

        />



    <com.android.internal.widget.RotarySelector

        android:id="@+id/rotary_selector"

        android:orientation="vertical"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_alignParentRight="true"

        android:layout_marginRight="60dip"

        />



    <!-- emergency call button shown when sim is PUKd and tab_selector is

         hidden -->

    <Button