Support for RTL (part 1)
Bug: 8555992
Change-Id: Ic40d688356b7b33f8bb148c3d63c614a173fe84a
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 60b1331..cfbab5a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -13,10 +13,11 @@
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.DEVICE_POWER" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <uses-sdk android:minSdkVersion="15"></uses-sdk>
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="17" ></uses-sdk>
<application android:label="@string/app_label"
- android:icon="@mipmap/ic_launcher_alarmclock">
+ android:icon="@mipmap/ic_launcher_alarmclock"
+ android:supportsRtl="true">
<provider android:name="AlarmProvider"
android:authorities="com.android.deskclock"
diff --git a/res/layout-land/alarm_alert.xml b/res/layout-land/alarm_alert.xml
index 9466860..da181e8 100644
--- a/res/layout-land/alarm_alert.xml
+++ b/res/layout-land/alarm_alert.xml
@@ -30,10 +30,11 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:paddingBottom="@dimen/header_font_size"
- android:paddingLeft="@dimen/alarm_alert_clock_padding_left" >
-
+ android:paddingLeft="@dimen/alarm_alert_clock_padding_left"
+ android:paddingStart="@dimen/alarm_alert_clock_padding_left" >
<TextView
android:id="@+id/alertTitle"
style="@style/header"
@@ -42,6 +43,7 @@
android:ellipsize="end"
android:textColor="@color/clock_white"
android:paddingLeft="@dimen/label_margin_big"
+ android:paddingStart="@dimen/label_margin_big"
android:paddingBottom="@dimen/label_margin_small"
android:singleLine="true" />
@@ -59,6 +61,7 @@
android:layout_height="wrap_content"
android:ellipsize="none"
android:paddingRight="@dimen/time_margin_right"
+ android:paddingEnd="@dimen/time_margin_right"
android:singleLine="true"
android:textColor="@color/clock_white" />
@@ -88,7 +91,9 @@
android:layout_height="wrap_content"
android:focusable="true"
android:layout_marginRight="@dimen/glowpadview_margin_right"
+ android:layout_marginEnd="@dimen/glowpadview_margin_right"
android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:gravity="center"
android:layout_gravity="center_vertical"
diff --git a/res/layout-land/stopwatch_fragment.xml b/res/layout-land/stopwatch_fragment.xml
index b35f6da..8caef2a 100644
--- a/res/layout-land/stopwatch_fragment.xml
+++ b/res/layout-land/stopwatch_fragment.xml
@@ -24,7 +24,9 @@
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/circle_margin"
+ android:layout_marginStart="@dimen/circle_margin"
android:layout_marginRight="@dimen/circle_margin"
+ android:layout_marginEnd="@dimen/circle_margin"
android:layout_weight="0.95" >
<com.android.deskclock.timer.CountingTimerView
@@ -41,7 +43,7 @@
<ImageButton
android:id="@+id/stopwatch_left_button"
- android:layout_gravity="bottom|left"
+ android:layout_gravity="bottom|start"
android:layout_width="56dip"
style="@style/button"
android:src="@drawable/ic_lap"
@@ -54,7 +56,9 @@
android:gravity="center"
android:layout_marginBottom="0dip"
android:paddingLeft="10dip"
+ android:paddingStart="10dip"
android:paddingRight="10dip"
+ android:paddingEnd="10dip"
android:paddingBottom="5dip"
android:paddingTop="5dip"
android:text="@string/timer_stop"
@@ -70,7 +74,7 @@
android:layout_width="56dip"
android:src="@drawable/ic_share"
style="@style/button"
- android:layout_gravity="bottom|right"
+ android:layout_gravity="bottom|end"
android:layout_height="56dip"
android:contentDescription="@string/sw_share_button" />
</FrameLayout>
@@ -79,6 +83,7 @@
android:id="@+id/laps_list"
android:layout_weight="1"
android:layout_marginRight="@dimen/sw_right_margin"
+ android:layout_marginEnd="@dimen/sw_right_margin"
android:layout_gravity="center"
android:layout_width="0dip"
android:layout_height="wrap_content" />
diff --git a/res/layout-land/time_setup_view.xml b/res/layout-land/time_setup_view.xml
index 8badd96..d0b86ab 100644
--- a/res/layout-land/time_setup_view.xml
+++ b/res/layout-land/time_setup_view.xml
@@ -18,6 +18,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
+ android:layoutDirection="ltr"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.android.deskclock.timer.TimerView
@@ -28,6 +29,7 @@
android:paddingTop="@dimen/medium_font_padding"
android:paddingBottom="@dimen/medium_font_padding"
android:paddingLeft="@dimen/timer_padding_left"
+ android:paddingStart="@dimen/timer_padding_left"
android:layout_gravity="center"
android:gravity="top"
android:baselineAligned="false">
diff --git a/res/layout-land/timer_list_item.xml b/res/layout-land/timer_list_item.xml
index 854d19d..e9eddfb 100644
--- a/res/layout-land/timer_list_item.xml
+++ b/res/layout-land/timer_list_item.xml
@@ -28,7 +28,9 @@
android:layout_width="@dimen/timer_circle_width"
android:layout_height="@dimen/timer_circle_diameter"
android:layout_marginLeft="@dimen/timer_circle_margin"
- android:layout_marginRight="@dimen/timer_circle_margin">
+ android:layout_marginStart="@dimen/timer_circle_margin"
+ android:layout_marginRight="@dimen/timer_circle_margin"
+ android:layout_marginEnd="@dimen/timer_circle_margin">
<com.android.deskclock.CircleTimerView
android:id="@+id/timer_time"
@@ -77,7 +79,7 @@
<ImageButton
android:id="@+id/timer_plus_one"
android:layout_width="56dip"
- android:layout_gravity="bottom|left"
+ android:layout_gravity="bottom|start"
android:src="@drawable/ic_plusone"
style="@style/button"
android:background="@null"
@@ -90,7 +92,9 @@
android:gravity="center"
android:layout_marginBottom="0dip"
android:paddingLeft="10dip"
+ android:paddingStart="10dip"
android:paddingRight="10dip"
+ android:paddingEnd="10dip"
android:paddingBottom="5dip"
android:paddingTop="5dip"
android:layout_width="wrap_content"
@@ -103,7 +107,7 @@
android:id="@+id/timer_delete"
android:background="@null"
android:src="@drawable/ic_delete"
- android:layout_gravity="bottom|right"
+ android:layout_gravity="bottom|end"
android:layout_width="56dip"
android:contentDescription="@string/timer_delete"
style="@style/button"
diff --git a/res/layout-sw600dp/alarm_alert_fullscreen.xml b/res/layout-sw600dp/alarm_alert_fullscreen.xml
index 7f577bc..29e751b 100644
--- a/res/layout-sw600dp/alarm_alert_fullscreen.xml
+++ b/res/layout-sw600dp/alarm_alert_fullscreen.xml
@@ -19,7 +19,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
+ android:layout_marginStart="10dp"
android:layout_marginRight="10dp"
+ android:layout_marginEnd="10dp"
>
<FrameLayout
android:layout_width="400dp"
@@ -28,8 +30,8 @@
android:background="@drawable/alarm_alert_fullscreen_bg"
>
<include layout="@layout/alarm_alert"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- />
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ />
</FrameLayout>
</FrameLayout>
diff --git a/res/layout-sw600dp/set_alarm.xml b/res/layout-sw600dp/set_alarm.xml
index 51fe5b0..78d8df2 100644
--- a/res/layout-sw600dp/set_alarm.xml
+++ b/res/layout-sw600dp/set_alarm.xml
@@ -25,14 +25,18 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dip"
+ android:layout_marginStart="16dip"
android:layout_marginRight="16dip"
+ android:layout_marginEnd="16dip"
android:layout_weight="1"/>
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:layout_marginLeft="16dip"
+ android:layout_marginStart="16dip"
android:layout_marginRight="16dip"
+ android:layout_marginEnd="16dip"
android:background="?android:attr/dividerHorizontal" />
<LinearLayout
diff --git a/res/layout-sw600dp/three_keys_view.xml b/res/layout-sw600dp/three_keys_view.xml
index 136d7a0..06d2074 100644
--- a/res/layout-sw600dp/three_keys_view.xml
+++ b/res/layout-sw600dp/three_keys_view.xml
@@ -17,6 +17,7 @@
android:layout_width="match_parent"
android:layout_weight="1"
android:gravity="center"
+ android:layoutDirection="ltr"
android:layout_height="0dip">
<Button
android:id="@+id/key_left"
diff --git a/res/layout-sw600dp/three_keys_view_ampm.xml b/res/layout-sw600dp/three_keys_view_ampm.xml
index 54c5160..9ab01ce 100644
--- a/res/layout-sw600dp/three_keys_view_ampm.xml
+++ b/res/layout-sw600dp/three_keys_view_ampm.xml
@@ -17,6 +17,7 @@
android:layout_width="match_parent"
android:layout_weight="1"
android:gravity="center"
+ android:layoutDirection="ltr"
android:layout_height="0dip">
<Button
android:id="@+id/key_left"
diff --git a/res/layout/actionable_toast_row.xml b/res/layout/actionable_toast_row.xml
index 11314bb..0ef1fe9 100644
--- a/res/layout/actionable_toast_row.xml
+++ b/res/layout/actionable_toast_row.xml
@@ -22,6 +22,7 @@
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:paddingLeft="16dip"
+ android:paddingStart="16dip"
android:src="@drawable/ic_menu_revert_holo_dark" />
<TextView
@@ -32,6 +33,7 @@
android:ellipsize="end"
android:gravity="center_vertical"
android:paddingLeft="16dip"
+ android:paddingStart="16dip"
android:singleLine="true"
android:text="@string/alarm_deleted"
android:textColor="@android:color/white"
@@ -50,6 +52,7 @@
android:layout_height="match_parent"
android:layout_marginBottom="10dip"
android:layout_marginRight="12dip"
+ android:layout_marginEnd="12dip"
android:layout_marginTop="10dip"
android:background="#aaaaaa" />
@@ -59,6 +62,7 @@
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginRight="4dip"
+ android:layout_marginEnd="4dip"
android:src="@drawable/ic_menu_revert_holo_dark" />
<TextView
@@ -67,8 +71,10 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="4dip"
+ android:layout_marginStart="4dip"
android:gravity="center_vertical"
android:paddingRight="16dip"
+ android:paddingEnd="16dip"
android:textAllCaps="true" />
</LinearLayout>
diff --git a/res/layout/alarm_alert.xml b/res/layout/alarm_alert.xml
index ad1b4bb..05e757e 100644
--- a/res/layout/alarm_alert.xml
+++ b/res/layout/alarm_alert.xml
@@ -35,6 +35,7 @@
android:ellipsize="end"
style="@style/header_not_caps"
android:paddingLeft="@dimen/label_margin_big"
+ android:paddingStart="@dimen/label_margin_big"
android:paddingBottom="@dimen/label_margin_small"
android:textColor="@color/clock_white"
android:layout_width="wrap_content"
@@ -53,6 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="@dimen/time_margin_right"
+ android:paddingEnd="@dimen/time_margin_right"
android:singleLine="true"
android:ellipsize="none"
style="@style/big_bold"
diff --git a/res/layout/alarm_clock.xml b/res/layout/alarm_clock.xml
index 67a5421..f6c5422 100644
--- a/res/layout/alarm_clock.xml
+++ b/res/layout/alarm_clock.xml
@@ -37,7 +37,9 @@
android:layout_gravity="bottom"
android:layout_marginBottom="40dp"
android:layout_marginLeft="8dp"
+ android:layout_marginStart="8dp"
android:layout_marginRight="8dp"
+ android:layout_marginEnd="8dp"
style="@style/ToastBarStyle"
/>
</FrameLayout>
diff --git a/res/layout/alarm_label.xml b/res/layout/alarm_label.xml
index f513ea5..78a54a1 100644
--- a/res/layout/alarm_label.xml
+++ b/res/layout/alarm_label.xml
@@ -22,7 +22,9 @@
android:layout_height="wrap_content"
android:minHeight="48dip"
android:paddingLeft="@dimen/alarm_label_padding"
+ android:paddingStart="@dimen/alarm_label_padding"
android:paddingRight="@dimen/alarm_label_padding"
+ android:paddingEnd="@dimen/alarm_label_padding"
android:singleLine="true"
android:hint="@string/label"
android:background="@null"
diff --git a/res/layout/alarm_time.xml b/res/layout/alarm_time.xml
index a26f464..5b0b62d 100644
--- a/res/layout/alarm_time.xml
+++ b/res/layout/alarm_time.xml
@@ -27,7 +27,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
+ android:layout_marginStart="12dp"
android:layout_marginRight="8dp"
+ android:layout_marginEnd="8dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:orientation="horizontal">
@@ -38,12 +40,14 @@
android:gravity="top"
android:baselineAligned="false"
android:clickable="true"
+ android:layoutDirection="ltr"
android:background="@drawable/item_background">
<com.android.deskclock.ZeroTopPaddingTextView
android:id="@+id/timeDisplayHours"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="@dimen/time_margin_right"
+ android:paddingEnd="@dimen/time_margin_right"
android:singleLine="true"
android:ellipsize="none"
style="@style/small_bold"
@@ -75,20 +79,23 @@
android:layout_height="match_parent"
android:id="@+id/onoff"
android:thumbTextPadding="10dp"
- android:layout_gravity="center_vertical|right"/>
+ android:layout_gravity="center_vertical|end"/>
</LinearLayout>
<View
android:id="@+id/hairline"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="8dp"
+ android:layout_marginStart="8dp"
android:layout_marginRight="8dp"
+ android:layout_marginEnd="8dp"
android:background="#28ffffff"/>
<FrameLayout
android:id="@+id/info_area"
android:layout_width="match_parent"
android:layout_height="32dp"
android:paddingLeft="16dp"
+ android:paddingStart="16dp"
android:gravity="center_vertical"
android:clickable="true"
android:background="@drawable/item_background">
@@ -96,6 +103,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginRight="48dp"
+ android:layout_marginEnd="48dp"
android:gravity="center_vertical"
>
<TextView android:id="@+id/label"
@@ -119,7 +127,7 @@
android:layout_height="32dp"
android:contentDescription="@string/expand_alarm"
android:src="@drawable/ic_expand_down"
- android:layout_gravity="right"
+ android:layout_gravity="end"
/>
</FrameLayout>
<LinearLayout
@@ -138,7 +146,9 @@
android:layout_width="wrap_content"
android:layout_height="64dp"
android:layout_marginLeft="16dp"
+ android:layout_marginStart="16dp"
android:layout_marginRight="16dp"
+ android:layout_marginEnd="16dp"
android:ellipsize="end"
android:singleLine="true"
android:background="@drawable/item_background"/>
@@ -148,7 +158,9 @@
android:layout_height="48dp"
android:layout_width="wrap_content"
android:layout_marginLeft="10dp"
+ android:layout_marginStart="10dp"
android:layout_marginRight="16dp"
+ android:layout_marginEnd="16dp"
android:layout_gravity="center_vertical"
style="@style/body"
android:textColor="@color/clock_white"/>
@@ -157,7 +169,9 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginLeft="10dp"
+ android:layout_marginStart="10dp"
android:layout_marginRight="10dp"
+ android:layout_marginEnd="10dp"
android:layout_gravity="top"
android:orientation="horizontal"
android:visibility="gone">
@@ -167,7 +181,9 @@
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_marginLeft="10dp"
+ android:layout_marginStart="10dp"
android:layout_marginRight="16dp"
+ android:layout_marginEnd="16dp"
android:gravity="center_vertical">
<TextView
@@ -176,6 +192,7 @@
android:layout_width="0dp"
android:layout_weight="1"
android:layout_marginRight="16dp"
+ android:layout_marginEnd="16dp"
android:gravity="center_vertical"
style="@style/body"
android:background="@drawable/item_background"
@@ -186,6 +203,7 @@
android:singleLine="true"
android:marqueeRepeatLimit="marquee_forever"
android:drawableLeft="@drawable/ic_ringtone"
+ android:drawableStart="@drawable/ic_ringtone"
android:drawablePadding="2dp"
/>
<CheckBox
@@ -195,14 +213,16 @@
android:textColor="@color/clock_gray"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:layout_gravity="center_vertical|right"
+ android:layout_gravity="center_vertical|end"
style="@style/body"/>
</LinearLayout>
<View
android:id="@+id/hairline"
android:layout_height="1dp"
android:layout_marginLeft="8dp"
+ android:layout_marginStart="8dp"
android:layout_marginRight="8dp"
+ android:layout_marginEnd="8dp"
android:layout_width="match_parent"
android:background="#28ffffff"/>
<FrameLayout
@@ -217,7 +237,7 @@
android:layout_width="48dp"
android:layout_height="32dp"
android:src="@drawable/ic_expand_up"
- android:layout_gravity="right"/>
+ android:layout_gravity="end"/>
</FrameLayout>
</LinearLayout>
</com.android.deskclock.widget.swipeablelistview.SwipeLayout>
diff --git a/res/layout/cities_activity.xml b/res/layout/cities_activity.xml
index b08180c..cdb2165 100644
--- a/res/layout/cities_activity.xml
+++ b/res/layout/cities_activity.xml
@@ -21,5 +21,7 @@
android:layout_height="wrap_content"
android:clickable="true"
android:paddingLeft="8dip"
+ android:paddingStart="8dip"
android:paddingRight="32dip"
+ android:paddingEnd="32dip"
android:clipToPadding="false" />
diff --git a/res/layout/city_list_item.xml b/res/layout/city_list_item.xml
index 14123be..e5f1e0d 100644
--- a/res/layout/city_list_item.xml
+++ b/res/layout/city_list_item.xml
@@ -19,7 +19,9 @@
android:layout_width="match_parent"
android:gravity="center_vertical"
android:paddingLeft="8dip"
+ android:paddingStart="8dip"
android:paddingRight="8dip"
+ android:paddingEnd="8dip"
android:background="?android:attr/selectableItemBackground"
android:layout_height="wrap_content"
android:minHeight="@dimen/cities_list_item_height"
diff --git a/res/layout/clock_fragment.xml b/res/layout/clock_fragment.xml
index 0aa2e26..4b6f34c 100644
--- a/res/layout/clock_fragment.xml
+++ b/res/layout/clock_fragment.xml
@@ -58,7 +58,7 @@
android:onClick="clockButtonsOnClick"
android:layout_width="64dip"
style="@style/button"
- android:layout_gravity="left"
+ android:layout_gravity="start"
android:src="@drawable/ic_alarm"
android:background="@drawable/item_background"
android:layout_height="match_parent" />
@@ -86,7 +86,7 @@
style="?android:attr/actionOverflowButtonStyle"
android:background="@drawable/item_background"
android:onClick="clockButtonsOnClick"
- android:layout_gravity="right"
+ android:layout_gravity="end"
android:layout_width="64dip"
android:layout_height="match_parent" />
</LinearLayout>
diff --git a/res/layout/context_menu_header.xml b/res/layout/context_menu_header.xml
index 193f312..de4a248 100644
--- a/res/layout/context_menu_header.xml
+++ b/res/layout/context_menu_header.xml
@@ -4,9 +4,9 @@
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.
@@ -21,7 +21,9 @@
android:paddingTop="6dip"
android:paddingBottom="9dip"
android:paddingLeft="10dip"
- android:paddingRight="10dip">
+ android:paddingStart="10dip"
+ android:paddingRight="10dip"
+ android:paddingEnd="10dip">
<ImageView
android:layout_width="wrap_content"
@@ -29,6 +31,7 @@
android:layout_gravity="top"
android:paddingTop="6dip"
android:paddingRight="10dip"
+ android:paddingEnd="10dip"
android:src="@drawable/ic_dialog_time"/>
<TextView android:id="@+id/header_time"
@@ -44,8 +47,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="20dip"
+ android:layout_marginStart="20dip"
android:singleLine="true"
- android:gravity="right|center_vertical"
+ android:gravity="end|center_vertical"
android:ellipsize="end"/>
</LinearLayout>
diff --git a/res/layout/desk_clock_saver.xml b/res/layout/desk_clock_saver.xml
index 7e44c40..5f0fe15 100644
--- a/res/layout/desk_clock_saver.xml
+++ b/res/layout/desk_clock_saver.xml
@@ -30,7 +30,9 @@
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_marginEnd="@dimen/screensaver_margin"
android:layout_marginTop="@dimen/time_margin_top"
android:layout_marginBottom="@dimen/screensaver_margin">
@@ -73,9 +75,11 @@
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:layout_marginLeft="8dip"
+ android:layout_marginStart="8dip"
android:gravity="center"
android:visibility="gone"
/>
diff --git a/res/layout/desk_clock_time_date.xml b/res/layout/desk_clock_time_date.xml
index 20d476a..16611e2 100644
--- a/res/layout/desk_clock_time_date.xml
+++ b/res/layout/desk_clock_time_date.xml
@@ -20,6 +20,7 @@
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layoutDirection="ltr"
>
<com.android.deskclock.DigitalClock android:id="@+id/time"
@@ -34,6 +35,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="@dimen/time_margin_right"
+ android:paddingEnd="@dimen/time_margin_right"
android:singleLine="true"
android:ellipsize="none"
style="@style/big_bold"
diff --git a/res/layout/desk_clock_time_small.xml b/res/layout/desk_clock_time_small.xml
index 4375a64..e00d742 100644
--- a/res/layout/desk_clock_time_small.xml
+++ b/res/layout/desk_clock_time_small.xml
@@ -21,6 +21,7 @@
android:layout_height="wrap_content"
android:baselineAligned="false"
android:gravity="top"
+ android:layoutDirection="ltr"
>
<com.android.deskclock.ZeroTopPaddingTextView
@@ -28,6 +29,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="@dimen/time_margin_right"
+ android:paddingEnd="@dimen/time_margin_right"
android:singleLine="true"
android:ellipsize="none"
style="@style/medium_bold"
diff --git a/res/layout/desk_clock_weather.xml b/res/layout/desk_clock_weather.xml
index 6c17162..2993b59 100644
--- a/res/layout/desk_clock_weather.xml
+++ b/res/layout/desk_clock_weather.xml
@@ -20,20 +20,22 @@
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:gravity="left"
+ android:gravity="start"
>
<RelativeLayout android:id="@+id/weather_temp_icon_cluster"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:layout_marginBottom="-6dip"
>
<ImageView android:id="@+id/weather_icon"
android:layout_height="60sp"
android:layout_width="60sp"
- android:gravity="left"
+ android:gravity="start"
android:scaleType="centerInside"
android:layout_marginRight="8dip"
+ android:layout_marginEnd="8dip"
/>
<TextView android:id="@+id/weather_temperature"
android:layout_width="wrap_content"
@@ -46,6 +48,7 @@
android:shadowDy="0"
android:shadowRadius="3.0"
android:layout_marginRight="8dip"
+ android:layout_marginEnd="8dip"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/weather_icon"
android:layout_alignBottom="@id/weather_icon"
@@ -77,6 +80,7 @@
android:layout_alignTop="@id/weather_temperature"
android:layout_marginTop="9sp"
android:layout_alignLeft="@id/weather_low_temperature"
+ android:layout_alignStart="@id/weather_low_temperature"
/>
</RelativeLayout>
<TextView android:id="@+id/weather_location"
@@ -84,7 +88,7 @@
android:layout_height="wrap_content"
android:layout_below="@id/weather_temp_icon_cluster"
android:maxWidth="300sp"
- android:gravity="left"
+ android:gravity="start"
android:textSize="18sp"
android:textColor="#ffffffff"
android:shadowColor="#c0000000"
diff --git a/res/layout/digital_widget_time.xml b/res/layout/digital_widget_time.xml
index 070dde3..82e2095 100644
--- a/res/layout/digital_widget_time.xml
+++ b/res/layout/digital_widget_time.xml
@@ -28,6 +28,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:baselineAligned="true"
+ android:layoutDirection="ltr"
android:layout_gravity="center_horizontal|top">
<TextClock
@@ -69,9 +70,11 @@
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:layout_marginLeft="8dip"
+ android:layout_marginStart="8dip"
android:gravity="center"
/>
</LinearLayout>
diff --git a/res/layout/label_dialog.xml b/res/layout/label_dialog.xml
index e9e6428..de773f9 100644
--- a/res/layout/label_dialog.xml
+++ b/res/layout/label_dialog.xml
@@ -24,7 +24,9 @@
android:id="@+id/labelBox"
android:layout_marginTop="16dp"
android:layout_marginLeft="8dip"
+ android:layout_marginStart="8dip"
android:layout_marginRight="8dip"
+ android:layout_marginEnd="8dip"
android:inputType="textCapSentences"
android:padding="8dp"
android:selectAllOnFocus="true"
diff --git a/res/layout/lap_view.xml b/res/layout/lap_view.xml
index f4e90f8..44a41f1 100644
--- a/res/layout/lap_view.xml
+++ b/res/layout/lap_view.xml
@@ -19,6 +19,7 @@
android:layout_marginTop="4dip"
android:layout_marginBottom="4dip"
android:gravity="center"
+ android:layoutDirection="ltr"
android:paddingTop="@dimen/body_font_padding"
android:paddingBottom="@dimen/body_font_padding"
android:layout_width="match_parent"
@@ -28,7 +29,8 @@
android:layout_height="wrap_content"
android:textColor="@color/clock_gray"
android:layout_marginRight="@dimen/sw_item_space"
- android:gravity="left"
+ android:layout_marginEnd="@dimen/sw_item_space"
+ android:gravity="start"
style="@style/body"
android:textAllCaps="false"
android:id="@+id/lap_number" />
@@ -36,8 +38,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/sw_item_space"
+ android:layout_marginEnd="@dimen/sw_item_space"
android:textColor="@color/clock_gray"
- android:gravity="right"
+ android:gravity="end"
style="@style/body"
android:textAllCaps="false"
android:id="@+id/lap_time" />
@@ -45,7 +48,7 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textColor="@color/clock_gray"
- android:gravity="right"
+ android:gravity="end"
style="@style/body"
android:textAllCaps="false"
android:id="@+id/lap_total" />
diff --git a/res/layout/main_clock_frame.xml b/res/layout/main_clock_frame.xml
index 7857b04..31b9e9b 100644
--- a/res/layout/main_clock_frame.xml
+++ b/res/layout/main_clock_frame.xml
@@ -29,7 +29,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/circle_margin_top"
android:layout_marginLeft="@dimen/analog_clock_margin"
+ android:layout_marginStart="@dimen/analog_clock_margin"
android:layout_marginRight="@dimen/analog_clock_margin"
+ android:layout_marginEnd="@dimen/analog_clock_margin"
android:layout_gravity="center_horizontal"
android:dial="@drawable/clock_analog_dial_mipmap"
android:hand_hour="@drawable/clock_analog_hour_mipmap"
@@ -60,9 +62,11 @@
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:layout_marginLeft="8dip"
+ android:layout_marginStart="8dip"
android:gravity="center"
/>
</LinearLayout>
diff --git a/res/layout/popup_window_item.xml b/res/layout/popup_window_item.xml
index 58f9ff1..f7f77cf 100644
--- a/res/layout/popup_window_item.xml
+++ b/res/layout/popup_window_item.xml
@@ -22,7 +22,9 @@
android:orientation="horizontal"
android:paddingBottom="10dip"
android:paddingLeft="16dip"
+ android:paddingStart="16dip"
android:paddingRight="16dip"
+ android:paddingEnd="16dip"
android:paddingTop="10dip" >
<ImageView
@@ -31,6 +33,7 @@
android:layout_height="32dip"
android:layout_gravity="center_vertical"
android:layout_marginRight="8dip"
+ android:layout_marginEnd="8dip"
android:duplicateParentState="true" />
<TextView
diff --git a/res/layout/set_alarm.xml b/res/layout/set_alarm.xml
index a94c3f1..7fa782e 100644
--- a/res/layout/set_alarm.xml
+++ b/res/layout/set_alarm.xml
@@ -25,14 +25,18 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dip"
+ android:layout_marginStart="16dip"
android:layout_marginRight="16dip"
+ android:layout_marginEnd="16dip"
android:layout_weight="1"/>
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:layout_marginLeft="16dip"
+ android:layout_marginStart="16dip"
android:layout_marginRight="16dip"
+ android:layout_marginEnd="16dip"
android:background="?android:attr/dividerHorizontal" />
</LinearLayout>
diff --git a/res/layout/set_alarm_action_bar.xml b/res/layout/set_alarm_action_bar.xml
index 48002e3..a6ef14b 100644
--- a/res/layout/set_alarm_action_bar.xml
+++ b/res/layout/set_alarm_action_bar.xml
@@ -30,13 +30,16 @@
android:layout_height="match_parent"
android:gravity="center_vertical"
android:paddingRight="20dip"
+ android:paddingEnd="20dip"
android:paddingLeft="10dip"
+ android:paddingStart="10dip"
android:drawablePadding="10dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/action_bar_button_text_color"
android:text="@string/done"
android:background="@drawable/activated_background_holo_dark"
android:drawableLeft="@drawable/ic_menu_done_holo_dark"
+ android:drawableStart="@drawable/ic_menu_done_holo_dark"
style="@android:style/Widget.Holo.ActionBar.TabText" />
</LinearLayout>
diff --git a/res/layout/snooze_length_picker.xml b/res/layout/snooze_length_picker.xml
index da979b8..4f3f779 100644
--- a/res/layout/snooze_length_picker.xml
+++ b/res/layout/snooze_length_picker.xml
@@ -32,6 +32,7 @@
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="center_vertical"
android:layout_marginLeft="16dip"
+ android:layout_marginStart="16dip"
android:layout_width="wrap_content"
android:layout_height="match_parent" />
diff --git a/res/layout/stopwatch_fragment.xml b/res/layout/stopwatch_fragment.xml
index 4ee3c9e..a47ade8 100644
--- a/res/layout/stopwatch_fragment.xml
+++ b/res/layout/stopwatch_fragment.xml
@@ -24,7 +24,9 @@
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_marginLeft="@dimen/circle_margin"
+ android:layout_marginStart="@dimen/circle_margin"
android:layout_marginRight="@dimen/circle_margin"
+ android:layout_marginEnd="@dimen/circle_margin"
android:layout_weight="5" >
<com.android.deskclock.timer.CountingTimerView
@@ -43,7 +45,7 @@
style="@style/button"
android:layout_width="56dip"
android:layout_height="56dip"
- android:layout_gravity="bottom|left"
+ android:layout_gravity="bottom|start"
android:background="@null"
android:src="@drawable/ic_lap" />
@@ -57,7 +59,9 @@
android:layout_marginBottom="0dip"
android:contentDescription="@string/timer_stop"
android:paddingLeft="10dip"
+ android:paddingStart="10dip"
android:paddingRight="10dip"
+ android:paddingEnd="10dip"
android:paddingBottom="5dip"
android:paddingTop="5dip"
android:textColor="@color/clock_white"
@@ -69,7 +73,7 @@
style="@style/button"
android:layout_width="56dip"
android:layout_height="56dip"
- android:layout_gravity="bottom|right"
+ android:layout_gravity="bottom|end"
android:contentDescription="@string/sw_share_button"
android:background="@null"
android:src="@drawable/ic_share" />
diff --git a/res/layout/three_keys_view.xml b/res/layout/three_keys_view.xml
index bff7990..f7edcff 100644
--- a/res/layout/three_keys_view.xml
+++ b/res/layout/three_keys_view.xml
@@ -17,6 +17,7 @@
android:layout_width="match_parent"
android:layout_weight="1"
android:gravity="center"
+ android:layoutDirection="ltr"
android:layout_height="0dip">
<Button
android:id="@+id/key_left"
diff --git a/res/layout/three_keys_view_ampm.xml b/res/layout/three_keys_view_ampm.xml
index a53ef1c..8c89526 100644
--- a/res/layout/three_keys_view_ampm.xml
+++ b/res/layout/three_keys_view_ampm.xml
@@ -17,6 +17,7 @@
android:layout_width="match_parent"
android:layout_weight="1"
android:gravity="center"
+ android:layoutDirection="ltr"
android:layout_height="0dip">
<Button
android:id="@+id/key_left"
diff --git a/res/layout/time_picker_view.xml b/res/layout/time_picker_view.xml
index 0c22204..600cd5a 100644
--- a/res/layout/time_picker_view.xml
+++ b/res/layout/time_picker_view.xml
@@ -20,6 +20,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layoutDirection="ltr"
android:gravity="center">
<com.android.deskclock.timer.TimerView
android:id="@+id/timer_time_text"
@@ -29,6 +30,7 @@
android:paddingTop="@dimen/medium_font_padding"
android:paddingBottom="@dimen/medium_font_padding"
android:paddingLeft="@dimen/timer_padding_left"
+ android:paddingStart="@dimen/timer_padding_left"
android:layout_gravity="center"
android:baselineAligned="false"
android:gravity="top">
diff --git a/res/layout/time_setup_view.xml b/res/layout/time_setup_view.xml
index c0ab9bc..1df7d01 100644
--- a/res/layout/time_setup_view.xml
+++ b/res/layout/time_setup_view.xml
@@ -18,6 +18,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
+ android:layoutDirection="ltr"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.android.deskclock.timer.TimerView
diff --git a/res/layout/timer_fragment.xml b/res/layout/timer_fragment.xml
index d136691..bafb0a3 100644
--- a/res/layout/timer_fragment.xml
+++ b/res/layout/timer_fragment.xml
@@ -55,7 +55,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="8dip"
+ android:layout_marginStart="8dip"
android:layout_marginRight="8dip"
+ android:layout_marginEnd="8dip"
android:paddingTop="?android:attr/actionBarSize"
android:orientation="vertical">
<com.android.deskclock.TimerSetupView
diff --git a/res/layout/timer_list_item.xml b/res/layout/timer_list_item.xml
index f5ac851..13bfc72 100644
--- a/res/layout/timer_list_item.xml
+++ b/res/layout/timer_list_item.xml
@@ -28,7 +28,9 @@
android:layout_width="match_parent"
android:layout_height="@dimen/timer_circle_diameter"
android:layout_marginLeft="@dimen/timer_circle_margin"
- android:layout_marginRight="@dimen/timer_circle_margin">
+ android:layout_marginStart="@dimen/timer_circle_margin"
+ android:layout_marginRight="@dimen/timer_circle_margin"
+ android:layout_marginEnd="@dimen/timer_circle_margin">
<com.android.deskclock.CircleTimerView
android:id="@+id/timer_time"
@@ -80,7 +82,7 @@
android:src="@drawable/ic_plusone"
android:background="@null"
android:layout_width="56dip"
- android:layout_gravity="bottom|left"
+ android:layout_gravity="bottom|start"
style="@style/button"
android:contentDescription="@string/timer_plus_one"
android:layout_height="56dip" />
@@ -91,7 +93,9 @@
android:gravity="center"
android:layout_marginBottom="0dip"
android:paddingLeft="10dip"
+ android:paddingStart="10dip"
android:paddingRight="10dip"
+ android:paddingEnd="10dip"
android:paddingBottom="5dip"
android:paddingTop="5dip"
android:text="@string/timer_stop"
@@ -104,7 +108,7 @@
android:id="@+id/timer_delete"
android:src="@drawable/ic_delete"
android:background="@null"
- android:layout_gravity="bottom|right"
+ android:layout_gravity="bottom|end"
android:layout_width="56dip"
android:contentDescription="@string/timer_delete"
style="@style/button"
diff --git a/res/layout/world_clock_item.xml b/res/layout/world_clock_item.xml
index 253660d..a805310 100644
--- a/res/layout/world_clock_item.xml
+++ b/res/layout/world_clock_item.xml
@@ -46,6 +46,7 @@
android:layout_width="match_parent"
android:layout_marginTop="@dimen/label_margin_small"
android:layout_marginLeft="@dimen/label_margin_small"
+ android:layout_marginStart="@dimen/label_margin_small"
android:gravity="center"
>
<include layout="@layout/world_clock_label"/>
diff --git a/res/layout/world_clock_label.xml b/res/layout/world_clock_label.xml
index f74f8e2..95467b8 100644
--- a/res/layout/world_clock_label.xml
+++ b/res/layout/world_clock_label.xml
@@ -30,6 +30,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/style_label_space"
+ android:layout_marginStart="@dimen/style_label_space"
android:ellipsize="none"
android:singleLine="true"
android:textColor="@color/clock_gray"/>
diff --git a/res/layout/world_clock_list_item.xml b/res/layout/world_clock_list_item.xml
index a832265..832fdf9 100644
--- a/res/layout/world_clock_list_item.xml
+++ b/res/layout/world_clock_list_item.xml
@@ -19,7 +19,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/world_clock_margin"
+ android:layout_marginEnd="@dimen/world_clock_margin"
android:layout_marginLeft="@dimen/world_clock_margin"
+ android:layout_marginStart="@dimen/world_clock_margin"
android:orientation="horizontal">
diff --git a/res/layout/world_clock_remote_list_item.xml b/res/layout/world_clock_remote_list_item.xml
index 41ba52c..f5f044b 100644
--- a/res/layout/world_clock_remote_list_item.xml
+++ b/res/layout/world_clock_remote_list_item.xml
@@ -28,6 +28,7 @@
<LinearLayout
android:baselineAligned="true"
android:layout_gravity="center"
+ android:layoutDirection="ltr"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
@@ -39,6 +40,7 @@
android:layout_height="wrap_content"
style="@style/widget_medium_bold"
android:textColor="@color/clock_white"
+ android:textDirection="ltr"
android:layout_gravity="center"
android:gravity="center" />
<TextClock
@@ -49,6 +51,7 @@
android:layout_height="wrap_content"
style="@style/widget_medium_light"
android:textColor="@color/clock_white"
+ android:textDirection="ltr"
android:layout_gravity="center"
android:gravity="center" />
</LinearLayout>
@@ -73,6 +76,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/style_label_space"
+ android:layout_marginStart="@dimen/style_label_space"
android:ellipsize="none"
android:singleLine="true"
android:textColor="@color/clock_gray" />
@@ -88,6 +92,7 @@
<LinearLayout
android:baselineAligned="true"
android:layout_gravity="center"
+ android:layoutDirection="ltr"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
@@ -99,6 +104,7 @@
android:layout_height="wrap_content"
style="@style/widget_medium_bold"
android:textColor="@color/clock_white"
+ android:textDirection="ltr"
android:layout_gravity="center"
android:gravity="center" />
<TextClock
@@ -109,6 +115,7 @@
android:layout_height="wrap_content"
style="@style/widget_medium_light"
android:textColor="@color/clock_white"
+ android:textDirection="ltr"
android:layout_gravity="center"
android:gravity="center" />
</LinearLayout>
@@ -134,6 +141,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/style_label_space"
+ android:layout_marginStart="@dimen/style_label_space"
android:ellipsize="none"
android:singleLine="true"
android:textColor="@color/clock_gray" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2cf2cfd..81a01cb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -366,29 +366,21 @@
<string name="sw_notification_lap_number">Lap <xliff:g id="number">%d</xliff:g></string>
<!-- Formatted stopwatch time
[CHAR LIMIT=1] for each abbreviation as in hours_label, etc. -->
- <string-array name="stopwatch_format_set">
- <item> <!-- <10 minutes - example "1m 02s.03" -->
- <xliff:g id="M">%2$d</xliff:g>m
- <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>
+ <string-array name="stopwatch_format_set" translatable="false">
+ <item> <!-- <10 minutes - example "1 02.03" -->
+ <xliff:g id="M">%2$d</xliff:g> <xliff:g id="S">%3$02d</xliff:g>.<xliff:g id="D">%4$02d</xliff:g>
</item>
- <item> <!-- <1 hour - example "12m 03s.04" -->
- <xliff:g id="M">%2$02d</xliff:g>m
- <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>
+ <item> <!-- <1 hour - example "12 03.04" -->
+ <xliff:g id="M">%2$02d</xliff:g> <xliff:g id="S">%3$02d</xliff:g>.<xliff:g id="D">%4$02d</xliff:g>
</item>
- <item> <!-- <10 hours - example "1h 02m 03s.04" -->
- <xliff:g id="H">%1$d</xliff:g>h
- <xliff:g id="M">%2$02d</xliff:g>m
- <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>
+ <item> <!-- <10 hours - example "1 02 03.04" -->
+ <xliff:g id="H">%1$d</xliff:g> <xliff:g id="M">%2$02d</xliff:g> <xliff:g id="S">%3$02d</xliff:g>.<xliff:g id="D">%4$02d</xliff:g>
</item>
- <item> <!-- <100 hours - example "12h 03m 04s.05" -->
- <xliff:g id="H">%1$02d</xliff:g>h
- <xliff:g id="M">%2$02d</xliff:g>m
- <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>
+ <item> <!-- <100 hours - example "12 03 04.05" -->
+ <xliff:g id="H">%1$02d</xliff:g> <xliff:g id="M">%2$02d</xliff:g> <xliff:g id="S">%3$02d</xliff:g>.<xliff:g id="D">%4$02d</xliff:g>
</item>
- <item> <!-- <1000 hours - example "123h 04m 05s.06" -->
- <xliff:g id="H">%1$03d</xliff:g>h
- <xliff:g id="M">%2$02d</xliff:g>m
- <xliff:g id="S">%3$02d</xliff:g>s.<xliff:g id="D">%4$02d</xliff:g>
+ <item> <!-- <1000 hours - example "123 04 05.06" -->
+ <xliff:g id="H">%1$03d</xliff:g> <xliff:g id="M">%2$02d</xliff:g> <xliff:g id="S">%3$02d</xliff:g>.<xliff:g id="D">%4$02d</xliff:g>
</item>
</string-array>
<!-- Label to enumerate the number of laps the user has counted -->
