From 276430cc139f5fe08b048e144fb9e124868a72e8 Mon Sep 17 00:00:00 2001
From: Robert Burns <burnsra@gmail.com>
Date: Wed, 8 Dec 2010 07:47:26 -0500
Subject: Rotary lockscreen

Tested on HDPI device, would like someone to test on MDPI/LDPI device

* Cleaned up formatting
Change-Id: I30d785877246aff49b9310396b092ba3cfb3d0ff
---
 core/java/android/provider/Settings.java                  | 8 +++++++-
 core/java/com/android/internal/widget/RotarySelector.java | 4 ++--
 core/res/res/layout/keyguard_screen_tab_unlock.xml        | 9 +++++++++
 core/res/res/layout/keyguard_screen_tab_unlock_land.xml   | 9 +++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 0bc241e..1c65617 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2254,8 +2254,14 @@ 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 
+         * @hide
          */
         public static final String NOTIF_EXPANDED_BAR_COLOR = "notif_expanded_bar_color";
 
diff --git a/core/java/com/android/internal/widget/RotarySelector.java b/core/java/com/android/internal/widget/RotarySelector.java
index a2a38dc..2bed073 100644
--- a/core/java/com/android/internal/widget/RotarySelector.java
+++ b/core/java/com/android/internal/widget/RotarySelector.java
@@ -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
diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml
index 365e829..58d0bc0 100644
--- a/core/res/res/layout/keyguard_screen_tab_unlock.xml
+++ b/core/res/res/layout/keyguard_screen_tab_unlock.xml
@@ -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
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 9e37e9f..5a60540 100644
--- a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml
+++ b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml
@@ -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
-- 
cgit v1.1