From 9cec1becd600273254b319cc311e43fe31794d06 Mon Sep 17 00:00:00 2001 From: Ben Komalo Date: Thu, 1 Sep 2011 10:30:13 -0700 Subject: [PATCH] Misc UI fixes for settings (mostly cryptkeeper) - fix padding issues in a lot of cryptkeeper screens - fix sizing of clock that didn't fit anymore with the new font - change titles from green to the new holo blue Bug: 5247866 Change-Id: Ib934e9661c32cce26e1af40eaff133bae11f78dc --- res/layout-land/crypt_keeper_progress.xml | 2 +- .../wifi_settings_for_setup_wizard_xl.xml | 2 +- res/layout-sw600dp/crypt_keeper_password_entry.xml | 3 +++ res/layout-sw600dp/crypt_keeper_progress.xml | 9 ++++++--- .../wifi_settings_for_setup_wizard_xl.xml | 2 +- .../date_time_settings_setupwizard.xml | 2 +- res/layout/crypt_keeper_progress.xml | 2 +- res/layout/crypt_keeper_status.xml | 12 ++++++------ res/values-sw600dp/dimens.xml | 1 + res/values/colors.xml | 11 +++++------ res/values/dimens.xml | 2 ++ 11 files changed, 28 insertions(+), 20 deletions(-) diff --git a/res/layout-land/crypt_keeper_progress.xml b/res/layout-land/crypt_keeper_progress.xml index 62fb29715bb..3361603ad5b 100644 --- a/res/layout-land/crypt_keeper_progress.xml +++ b/res/layout-land/crypt_keeper_progress.xml @@ -30,7 +30,7 @@ android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:textSize="30dip" - android:textColor="#ff99cc00" + android:textColor="@color/title_color" android:text="@string/crypt_keeper_setup_title" android:gravity="bottom" /> diff --git a/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml b/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml index 7c5b274a600..8094b74a20f 100644 --- a/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml +++ b/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml @@ -47,7 +47,7 @@ android:layout_marginLeft="16dip" android:layout_below="@id/top_padding_layout" android:textSize="32dip" - android:textColor="#ff99cc00" + android:textColor="@color/title_color" android:text="@string/wifi_setup_title" android:gravity="bottom"/> diff --git a/res/layout-sw600dp/crypt_keeper_password_entry.xml b/res/layout-sw600dp/crypt_keeper_password_entry.xml index bc2b353f0d3..ad8205afcc2 100644 --- a/res/layout-sw600dp/crypt_keeper_password_entry.xml +++ b/res/layout-sw600dp/crypt_keeper_password_entry.xml @@ -20,6 +20,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" > + + @@ -68,8 +70,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/top_divider" - android:paddingLeft="152dip" android:paddingTop="21dip" + android:layout_marginLeft="16dip" + android:layout_marginRight="16dip" android:textAppearance="?android:attr/textAppearanceMedium" /> @@ -78,7 +81,6 @@ android:id="@+id/bottom_divider" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="152dip" android:layout_above="@+id/factory_reset" android:visibility="gone" > @@ -96,6 +98,7 @@ android:layout_alignParentRight="true" android:layout_alignParentBottom="true" android:layout_marginBottom="80dip" + android:layout_marginRight="16dip" android:text="@string/master_clear_button_text" android:visibility="gone" /> diff --git a/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml b/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml index 9260702e298..20f5784a128 100644 --- a/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml +++ b/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml @@ -47,7 +47,7 @@ android:layout_marginLeft="16dip" android:layout_below="@id/top_padding_layout" android:textSize="32dip" - android:textColor="#ff99cc00" + android:textColor="@color/title_color" android:text="@string/wifi_setup_title" android:gravity="bottom"/> diff --git a/res/layout-sw720dp/date_time_settings_setupwizard.xml b/res/layout-sw720dp/date_time_settings_setupwizard.xml index 1fc25da5d7c..b48447266af 100644 --- a/res/layout-sw720dp/date_time_settings_setupwizard.xml +++ b/res/layout-sw720dp/date_time_settings_setupwizard.xml @@ -34,7 +34,7 @@ android:layout_marginLeft="16dip" android:layout_alignParentTop="true" android:textSize="32dip" - android:textColor="#FF99cc00" + android:textColor="@color/title_color" android:text="@string/date_and_time_settings_title_setup_wizard" android:gravity="bottom" /> diff --git a/res/layout/crypt_keeper_progress.xml b/res/layout/crypt_keeper_progress.xml index 9677c3d2c36..35760cf69c5 100644 --- a/res/layout/crypt_keeper_progress.xml +++ b/res/layout/crypt_keeper_progress.xml @@ -30,7 +30,7 @@ android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:textSize="30dip" - android:textColor="#ff99cc00" + android:textColor="@color/title_color" android:text="@string/crypt_keeper_setup_title" android:gravity="bottom" /> diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml index 59d23650368..b9c82884b2e 100644 --- a/res/layout/crypt_keeper_status.xml +++ b/res/layout/crypt_keeper_status.xml @@ -19,10 +19,10 @@ 48dip 16dip 26dip + 120sp diff --git a/res/values/colors.xml b/res/values/colors.xml index 09f2ca270dc..2bba937671a 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -4,9 +4,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,12 +25,11 @@ #793A7F #8E562A #7C3030 - + #ff9a9a9a #ff666666 #ff9a9a9a #20ffffff - #ff99cc00 - - + @android:color/holo_blue_light + \ No newline at end of file diff --git a/res/values/dimens.xml b/res/values/dimens.xml index dbe4c327b79..ffdec524516 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -32,4 +32,6 @@ 440dip 8dip + + 100sp