Merge "Align Stopwatch and Timer circles on landscape" into lmp-mr1-dev

res/layout-land/stopwatch_fragment.xml

@@ -17,7 +17,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal"
-    android:paddingTop="32dip"
+    android:paddingTop="?android:attr/actionBarSize"
     android:baselineAligned="false">
 
     <Space
@@ -27,34 +27,41 @@
             android:layout_width="0dip"
             android:layout_height="match_parent"/>
 
-    <com.android.deskclock.CircleButtonsLayout
-        android:id="@+id/stopwatch_circle"
-        android:layout_width="@dimen/circle_size"
-        android:layout_height="@dimen/circle_size"
-        android:layout_gravity="center"
-        android:layout_marginLeft="32dip"
-        android:layout_marginBottom="32dip"
-        android:layout_marginRight="32dip">
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="@dimen/stopwatch_circle_margin_bottom"
+        android:gravity="center"
+        android:orientation="vertical">
 
-        <com.android.deskclock.timer.CountingTimerView
-            android:id="@+id/stopwatch_time_text"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+        <com.android.deskclock.CircleButtonsLayout
+            android:id="@+id/stopwatch_circle"
+            android:layout_width="@dimen/circle_size"
+            android:layout_height="@dimen/circle_size"
+            android:layout_marginStart="32dip"
+            android:layout_marginEnd="32dip"
+            android:gravity="center">
 
-        <com.android.deskclock.CircleTimerView
-            android:id="@+id/stopwatch_time"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@null" />
+            <com.android.deskclock.timer.CountingTimerView
+                android:id="@+id/stopwatch_time_text"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
 
-    </com.android.deskclock.CircleButtonsLayout>
+            <com.android.deskclock.CircleTimerView
+                android:id="@+id/stopwatch_time"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@null" />
+
+        </com.android.deskclock.CircleButtonsLayout>
+
+    </LinearLayout>
 
     <ListView
         android:id="@+id/laps_list"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="2"
-        android:layout_marginTop="8dip"
         android:layout_marginBottom="8dip"
         android:layout_gravity="center" />
 

res/layout-land/timer_fragment.xml

@@ -19,7 +19,7 @@
     android:id="@+id/timers_list_page"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="32dip"
+    android:paddingTop="?android:attr/actionBarSize"
     android:baselineAligned="false">
 
     <include layout="@layout/timer_timer_view"/>

res/values-land/dimens.xml

@@ -25,7 +25,7 @@
     <dimen name="date_text_size">15sp</dimen>
     <dimen name="next_alarm_text_size">15sp</dimen>
     <dimen name="time_margin_top">24dip</dimen>
-    <dimen name="timer_list_padding_bottom">64dip</dimen>
+    <dimen name="timer_list_padding_bottom">80dip</dimen>
 
     <dimen name="dialpad_font_size">24sp</dimen>
     <dimen name="dialpad_digit_padding">14dip</dimen>
@@ -53,6 +53,7 @@
 
     <dimen name="circle_size">232dip</dimen>
     <dimen name="stopwatch_list_bottom_spacing">0dip</dimen>
+    <dimen name="stopwatch_circle_margin_bottom">80dip</dimen>
 
     <dimen name="world_clock_margin">8dp</dimen>
     <dimen name="sw_padding_end">8dp</dimen>

res/values-sw600dp-land/dimens.xml

@@ -45,6 +45,7 @@
 
     <dimen name="circle_size">360dip</dimen>
     <dimen name="stopwatch_list_bottom_spacing">0dip</dimen>
+    <dimen name="stopwatch_circle_margin_bottom">112dip</dimen>
 
     <dimen name="world_clock_margin">48dp</dimen>
     <dimen name="sw_padding_end">48dp</dimen>