Commit e7683589 authored by Isaac Katzenelson's avatar Isaac Katzenelson
Browse files

Support for RTL (part 1)

Bug: 8555992
Change-Id: Ic40d688356b7b33f8bb148c3d63c614a173fe84a
parent 9f876b19
......@@ -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"
......
......@@ -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"
......
......@@ -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" />
......
......@@ -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">
......
......@@ -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"
......
......@@ -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>
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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>
......
......@@ -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"
......
......@@ -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>
......@@ -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"
......
......@@ -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>
......@@ -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" />
......@@ -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"
......
......@@ -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>
......
......@@ -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>
......
......@@ -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"
/>
......
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment