diff options
author | Daniel Sandler <dsandler@google.com> | 2009-11-23 16:00:02 -0500 |
---|---|---|
committer | Daniel Sandler <dsandler@google.com> | 2009-11-23 16:00:02 -0500 |
commit | 638636146d23d7cf88a1a301fe5f8c03dde69ed1 (patch) | |
tree | 432949abe6e7ba30f260ac20bf237ec2d66c4e98 | |
parent | ddacabc24b515db4fa6c7a289ef81d8050c8062c (diff) | |
download | android_packages_apps_DeskClock-638636146d23d7cf88a1a301fe5f8c03dde69ed1.tar.gz android_packages_apps_DeskClock-638636146d23d7cf88a1a301fe5f8c03dde69ed1.tar.bz2 android_packages_apps_DeskClock-638636146d23d7cf88a1a301fe5f8c03dde69ed1.zip |
Continued UI fit-and-finish for DeskClock.
Bug: http://b/2278197
-rw-r--r-- | res/drawable-hdpi/ic_lock_idle_alarm.png | bin | 1375 -> 1197 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_lock_idle_alarm_saver.png | bin | 1547 -> 815 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_lock_idle_alarm.png | bin | 924 -> 786 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_lock_idle_alarm_saver.png | bin | 1006 -> 572 bytes | |||
-rw-r--r-- | res/layout-land/desk_clock.xml | 15 | ||||
-rw-r--r-- | res/layout/desk_clock.xml | 22 | ||||
-rw-r--r-- | res/layout/desk_clock_saver.xml | 3 | ||||
-rw-r--r-- | res/layout/desk_clock_time_date.xml | 3 |
8 files changed, 28 insertions, 15 deletions
diff --git a/res/drawable-hdpi/ic_lock_idle_alarm.png b/res/drawable-hdpi/ic_lock_idle_alarm.png Binary files differindex 41ad27d46..6b4f66d24 100644 --- a/res/drawable-hdpi/ic_lock_idle_alarm.png +++ b/res/drawable-hdpi/ic_lock_idle_alarm.png diff --git a/res/drawable-hdpi/ic_lock_idle_alarm_saver.png b/res/drawable-hdpi/ic_lock_idle_alarm_saver.png Binary files differindex 72e28475b..fbc98d884 100644 --- a/res/drawable-hdpi/ic_lock_idle_alarm_saver.png +++ b/res/drawable-hdpi/ic_lock_idle_alarm_saver.png diff --git a/res/drawable-mdpi/ic_lock_idle_alarm.png b/res/drawable-mdpi/ic_lock_idle_alarm.png Binary files differindex ee7752655..d29c6c332 100644 --- a/res/drawable-mdpi/ic_lock_idle_alarm.png +++ b/res/drawable-mdpi/ic_lock_idle_alarm.png diff --git a/res/drawable-mdpi/ic_lock_idle_alarm_saver.png b/res/drawable-mdpi/ic_lock_idle_alarm_saver.png Binary files differindex 18f7515b7..a1815df14 100644 --- a/res/drawable-mdpi/ic_lock_idle_alarm_saver.png +++ b/res/drawable-mdpi/ic_lock_idle_alarm_saver.png diff --git a/res/layout-land/desk_clock.xml b/res/layout-land/desk_clock.xml index c95619512..0cbaccfb3 100644 --- a/res/layout-land/desk_clock.xml +++ b/res/layout-land/desk_clock.xml @@ -25,20 +25,23 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" - android:paddingTop="18dip" + android:paddingTop="25dip" > <!-- Entire display region (everything but bottom buttons) --> + <!-- Left margin is 4 dip shy of desired to allow for the time to + "hang off" the left-hand side, accommodating the extra glyph + escapement in Clockopia and 3px of text shadow --> <LinearLayout android:orientation="vertical" android:layout_gravity="left" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:layout_marginLeft="20dip" - android:layout_marginTop="20dip" - android:layout_marginRight="20dip" - android:layout_marginBottom="14dip" + android:layout_marginLeft="25dip" + android:layout_marginTop="18dip" + android:layout_marginRight="18dip" + android:layout_marginBottom="12dip" > <!-- across the top: next alarm, battery, nightmode button --> @@ -48,6 +51,7 @@ android:layout_height="wrap_content" android:layout_weight="0" android:layout_marginBottom="6dip" + android:layout_marginLeft="4dip" android:gravity="center_vertical" > <TextView android:id="@+id/nextAlarm" @@ -88,7 +92,6 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="bottom" - android:layout_marginBottom="12dip" > <include layout="@layout/desk_clock_time_date" diff --git a/res/layout/desk_clock.xml b/res/layout/desk_clock.xml index 7ffd1d21f..271dc65fc 100644 --- a/res/layout/desk_clock.xml +++ b/res/layout/desk_clock.xml @@ -23,24 +23,28 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" > + <!-- the top padding accounts for the status bar area --> <LinearLayout android:id="@+id/desk_clock" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" - android:paddingTop="18dip" + android:paddingTop="25dip" > <!-- Entire display region (everything but bottom buttons) --> + <!-- Left margin is 4 dip shy of desired to allow for the time to + "hang off" the left-hand side, accommodating the extra glyph + escapement in Clockopia and 3px of text shadow --> <LinearLayout android:orientation="vertical" android:layout_gravity="left" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:layout_marginLeft="20dip" - android:layout_marginTop="20dip" - android:layout_marginRight="14dip" + android:layout_marginLeft="22dip" + android:layout_marginTop="18dip" + android:layout_marginRight="18dip" android:layout_marginBottom="14dip" > @@ -50,14 +54,16 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="0" + android:layout_marginLeft="4dip" android:layout_marginBottom="6dip" + android:gravity="center_vertical" > <TextView android:id="@+id/nextAlarm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" android:gravity="left" - android:textAppearance="?android:attr/textAppearanceMedium" + android:textAppearance="?android:attr/textAppearanceMedium" android:drawablePadding="6dip" android:drawableLeft="@drawable/ic_lock_idle_alarm" android:shadowColor="#C0000000" @@ -66,7 +72,7 @@ android:shadowRadius="3.0" /> <ImageButton android:id="@+id/nightmode_button" - style="@style/RoundTouchButton" + style="@style/RoundTouchButton" android:layout_weight="0" android:layout_height="wrap_content" android:layout_width="wrap_content" @@ -86,13 +92,15 @@ android:layout_height="wrap_content" android:layout_weight="0" android:layout_marginTop="12dip" - android:layout_marginBottom="12dip" + android:layout_marginBottom="40dip" + android:layout_marginLeft="4dip" /> <include layout="@layout/desk_clock_battery" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_weight="0" + android:layout_marginLeft="4dip" /> </LinearLayout> diff --git a/res/layout/desk_clock_saver.xml b/res/layout/desk_clock_saver.xml index 945066176..fcde36221 100644 --- a/res/layout/desk_clock_saver.xml +++ b/res/layout/desk_clock_saver.xml @@ -39,8 +39,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="10dip" + android:layout_marginLeft="4dip" android:gravity="left" - android:textAppearance="?android:attr/textAppearanceMedium" + android:textAppearance="?android:attr/textAppearanceMedium" android:drawablePadding="6dip" /> <include layout="@layout/desk_clock_time_date" diff --git a/res/layout/desk_clock_time_date.xml b/res/layout/desk_clock_time_date.xml index 2c1459514..5b2af22e6 100644 --- a/res/layout/desk_clock_time_date.xml +++ b/res/layout/desk_clock_time_date.xml @@ -54,7 +54,7 @@ android:textStyle="bold" android:singleLine="true" android:ellipsize="none" - android:layout_marginLeft="3dip" + android:layout_marginLeft="4dip" android:shadowColor="#C0000000" android:shadowDx="0" android:shadowDy="0" @@ -72,6 +72,7 @@ android:shadowDx="0" android:shadowDy="0" android:shadowRadius="3.0" + android:layout_marginLeft="4dip" /> </LinearLayout> |