DeskClock: Modernize timer_setup_time look

Change-Id: I6ba715acbcdfcbd7472d5f7bf2008efa6027139a

11 files changed, 6 insertions, 66 deletions

diff --git a/res/layout/timer_setup_time.xml b/res/layout/timer_setup_time.xml
index 947723c00..572063fc6 100644
--- a/res/layout/timer_setup_time.xml
+++ b/res/layout/timer_setup_time.xml
@@ -19,9 +19,11 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:layout_gravity="center"
     android:gravity="center"
+    android:minHeight="@dimen/timer_setup_top_size"
     android:layoutDirection="ltr"
     android:orientation="horizontal">
 
@@ -42,7 +44,6 @@
         android:id="@+id/timer_setup_delete"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/timer_setup_delete_margin"
         android:contentDescription="@string/timer_delete"
         android:padding="12dp"
         android:scaleType="center"
diff --git a/res/layout/timer_setup_view.xml b/res/layout/timer_setup_view.xml
index ec99b42cf..526862fb9 100644
--- a/res/layout/timer_setup_view.xml
+++ b/res/layout/timer_setup_view.xml
@@ -21,8 +21,7 @@
     android:layout_height="match_parent"
     android:gravity="center_horizontal"
     android:orientation="vertical"
-    android:paddingBottom="@dimen/fab_height"
-    android:paddingTop="@dimen/timer_setup_top_margin">
+    android:paddingBottom="@dimen/fab_height">
 
     <include layout="@layout/timer_setup_time" />
 
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 0860a682f..ea3ec5e5b 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -20,9 +20,6 @@
 <resources>
     <dimen name="time_margin_top">24dip</dimen>
 
-    <dimen name="timer_setup_delete_margin">12sp</dimen>
-    <dimen name="timer_setup_digit_font_size">26sp</dimen>
-
     <!-- Size of margin for circles. -->
     <dimen name="analog_clock_margin">70dp</dimen>
     <dimen name="analog_clock_size">168dp</dimen>
diff --git a/res/values-sw320dp-port/dimens.xml b/res/values-sw320dp-port/dimens.xml
index b3b3702f6..6a3e8ed70 100644
--- a/res/values-sw320dp-port/dimens.xml
+++ b/res/values-sw320dp-port/dimens.xml
@@ -16,5 +16,4 @@
 
 <resources>
     <dimen name="no_alarms_size">120dp</dimen>
-    <dimen name="timer_setup_digit_font_size">40sp</dimen>
 </resources>
diff --git a/res/values-sw320dp/dimens.xml b/res/values-sw320dp/dimens.xml
index cb60168f6..d64c2058f 100644
--- a/res/values-sw320dp/dimens.xml
+++ b/res/values-sw320dp/dimens.xml
@@ -16,5 +16,4 @@
 
 <resources>
     <dimen name="big_font_size">60sp</dimen>
-    <dimen name="timer_setup_digit_font_size">32sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/res/values-sw360dp-land/dimens.xml b/res/values-sw360dp-land/dimens.xml
deleted file mode 100644
index 33bf986c0..000000000
--- a/res/values-sw360dp-land/dimens.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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="timer_setup_digit_font_size">40sp</dimen>
-</resources>
diff --git a/res/values-sw360dp/dimens.xml b/res/values-sw360dp/dimens.xml
index 683eda916..d80b3bb37 100644
--- a/res/values-sw360dp/dimens.xml
+++ b/res/values-sw360dp/dimens.xml
@@ -18,5 +18,4 @@
     <dimen name="big_font_size">70sp</dimen>
     <dimen name="main_clock_font_size">80sp</dimen>
     <dimen name="no_alarms_size">120dp</dimen>
-    <dimen name="timer_setup_digit_font_size">56sp</dimen>
 </resources>
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
index 179383231..157e8b4ba 100644
--- a/res/values-sw600dp-land/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -19,9 +19,6 @@
 <resources>
     <dimen name="time_margin_top">32dip</dimen>
 
-    <dimen name="timer_setup_delete_margin">19sp</dimen>
-    <dimen name="timer_setup_digit_font_size">46sp</dimen>
-
     <!-- Size of margin for circles. -->
     <dimen name="circle_margin_top">0dp</dimen>
     <dimen name="analog_clock_margin">48dp</dimen>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index b91254610..2c3a50de6 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -44,11 +44,6 @@
 
     <dimen name="label_margin_big">8dp</dimen>
 
-    <!-- Specified in sp to match the top margin of the time on the adjacent world clock tab. -->
-    <dimen name="timer_setup_top_margin">24sp</dimen>
-    <dimen name="timer_setup_delete_margin">21sp</dimen>
-    <dimen name="timer_setup_digit_font_size">86sp</dimen>
-
     <!-- Size of margin for circles. -->
     <dimen name="circle_margin_top">48dp</dimen>
     <dimen name="analog_clock_margin">96dp</dimen>
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
deleted file mode 100644
index c6665b6ba..000000000
--- a/res/values-sw720dp-land/dimens.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <dimen name="timer_setup_delete_margin">19sp</dimen>
-    <dimen name="timer_setup_digit_font_size">76sp</dimen>
-</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8c11977ac..6a384e94b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -52,7 +52,8 @@
     <dimen name="day_button_font_size">16sp</dimen>
     <dimen name="alarm_info_font_size">36sp</dimen>
     <dimen name="no_alarm_font_size">16sp</dimen>
-    <dimen name="timer_setup_digit_font_size">32sp</dimen>
+    <dimen name="timer_setup_digit_font_size">42sp</dimen>
+    <dimen name="timer_setup_top_size">120dip</dimen>
 
     <dimen name="alarm_picker_dialog_horizontal_margin">30dp</dimen>
     <dimen name="alarm_picker_dialog_vertical_margin">20dp</dimen>
@@ -72,12 +73,6 @@
 
     <dimen name="label_margin_big">4dp</dimen>
 
-    <!--margin should be ~ half timer_setup_font_size -->
-    <dimen name="timer_setup_delete_margin">14sp</dimen>
-
-    <!-- Specified in sp to match the top margin of the time on the adjacent world clock tab. -->
-    <dimen name="timer_setup_top_margin">18sp</dimen>
-
     <dimen name="cities_list_item_height">56dip</dimen>
 
     <!-- Size of margin for circles. -->