am 6519e1dc: am 0ea32f76: Merge "UX polish on stopwatch tab" into lmp-dev

* commit '6519e1dcf71bacafd7d89c6a560776397433940a':
  UX polish on stopwatch tab

6 files changed, 11 insertions, 5 deletions

diff --git a/res/layout-land/stopwatch_fragment.xml b/res/layout-land/stopwatch_fragment.xml
index 89609678e..be8d386bb 100644
--- a/res/layout-land/stopwatch_fragment.xml
+++ b/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="?android:attr/actionBarSize"
+    android:paddingTop="32dip"
     android:baselineAligned="false">
 
     <Space
@@ -88,7 +88,10 @@
 
     <ListView
         android:id="@+id/laps_list"
-        android:layout_margin="64dip"
+        android:layout_marginTop="32dip"
+        android:layout_marginBottom="48dip"
+        android:layout_marginStart="@dimen/stopwatch_list_margin_start"
+        android:layout_marginEnd="16dip"
         android:layout_gravity="center"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
diff --git a/res/layout/alarm_time.xml b/res/layout/alarm_time.xml
index 3dac70bde..aeda1f660 100644
--- a/res/layout/alarm_time.xml
+++ b/res/layout/alarm_time.xml
@@ -173,6 +173,7 @@
                 android:id="@+id/delete"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="4dip"
                 android:layout_gravity="start|center_vertical"
                 android:contentDescription="@string/delete_alarm"
                 android:padding="8dp"
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index b682410a2..57c22efe3 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -50,7 +50,7 @@
     <dimen name="top_text_spacing_digital">-25dp</dimen>
     <dimen name="bottom_text_spacing_analog">5dp</dimen>
 
-    <dimen name="circle_size">184dp</dimen>
+    <dimen name="circle_size">232dip</dimen>
 
     <dimen name="world_clock_margin">8dp</dimen>
     <dimen name="sw_padding_end">8dp</dimen>
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
index a833298fb..eef950341 100644
--- a/res/values-sw600dp-land/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -50,7 +50,8 @@
     <dimen name="analog_clock_margin">48dp</dimen>
     <dimen name="timer_circle_margin">48dp</dimen>
 
-    <dimen name="circle_size">400dp</dimen>
+    <dimen name="circle_size">360dip</dimen>
+    <dimen name="stopwatch_list_margin_start">128dip</dimen>
 
     <dimen name="world_clock_margin">48dp</dimen>
     <dimen name="sw_padding_end">48dp</dimen>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4694536c3..ecd4ee1d8 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -122,6 +122,7 @@
     <dimen name="timer_circle_margin">32dp</dimen>
 
     <dimen name="circle_size">280dp</dimen>
+    <dimen name="stopwatch_list_margin_start">64dip</dimen>
 
     <dimen name="sw_padding_end">32dp</dimen>
 
diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java
index 2988e5080..78cdf4d0d 100644
--- a/src/com/android/deskclock/DeskClock.java
+++ b/src/com/android/deskclock/DeskClock.java
@@ -524,7 +524,7 @@ public class DeskClock extends Activity implements LabelDialogFragment.TimerLabe
             TabInfo info = (TabInfo) tab.getTag();
             int position = info.getPosition();
             mSelectedTab = position;
-            if (mIsFirstLaunch && position == CLOCK_TAB_INDEX) {
+            if (mIsFirstLaunch && getRtlPosition(position) == CLOCK_TAB_INDEX) {
                 mFab.setVisibility(View.VISIBLE);
                 mFab.setImageResource(R.drawable.ic_globe);
                 mIsFirstLaunch = false;