Merge "Fix font sizes for night mode." into ub-deskclock-dazzle
diff --git a/res/layout/desk_clock_saver.xml b/res/layout/desk_clock_saver.xml
index 8d173d7..d9fd60d 100644
--- a/res/layout/desk_clock_saver.xml
+++ b/res/layout/desk_clock_saver.xml
@@ -15,81 +15,82 @@
-->
<!-- Special "screen saver mode" with just the time/date on black. -->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:dc="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- android:background="#FF000000">
+ android:background="@color/black"
+ android:orientation="vertical">
<!-- Extra layout to let the clock float in the window -->
<LinearLayout
android:id="@+id/main_clock"
- android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="@dimen/screensaver_margin"
- android:layout_marginStart="@dimen/screensaver_margin"
- android:layout_marginRight="@dimen/screensaver_margin"
+ android:layout_marginBottom="@dimen/screensaver_margin"
android:layout_marginEnd="@dimen/screensaver_margin"
+ android:layout_marginStart="@dimen/screensaver_margin"
android:layout_marginTop="@dimen/time_margin_top"
- android:layout_marginBottom="@dimen/screensaver_margin">
+ android:orientation="vertical">
<TextClock
android:id="@+id/digital_clock"
- android:format12Hour="@string/main_clock_12_hours_format"
- android:format24Hour="@string/clock_24_hours_format"
+ style="@style/big_thin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:singleLine="true"
- android:gravity="center"
- android:ellipsize="none"
android:layout_gravity="center"
android:layout_marginBottom="@dimen/bottom_text_spacing_digital"
- style="@style/big_thin"
- android:textColor="@color/clock_white" />
+ android:ellipsize="none"
+ android:format12Hour="@string/main_clock_12_hours_format"
+ android:format24Hour="@string/clock_24_hours_format"
+ android:gravity="center"
+ android:singleLine="true"
+ android:textColor="@color/clock_white"
+ android:textSize="@dimen/screensaver_font_size" />
<com.android.deskclock.AnalogClock
android:id="@+id/analog_clock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- dc:jewelRadius="5dp"
- dc:jewelOffset="23dp"
- dc:jewelColor="@color/clock_white"
+ android:layout_marginBottom="@dimen/bottom_text_spacing_analog"
android:dial="@drawable/clock_analog_dial_mipmap"
android:hand_hour="@drawable/clock_analog_hour_mipmap"
android:hand_minute="@drawable/clock_analog_minute_mipmap"
- android:layout_marginBottom="@dimen/bottom_text_spacing_analog" />
+ dc:jewelColor="@color/clock_white"
+ dc:jewelOffset="23dp"
+ dc:jewelRadius="5dp" />
+
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:gravity="center" >
- <TextView android:id="@+id/date"
+ android:gravity="center">
+
+ <TextView
+ android:id="@+id/date"
+ style="@style/label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/clock_white"
- style="@style/label"
- android:textSize="@dimen/bottom_text_size"
android:gravity="center"
- android:visibility="gone"
- />
- <TextView android:id="@+id/nextAlarm"
+ android:textColor="@color/clock_white"
+ android:textSize="@dimen/bottom_text_size"
+ android:visibility="gone" />
+
+ <TextView
+ android:id="@+id/nextAlarm"
+ style="@style/label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:drawablePadding="2dip"
- android:drawableLeft="@drawable/ic_alarm_small"
- android:drawableStart="@drawable/ic_alarm_small"
- android:textColor="@color/clock_gray"
- style="@style/label"
- android:textSize="@dimen/bottom_text_size"
android:layout_marginLeft="8dip"
android:layout_marginStart="8dip"
+ android:drawableLeft="@drawable/ic_alarm_small"
+ android:drawablePadding="2dip"
+ android:drawableStart="@drawable/ic_alarm_small"
android:gravity="center"
- android:visibility="gone"
- />
+ android:textColor="@color/clock_gray"
+ android:textSize="@dimen/bottom_text_size"
+ android:visibility="gone" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
diff --git a/res/values-sw360dp/dimens.xml b/res/values-sw360dp/dimens.xml
index 3f4aa13..8417023 100644
--- a/res/values-sw360dp/dimens.xml
+++ b/res/values-sw360dp/dimens.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<resources>
<dimen name="big_font_size">70sp</dimen>
+ <dimen name="screensaver_font_size">80sp</dimen>
</resources>
\ No newline at end of file
diff --git a/res/values-sw400dp/dimens.xml b/res/values-sw400dp/dimens.xml
new file mode 100644
index 0000000..9b09c64
--- /dev/null
+++ b/res/values-sw400dp/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+ 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+ <dimen name="screensaver_font_size">88sp</dimen>
+</resources>
\ No newline at end of file
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index f5f2244..faba7e7 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -40,6 +40,7 @@
<dimen name="clock_side_padding">48dip</dimen>
<dimen name="clock_side_padding_reduced">36dip</dimen>
+ <dimen name="screensaver_font_size">160sp</dimen>
<dimen name="big_font_size">115sp</dimen>
<dimen name="medium_font_size">96sp</dimen>
<dimen name="label_font_size">18sp</dimen>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c75f4c8..6fbd944 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -67,6 +67,7 @@
<dimen name="alarm_lockscreen_pulse_radius">128dp</dimen>
<dimen name="alarm_lockscreen_bottom_margin">40dp</dimen>
+ <dimen name="screensaver_font_size">70sp</dimen>
<dimen name="big_font_size">60sp</dimen>
<dimen name="medium_font_size">56sp</dimen>
<dimen name="small_font_size">32sp</dimen>