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

Commit 6e07ff31 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Lockscreen Gestures -" into froyo

parents ae4360f3 d5a22e5e

core/java/android/provider/Settings.java

+20 −1
Original line number Diff line number Diff line
@@ -2359,6 +2359,24 @@ public final class Settings { 
         */

        public static final String OVERSCROLL_WEIGHT = "overscroll_weight";



        /**

         * Whether to listen for gestures on the lockscreen

         * @hide

         */

        public static final String LOCKSCREEN_GESTURES_ENABLED = "lockscreen_gestures_enabled";



        /**

         * Whether to show the gesture trail on the lockscreen

         * @hide

         */

        public static final String LOCKSCREEN_GESTURES_TRAIL = "lockscreen_gestures_trail";



        /**

         * Sensitivity for parsing gestures on the lockscreen

         * @hide

         */

        public static final String LOCKSCREEN_GESTURES_SENSITIVITY = "lockscreen_gestures_sensitivity";



        /**

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

         * keys and easy to update.
@@ -2439,7 +2457,8 @@ public final class Settings { 
            QUIET_HOURS_END,

            QUIET_HOURS_MUTE,

            QUIET_HOURS_STILL,

            QUIET_HOURS_DIM

            QUIET_HOURS_DIM,

            LOCKSCREEN_GESTURES_SENSITIVITY

        };



        // Settings moved to Settings.Secure

core/res/res/layout/keyguard_screen_tab_unlock.xml

+210 −205
Original line number Diff line number Diff line
@@ -21,7 +21,16 @@ 
  state of the device, as well as instructions on how to get past it

  depending on the state of the device.  It is the same for landscape

  and portrait.-->

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"



<android.gesture.GestureOverlayView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/gestures"

    android:layout_width="fill_parent"

    android:layout_height="fill_parent"

    android:gestureStrokeType="multiple"

    android:eventsInterceptionEnabled="false"

    android:orientation="vertical">

    <RelativeLayout

        xmlns:tabunlock="http://schemas.android.com/apk/res/com.android.tabunlock"

        android:layout_width="match_parent"

        android:layout_height="match_parent"
@@ -82,7 +91,6 @@ 
                android:layout_marginBottom="10dip"

                />





            <TextView android:id="@+id/am_pm"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"
@@ -98,7 +106,6 @@ 
                android:shadowDy="0"

                android:shadowRadius="3.0"

                />



        </com.android.internal.widget.DigitalClock>



        <TextView
@@ -236,7 +243,5 @@ 
            android:background="@color/transparent"

            android:visibility="gone"

            />

        



    </RelativeLayout>

</android.gesture.GestureOverlayView>
 
 No newline at end of file

core/res/res/layout/keyguard_screen_tab_unlock_land.xml

+17 −6
Original line number Diff line number Diff line
@@ -20,6 +20,16 @@ 
<!-- This is the general lock screen which shows information about the

  state of the device, as well as instructions on how to get past it

  depending on the state of the device.-->



<android.gesture.GestureOverlayView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/gestures"

    android:layout_width="fill_parent"

    android:layout_height="fill_parent"

    android:gestureStrokeType="multiple"

    android:eventsInterceptionEnabled="false"

    android:orientation="horizontal">



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tabunlock="http://schemas.android.com/apk/res/com.android.tabunlock"

    android:layout_width="match_parent"
@@ -232,3 +242,4 @@ 
        />



</LinearLayout>

</android.gesture.GestureOverlayView>