Upgrading icons.
Upgraded stopwatch lap, add cities, timer tab, and no_alarms icons.
Change-Id: I19f2c600893b94592701a8ca6b33ee5f280c549e
diff --git a/res/drawable-hdpi/ic_globe.png b/res/drawable-hdpi/ic_globe.png
index 2376689..548f650 100644
--- a/res/drawable-hdpi/ic_globe.png
+++ b/res/drawable-hdpi/ic_globe.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_timer_activated.png b/res/drawable-hdpi/ic_tab_timer_activated.png
index 385ae75..a61d1f0 100644
--- a/res/drawable-hdpi/ic_tab_timer_activated.png
+++ b/res/drawable-hdpi/ic_tab_timer_activated.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_timer_normal.png b/res/drawable-hdpi/ic_tab_timer_normal.png
index 22b0572..03af69d 100644
--- a/res/drawable-hdpi/ic_tab_timer_normal.png
+++ b/res/drawable-hdpi/ic_tab_timer_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_globe.png b/res/drawable-mdpi/ic_globe.png
index 4029e8c..f68ce41 100644
--- a/res/drawable-mdpi/ic_globe.png
+++ b/res/drawable-mdpi/ic_globe.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_timer_activated.png b/res/drawable-mdpi/ic_tab_timer_activated.png
index 6225480..1606c19 100644
--- a/res/drawable-mdpi/ic_tab_timer_activated.png
+++ b/res/drawable-mdpi/ic_tab_timer_activated.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_timer_normal.png b/res/drawable-mdpi/ic_tab_timer_normal.png
index e3f8c81..3970379 100644
--- a/res/drawable-mdpi/ic_tab_timer_normal.png
+++ b/res/drawable-mdpi/ic_tab_timer_normal.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_globe.png b/res/drawable-xhdpi/ic_globe.png
index ebf3301..43429e2 100644
--- a/res/drawable-xhdpi/ic_globe.png
+++ b/res/drawable-xhdpi/ic_globe.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_timer_activated.png b/res/drawable-xhdpi/ic_tab_timer_activated.png
index 7dc12f5..b6aa142 100644
--- a/res/drawable-xhdpi/ic_tab_timer_activated.png
+++ b/res/drawable-xhdpi/ic_tab_timer_activated.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_timer_normal.png b/res/drawable-xhdpi/ic_tab_timer_normal.png
index 36620e2..d557d28 100644
--- a/res/drawable-xhdpi/ic_tab_timer_normal.png
+++ b/res/drawable-xhdpi/ic_tab_timer_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_globe.png b/res/drawable-xxhdpi/ic_globe.png
index 2b53334..e751fb3 100644
--- a/res/drawable-xxhdpi/ic_globe.png
+++ b/res/drawable-xxhdpi/ic_globe.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_tab_timer_activated.png b/res/drawable-xxhdpi/ic_tab_timer_activated.png
index f8b3402..7070a2f 100644
--- a/res/drawable-xxhdpi/ic_tab_timer_activated.png
+++ b/res/drawable-xxhdpi/ic_tab_timer_activated.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_tab_timer_normal.png b/res/drawable-xxhdpi/ic_tab_timer_normal.png
index 3a44a69..4b909b6 100644
--- a/res/drawable-xxhdpi/ic_tab_timer_normal.png
+++ b/res/drawable-xxhdpi/ic_tab_timer_normal.png
Binary files differ
diff --git a/res/drawable/ic_lap.xml b/res/drawable/ic_lap.xml
index fb504a8..f80cf77 100644
--- a/res/drawable/ic_lap.xml
+++ b/res/drawable/ic_lap.xml
@@ -16,9 +16,9 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:state_window_focused="true"
- android:drawable="@drawable/ic_lap_pressed" />
+ android:drawable="@drawable/ic_lapalternate_pressed" />
<item android:state_pressed="true" android:state_window_focused="true"
- android:drawable="@drawable/ic_lap_pressed" />
+ android:drawable="@drawable/ic_lapalternate_pressed" />
<item android:state_focused="false"
- android:drawable="@drawable/ic_lap_normal" />
+ android:drawable="@drawable/ic_lapalternate" />
</selector>
diff --git a/res/layout-sw600dp-land/alarm_clock.xml b/res/layout-sw600dp-land/alarm_clock.xml
index 29cc456..ed93c26 100644
--- a/res/layout-sw600dp-land/alarm_clock.xml
+++ b/res/layout-sw600dp-land/alarm_clock.xml
@@ -43,14 +43,15 @@
/>
<TextView
android:id="@+id/alarms_empty_view"
+ style="@style/no_alarms"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/no_alarms"
- style="@style/small_thin"
- android:drawableTop="@drawable/ic_alarm"
- android:contentDescription="@string/no_alarms"
android:layout_gravity="center"
- android:textColor="@color/grey" />
+ android:contentDescription="@string/no_alarms"
+ android:drawableTop="@drawable/ic_noalarms"
+ android:text="@string/no_alarms"
+ android:textColor="#4cffffff"
+ android:paddingBottom="88dp" />
<com.android.deskclock.widget.ActionableToastBar
android:id="@+id/undo_bar"
android:layout_width="match_parent"
@@ -79,14 +80,14 @@
<ImageButton
android:id="@+id/alarm_add_alarm"
android:contentDescription="@string/add_alarm"
- android:layout_width="@dimen/add_alarm_button_size"
- android:layout_height="@dimen/add_alarm_button_size"
- android:layout_marginTop="@dimen/add_alarm_layout_margin"
- android:layout_marginBottom="@dimen/add_alarm_layout_margin"
- android:layout_marginRight="@dimen/add_alarm_layout_margin"
- android:layout_marginEnd="@dimen/add_alarm_layout_margin"
- android:layout_marginLeft="@dimen/add_alarm_layout_margin"
- android:layout_marginStart="@dimen/add_alarm_layout_margin"
+ android:layout_width="@dimen/footer_button_size"
+ android:layout_height="@dimen/footer_button_size"
+ android:layout_marginTop="@dimen/footer_button_layout_margin"
+ android:layout_marginBottom="@dimen/footer_button_layout_margin"
+ android:layout_marginRight="@dimen/footer_button_layout_margin"
+ android:layout_marginEnd="@dimen/footer_button_layout_margin"
+ android:layout_marginLeft="@dimen/footer_button_layout_margin"
+ android:layout_marginStart="@dimen/footer_button_layout_margin"
android:layout_gravity="center"
android:src="@drawable/ic_add"
style="@style/button"
@@ -98,7 +99,7 @@
android:background="@drawable/item_background"
android:onClick="clockButtonsOnClick"
android:layout_gravity="end|center_vertical"
- android:layout_width="@dimen/add_alarm_button_size"
- android:layout_height="@dimen/add_alarm_button_size" />
+ android:layout_width="@dimen/footer_button_size"
+ android:layout_height="@dimen/footer_button_size" />
</FrameLayout>
</FrameLayout>
diff --git a/res/layout/alarm_clock.xml b/res/layout/alarm_clock.xml
index f7005a2..7ae1d82 100644
--- a/res/layout/alarm_clock.xml
+++ b/res/layout/alarm_clock.xml
@@ -30,16 +30,19 @@
android:divider="@null"
android:dividerHeight="0dp"
/>
+
<TextView
android:id="@+id/alarms_empty_view"
+ style="@style/no_alarms"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/no_alarms"
- style="@style/small_thin"
- android:drawableTop="@drawable/ic_alarm"
- android:contentDescription="@string/no_alarms"
android:layout_gravity="center"
- android:textColor="@color/grey" />
+ android:contentDescription="@string/no_alarms"
+ android:drawableTop="@drawable/ic_noalarms"
+ android:text="@string/no_alarms"
+ android:textColor="#4cffffff"
+ android:paddingBottom="88dp" />
+
<com.android.deskclock.widget.ActionableToastBar
android:id="@+id/undo_bar"
android:layout_width="match_parent"
@@ -59,14 +62,14 @@
<ImageButton
android:id="@+id/alarm_add_alarm"
android:contentDescription="@string/add_alarm"
- android:layout_width="@dimen/add_alarm_button_size"
- android:layout_height="@dimen/add_alarm_button_size"
- android:layout_marginTop="@dimen/add_alarm_layout_margin"
- android:layout_marginBottom="@dimen/add_alarm_layout_margin"
- android:layout_marginRight="@dimen/add_alarm_layout_margin"
- android:layout_marginEnd="@dimen/add_alarm_layout_margin"
- android:layout_marginLeft="@dimen/add_alarm_layout_margin"
- android:layout_marginStart="@dimen/add_alarm_layout_margin"
+ android:layout_width="@dimen/footer_button_size"
+ android:layout_height="@dimen/footer_button_size"
+ android:layout_marginTop="@dimen/footer_button_layout_margin"
+ android:layout_marginBottom="@dimen/footer_button_layout_margin"
+ android:layout_marginRight="@dimen/footer_button_layout_margin"
+ android:layout_marginEnd="@dimen/footer_button_layout_margin"
+ android:layout_marginLeft="@dimen/footer_button_layout_margin"
+ android:layout_marginStart="@dimen/footer_button_layout_margin"
android:layout_gravity="center"
android:src="@drawable/ic_add"
style="@style/button"
@@ -78,7 +81,7 @@
android:background="@drawable/item_background"
android:onClick="clockButtonsOnClick"
android:layout_gravity="end|center_vertical"
- android:layout_width="@dimen/add_alarm_button_size"
- android:layout_height="@dimen/add_alarm_button_size" />
+ android:layout_width="@dimen/footer_button_size"
+ android:layout_height="@dimen/footer_button_size" />
</FrameLayout>
</FrameLayout>
diff --git a/res/layout/clock_fragment.xml b/res/layout/clock_fragment.xml
index 5bfdb0c..d7fad8b 100644
--- a/res/layout/clock_fragment.xml
+++ b/res/layout/clock_fragment.xml
@@ -37,16 +37,16 @@
<ImageButton
android:id="@+id/cities_button"
android:contentDescription="@string/button_cities"
- android:layout_width="56dip"
- android:layout_height="56dip"
- android:layout_marginTop="16dp"
- android:layout_marginBottom="16dp"
- android:layout_marginRight="16dp"
- android:layout_marginEnd="16dp"
- android:layout_marginLeft="16dp"
- android:layout_marginStart="16dp"
+ android:layout_width="@dimen/footer_button_size"
+ android:layout_height="@dimen/footer_button_size"
+ android:layout_marginTop="@dimen/footer_button_layout_margin"
+ android:layout_marginBottom="@dimen/footer_button_layout_margin"
+ android:layout_marginRight="@dimen/footer_button_layout_margin"
+ android:layout_marginEnd="@dimen/footer_button_layout_margin"
+ android:layout_marginLeft="@dimen/footer_button_layout_margin"
+ android:layout_marginStart="@dimen/footer_button_layout_margin"
android:layout_gravity="center_horizontal"
- android:src="@drawable/ic_location"
+ android:src="@drawable/ic_globe"
style="@style/button"
android:onClick="clockButtonsOnClick"
android:background="@drawable/main_button_normal" />
@@ -57,8 +57,8 @@
android:background="@drawable/item_background"
android:onClick="clockButtonsOnClick"
android:layout_gravity="end|center_vertical"
- android:layout_width="56dp"
- android:layout_height="56dp" />
+ android:layout_width="@dimen/footer_button_size"
+ android:layout_height="@dimen/footer_button_size" />
</FrameLayout>
</FrameLayout>
</FrameLayout>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 12aa28b..78c9b77 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -49,6 +49,7 @@
<dimen name="body_font_size">24sp</dimen>
<dimen name="main_ampm_font_size">33sp</dimen>
<dimen name="alarm_time_font_size">64sp</dimen>
+ <dimen name="no_alarms_font_size">48sp</dimen>
<dimen name="body_font_padding">8dp</dimen>
<dimen name="medium_font_padding">24dp</dimen>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0f07d99..f7d7152 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -52,8 +52,8 @@
<dimen name="actionbar_tab_padding">0dip</dimen>
<dimen name="actionbar_title_font_size">22sp</dimen>
- <dimen name="add_alarm_button_size">56dip</dimen>
- <dimen name="add_alarm_layout_margin">16dip</dimen>
+ <dimen name="footer_button_size">56dip</dimen>
+ <dimen name="footer_button_layout_margin">16dip</dimen>
<dimen name="alarm_timeline_width">2dp</dimen>
<dimen name="alarm_timeline_margin_top">50dp</dimen>
@@ -78,6 +78,7 @@
<dimen name="header_font_size">24sp</dimen>
<dimen name="body_font_size">18sp</dimen>
<dimen name="alarm_time_font_size">48sp</dimen>
+ <dimen name="no_alarms_font_size">36sp</dimen>
<dimen name="body_font_padding">4dp</dimen>
<dimen name="button_font_size">24sp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8b255a2..89c2774 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -145,6 +145,12 @@
<item name="android:fontFamily">sans-serif-thin</item>
</style>
+ <style name="no_alarms">
+ <item name="android:textSize">@dimen/no_alarms_font_size</item>
+ <item name="android:textStyle">bold</item>
+ <item name="android:fontFamily">sans-serif-condensed</item>
+ </style>
+
<style name="medium_bold">
<item name="android:textSize">@dimen/medium_font_size</item>
<item name="android:textStyle">bold</item>
diff --git a/src/com/android/deskclock/AlarmTimelineView.java b/src/com/android/deskclock/AlarmTimelineView.java
index ae639a0..c58f556 100644
--- a/src/com/android/deskclock/AlarmTimelineView.java
+++ b/src/com/android/deskclock/AlarmTimelineView.java
@@ -217,8 +217,8 @@
mAlarmTimelineColor = res.getColor(R.color.alarm_timeline_color);
mAlarmTimelineLength = res.getDimensionPixelOffset(R.dimen.alarm_timeline_length);
mAlarmTimelineMarginTop = res.getDimensionPixelOffset(R.dimen.alarm_timeline_margin_top);
- mAlarmTimelineMarginBottom = res.getDimensionPixelOffset(R.dimen.add_alarm_button_size) +
- 2 * res.getDimensionPixelOffset(R.dimen.add_alarm_layout_margin);
+ mAlarmTimelineMarginBottom = res.getDimensionPixelOffset(R.dimen.footer_button_size) +
+ 2 * res.getDimensionPixelOffset(R.dimen.footer_button_layout_margin);
mAlarmNodeRadius = res.getDimensionPixelOffset(R.dimen.alarm_timeline_radius);
mAlarmNodeInnerRadius = res.getDimensionPixelOffset(R.dimen.alarm_timeline_inner_radius);
mAlarmNodeInnerRadiusColor = res.getColor(R.color.blackish);
