diff options
| author | Steve Kondik <shade@chemlab.org> | 2010-12-15 06:03:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2010-12-15 06:03:24 +0000 |
| commit | 12578a8defce2ad113acf761505c0176db2f6d13 (patch) | |
| tree | bf8c1d3e252f71e093b90228442595b98c219d4e | |
| parent | 42d63ad24c833cb63658de246d4953df24671a63 (diff) | |
| parent | 276430cc139f5fe08b048e144fb9e124868a72e8 (diff) | |
| download | frameworks_base-12578a8defce2ad113acf761505c0176db2f6d13.zip frameworks_base-12578a8defce2ad113acf761505c0176db2f6d13.tar.gz frameworks_base-12578a8defce2ad113acf761505c0176db2f6d13.tar.bz2 | |
Merge "Rotary lockscreen" into froyo
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 |