diff options
9 files changed, 13 insertions, 7 deletions
diff --git a/packages/SystemUI/res-keyguard/drawable/kg_emergency_button_background.xml b/packages/SystemUI/res-keyguard/drawable/kg_emergency_button_background.xml index 99c70a54a3cd..b96c07ea53f0 100644 --- a/packages/SystemUI/res-keyguard/drawable/kg_emergency_button_background.xml +++ b/packages/SystemUI/res-keyguard/drawable/kg_emergency_button_background.xml @@ -17,9 +17,8 @@ <ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?attr/wallpaperTextColorSecondary"> <item android:id="@android:id/background"> - <shape - android:color="@android:color/transparent"> - <stroke android:width="1dp" android:color="?android:attr/textColorSecondary"/> + <shape android:shape="rectangle"> + <solid android:color="?android:attr/colorAccent"/> <corners android:radius="24dp"/> </shape> </item> @@ -29,4 +28,4 @@ <corners android:radius="24dp"/> </shape> </item> -</ripple>
\ No newline at end of file +</ripple> diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_emergency_carrier_area.xml b/packages/SystemUI/res-keyguard/layout/keyguard_emergency_carrier_area.xml index 370576b43463..0ee1b694432d 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_emergency_carrier_area.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_emergency_carrier_area.xml @@ -43,7 +43,7 @@ <com.android.keyguard.EmergencyButton android:id="@+id/emergency_call_button" android:layout_width="wrap_content" - android:layout_height="32dp" + android:layout_height="48dp" android:layout_marginBottom="12dp" android:text="@*android:string/lockscreen_emergency_call" style="@style/Keyguard.TextView.EmergencyButton" /> diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml index dc2d11d601b4..1a38585ea78d 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml @@ -67,6 +67,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_gravity="bottom|center_horizontal" + android:layout_marginTop="@dimen/keyguard_eca_top_margin" android:gravity="center_horizontal" /> </LinearLayout> </FrameLayout> diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml index aa14645a6093..6ae759c66bea 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml @@ -188,6 +188,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_gravity="bottom|center_horizontal" + android:layout_marginTop="@dimen/keyguard_eca_top_margin" android:gravity="center_horizontal"/> </com.android.keyguard.KeyguardPINView> diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_sim_pin_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_sim_pin_view.xml index 64ccefd2e4ee..f709424a7d12 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_sim_pin_view.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_sim_pin_view.xml @@ -198,6 +198,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_gravity="bottom|center_horizontal" + android:layout_marginTop="@dimen/keyguard_eca_top_margin" android:gravity="center_horizontal"/> </com.android.keyguard.KeyguardSimPinView> diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml index 70f495c1245b..2f9fed610f1d 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml @@ -199,5 +199,6 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_gravity="bottom|center_horizontal" + android:layout_marginTop="@dimen/keyguard_eca_top_margin" android:gravity="center_horizontal"/> </com.android.keyguard.KeyguardSimPukView> diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml index aa87107f954f..a928b759e1b8 100644 --- a/packages/SystemUI/res-keyguard/values/dimens.xml +++ b/packages/SystemUI/res-keyguard/values/dimens.xml @@ -40,6 +40,8 @@ <dimen name="keyguard_security_view_top_margin">8dp</dimen> <dimen name="keyguard_security_view_lateral_margin">36dp</dimen> + <dimen name="keyguard_eca_top_margin">24dp</dimen> + <!-- EmergencyCarrierArea overlap - amount to overlap the emergency button and carrier text. Should be 0 on devices with plenty of room (e.g. tablets) --> <dimen name="eca_overlap">-10dip</dimen> diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml index 2e99dea6e18b..cd82b805be9c 100644 --- a/packages/SystemUI/res-keyguard/values/styles.xml +++ b/packages/SystemUI/res-keyguard/values/styles.xml @@ -23,12 +23,13 @@ <item name="android:textSize">@dimen/kg_status_line_font_size</item> </style> <style name="Keyguard.TextView.EmergencyButton" parent="Theme.SystemUI"> - <item name="android:textColor">?android:attr/textColorSecondary</item> + <item name="android:textColor">?android:attr/textColorPrimaryInverse</item> <item name="android:textSize">14dp</item> <item name="android:background">@drawable/kg_emergency_button_background</item> <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item> <item name="android:paddingLeft">12dp</item> <item name="android:paddingRight">12dp</item> + <item name="android:stateListAnimator">@null</item> </style> <style name="NumPadKey" parent="Theme.SystemUI"> <item name="android:colorControlNormal">?android:attr/colorBackground</item> diff --git a/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java b/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java index b7d7498e8960..707ee298a55a 100644 --- a/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java +++ b/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java @@ -154,7 +154,7 @@ public class EmergencyButton extends Button { **/ public void reloadColors() { int color = Utils.getColorAttrDefaultColor(getContext(), - android.R.attr.textColorSecondary); + android.R.attr.textColorPrimaryInverse); setTextColor(color); setBackground(getContext() .getDrawable(com.android.systemui.R.drawable.kg_emergency_button_background)); |