diff options
| -rw-r--r-- | core/java/android/provider/Settings.java | 21 | ||||
| -rw-r--r-- | core/res/res/layout/keyguard_screen_tab_unlock.xml | 415 | ||||
| -rw-r--r-- | core/res/res/layout/keyguard_screen_tab_unlock_land.xml | 23 |
3 files changed, 247 insertions, 212 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 56f6a98..7019ed4 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2360,6 +2360,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. * @hide @@ -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 diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml index b7a3387..4dffb6c 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock.xml @@ -21,222 +21,227 @@ 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" - xmlns:tabunlock="http://schemas.android.com/apk/res/com.android.tabunlock" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="#70000000" - android:gravity="center_horizontal" - android:id="@+id/root"> - - <TextView - android:id="@+id/carrier" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_alignParentRight="true" - android:layout_marginTop="10dip" - android:layout_marginRight="8dip" - android:singleLine="true" - android:ellipsize="marquee" - android:gravity="right|bottom" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="22sp" - /> - - <!-- "emergency calls only" shown when sim is missing or PUKd --> - <TextView - android:id="@+id/emergencyCallText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/carrier" - android:layout_alignParentRight="true" - android:layout_marginTop="0dip" - android:layout_marginRight="8dip" - android:text="@string/emergency_calls_only" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@color/white" - /> - <!-- time and date --> - <com.android.internal.widget.DigitalClock android:id="@+id/time" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/carrier" - android:layout_marginTop="32dip" - android:layout_marginLeft="20dip" - android:paddingBottom="8dip" - > - - <TextView android:id="@+id/timeDisplay" +<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" + android:background="#70000000" + android:gravity="center_horizontal" + android:id="@+id/root"> + + <TextView + android:id="@+id/carrier" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_alignParentRight="true" + android:layout_marginTop="10dip" + android:layout_marginRight="8dip" android:singleLine="true" - android:ellipsize="none" - android:textSize="72sp" + android:ellipsize="marquee" + android:gravity="right|bottom" android:textAppearance="?android:attr/textAppearanceMedium" - android:shadowColor="#C0000000" - android:shadowDx="0" - android:shadowDy="0" - android:shadowRadius="3.0" - android:layout_marginBottom="10dip" + android:textSize="22sp" /> + <!-- "emergency calls only" shown when sim is missing or PUKd --> + <TextView + android:id="@+id/emergencyCallText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/carrier" + android:layout_alignParentRight="true" + android:layout_marginTop="0dip" + android:layout_marginRight="8dip" + android:text="@string/emergency_calls_only" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="@color/white" + /> - <TextView android:id="@+id/am_pm" + <!-- time and date --> + <com.android.internal.widget.DigitalClock android:id="@+id/time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_toRightOf="@id/timeDisplay" - android:layout_alignBaseline="@id/timeDisplay" - android:singleLine="true" - android:ellipsize="none" - android:textSize="22sp" - android:layout_marginLeft="8dip" + android:layout_below="@id/carrier" + android:layout_marginTop="32dip" + android:layout_marginLeft="20dip" + android:paddingBottom="8dip" + > + + <TextView android:id="@+id/timeDisplay" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:ellipsize="none" + android:textSize="72sp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:shadowColor="#C0000000" + android:shadowDx="0" + android:shadowDy="0" + android:shadowRadius="3.0" + android:layout_marginBottom="10dip" + /> + + <TextView android:id="@+id/am_pm" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/timeDisplay" + android:layout_alignBaseline="@id/timeDisplay" + android:singleLine="true" + android:ellipsize="none" + android:textSize="22sp" + android:layout_marginLeft="8dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:shadowColor="#C0000000" + android:shadowDx="0" + android:shadowDy="0" + android:shadowRadius="3.0" + /> + </com.android.internal.widget.DigitalClock> + + <TextView + android:id="@+id/date" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/time" + android:layout_marginLeft="24dip" android:textAppearance="?android:attr/textAppearanceMedium" - android:shadowColor="#C0000000" - android:shadowDx="0" - android:shadowDy="0" - android:shadowRadius="3.0" /> - </com.android.internal.widget.DigitalClock> - - <TextView - android:id="@+id/date" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/time" - android:layout_marginLeft="24dip" - android:textAppearance="?android:attr/textAppearanceMedium" - /> - - <TextView - android:id="@+id/status1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/date" - android:layout_marginTop="4dip" - android:layout_marginLeft="24dip" - android:textAppearance="?android:attr/textAppearanceMedium" - android:drawablePadding="4dip" - /> - - <TextView - android:id="@+id/status2" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/status1" - android:layout_marginTop="4dip" - android:layout_marginLeft="24dip" - android:textAppearance="?android:attr/textAppearanceMedium" - android:drawablePadding="4dip" - /> - - <TextView - android:id="@+id/customMsg" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="4.0dip" - android:layout_marginLeft="24dip" - android:layout_marginRight="24dip" - android:layout_below="@id/status2" - android:textAppearance="?android:attr/textAppearanceSmall" - /> - - <TextView - android:id="@+id/screenLocked" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/customMsg" - android:layout_marginLeft="24dip" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_marginTop="12dip" - android:drawablePadding="4dip" - /> - - <com.android.internal.widget.SlidingTab - android:id="@+id/tab_selector2" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_marginBottom="150dip" - /> - - <com.android.internal.widget.SlidingTab - android:id="@+id/tab_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 - android:id="@+id/emergencyCallButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:drawableLeft="@drawable/ic_emergency" - android:layout_centerInParent="true" - android:layout_alignParentBottom="true" - android:layout_marginBottom="80dip" - style="@style/Widget.Button.Transparent" - android:drawablePadding="8dip" - android:visibility="gone" - /> - - <!-- music control buttons --> - <ImageButton - android:id="@+id/musicControlPlay" - android:src="@drawable/ic_media_play" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerInParent="true" - android:layout_alignParentBottom="true" - android:layout_marginBottom="10dip" - android:padding="10px" - android:background="@color/transparent" - android:visibility="gone" - /> - <ImageButton - android:id="@+id/musicControlPause" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_media_pause" - android:layout_centerInParent="true" - android:layout_alignParentBottom="true" - android:layout_marginBottom="10dip" - android:padding="10px" - android:background="@color/transparent" - android:visibility="gone" - /> - <ImageButton - android:id="@+id/musicControlPrevious" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_media_previous" - android:layout_alignParentBottom="true" - android:layout_marginBottom="10dip" - android:padding="10px" - android:layout_toLeftOf="@+id/musicControlPause" - android:background="@color/transparent" - android:visibility="gone" - /> - <ImageButton - android:id="@+id/musicControlNext" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_media_next" - android:layout_alignParentBottom="true" - android:layout_marginBottom="10dip" - android:padding="10px" - android:layout_toRightOf="@+id/musicControlPause" - android:background="@color/transparent" - android:visibility="gone" - /> - - -</RelativeLayout> + <TextView + android:id="@+id/status1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/date" + android:layout_marginTop="4dip" + android:layout_marginLeft="24dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:drawablePadding="4dip" + /> + <TextView + android:id="@+id/status2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/status1" + android:layout_marginTop="4dip" + android:layout_marginLeft="24dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:drawablePadding="4dip" + /> + + <TextView + android:id="@+id/customMsg" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="4.0dip" + android:layout_marginLeft="24dip" + android:layout_marginRight="24dip" + android:layout_below="@id/status2" + android:textAppearance="?android:attr/textAppearanceSmall" + /> + + <TextView + android:id="@+id/screenLocked" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/customMsg" + android:layout_marginLeft="24dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_marginTop="12dip" + android:drawablePadding="4dip" + /> + + <com.android.internal.widget.SlidingTab + android:id="@+id/tab_selector2" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_marginBottom="150dip" + /> + + <com.android.internal.widget.SlidingTab + android:id="@+id/tab_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 + android:id="@+id/emergencyCallButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:drawableLeft="@drawable/ic_emergency" + android:layout_centerInParent="true" + android:layout_alignParentBottom="true" + android:layout_marginBottom="80dip" + style="@style/Widget.Button.Transparent" + android:drawablePadding="8dip" + android:visibility="gone" + /> + + <!-- music control buttons --> + <ImageButton + android:id="@+id/musicControlPlay" + android:src="@drawable/ic_media_play" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:layout_alignParentBottom="true" + android:layout_marginBottom="10dip" + android:padding="10px" + android:background="@color/transparent" + android:visibility="gone" + /> + <ImageButton + android:id="@+id/musicControlPause" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_media_pause" + android:layout_centerInParent="true" + android:layout_alignParentBottom="true" + android:layout_marginBottom="10dip" + android:padding="10px" + android:background="@color/transparent" + android:visibility="gone" + /> + <ImageButton + android:id="@+id/musicControlPrevious" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_media_previous" + android:layout_alignParentBottom="true" + android:layout_marginBottom="10dip" + android:padding="10px" + android:layout_toLeftOf="@+id/musicControlPause" + android:background="@color/transparent" + android:visibility="gone" + /> + <ImageButton + android:id="@+id/musicControlNext" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_media_next" + android:layout_alignParentBottom="true" + android:layout_marginBottom="10dip" + android:padding="10px" + android:layout_toRightOf="@+id/musicControlPause" + android:background="@color/transparent" + android:visibility="gone" + /> + </RelativeLayout> +</android.gesture.GestureOverlayView>
\ No newline at end of file diff --git a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml index b2f96f2..2aacb99 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml @@ -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" @@ -132,13 +142,13 @@ /> <TextView - android:id="@+id/customMsg" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="4.0dip" - android:layout_below="@id/status2" + android:id="@+id/customMsg" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="4.0dip" + android:layout_below="@id/status2" android:textAppearance="?android:attr/textAppearanceSmall" - /> + /> <TextView android:id="@+id/screenLocked" @@ -232,3 +242,4 @@ /> </LinearLayout> +</android.gesture.GestureOverlayView> |