summaryrefslogtreecommitdiffstats
path: root/res/layout-sw600dp
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2012-07-19 19:25:50 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2012-07-24 15:02:12 -0700
commit79d8e80a304922c34a6bd344f1fa49dd7dfd106d (patch)
tree5ed1a7d98cff8af497efbefb8606a9e4f2455f5f /res/layout-sw600dp
parent24d1058d008da5ba3ec78ef1822f5806b8a7d002 (diff)
downloadpackages_apps_Settings-79d8e80a304922c34a6bd344f1fa49dd7dfd106d.zip
packages_apps_Settings-79d8e80a304922c34a6bd344f1fa49dd7dfd106d.tar.gz
packages_apps_Settings-79d8e80a304922c34a6bd344f1fa49dd7dfd106d.tar.bz2
Make Settings app aware of layout direction
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi) Change-Id: I696c0f66a16640af767da3c05b5d300fd2284ecb
Diffstat (limited to 'res/layout-sw600dp')
-rw-r--r--res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml2
-rw-r--r--res/layout-sw600dp/choose_lock_password.xml6
-rw-r--r--res/layout-sw600dp/choose_lock_pattern.xml2
-rw-r--r--res/layout-sw600dp/choose_lock_pattern_tutorial.xml2
-rw-r--r--res/layout-sw600dp/confirm_lock_password.xml6
-rw-r--r--res/layout-sw600dp/crypt_keeper_password_entry.xml8
-rw-r--r--res/layout-sw600dp/crypt_keeper_progress.xml18
-rw-r--r--res/layout-sw600dp/date_time_settings_setupwizard.xml10
-rw-r--r--res/layout-sw600dp/preference_inputmethod.xml12
-rw-r--r--res/layout-sw600dp/settings_top_level.xml2
-rw-r--r--res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml30
11 files changed, 49 insertions, 49 deletions
diff --git a/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml b/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml
index 4d52deb..1777eda 100644
--- a/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml
+++ b/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml
@@ -18,7 +18,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:paddingRight="?android:attr/scrollbarSize">
+ android:paddingEnd="?android:attr/scrollbarSize">
<LinearLayout android:id="@+android:id/widget_frame"
android:layout_width="wrap_content"
diff --git a/res/layout-sw600dp/choose_lock_password.xml b/res/layout-sw600dp/choose_lock_password.xml
index df53f68..43be032 100644
--- a/res/layout-sw600dp/choose_lock_password.xml
+++ b/res/layout-sw600dp/choose_lock_password.xml
@@ -51,8 +51,8 @@
android:layout_gravity="center"
android:textSize="32sp"
android:layout_marginTop="15dip"
- android:layout_marginLeft="30dip"
- android:layout_marginRight="30dip"
+ android:layout_marginStart="30dip"
+ android:layout_marginEnd="30dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:background="@drawable/password_field_default"
android:textColor="#ffffffff"
@@ -86,7 +86,7 @@
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:orientation="horizontal">
<Button android:id="@+id/cancel_button"
diff --git a/res/layout-sw600dp/choose_lock_pattern.xml b/res/layout-sw600dp/choose_lock_pattern.xml
index d8f85cc..b0efa8c 100644
--- a/res/layout-sw600dp/choose_lock_pattern.xml
+++ b/res/layout-sw600dp/choose_lock_pattern.xml
@@ -62,7 +62,7 @@
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:orientation="horizontal">
<!-- left / top button: skip, or re-try -->
diff --git a/res/layout-sw600dp/choose_lock_pattern_tutorial.xml b/res/layout-sw600dp/choose_lock_pattern_tutorial.xml
index 2a61666..e0221bf 100644
--- a/res/layout-sw600dp/choose_lock_pattern_tutorial.xml
+++ b/res/layout-sw600dp/choose_lock_pattern_tutorial.xml
@@ -54,7 +54,7 @@
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:orientation="horizontal">
<!-- left / top button: skip, or re-try -->
diff --git a/res/layout-sw600dp/confirm_lock_password.xml b/res/layout-sw600dp/confirm_lock_password.xml
index 722153d..cb6fafd 100644
--- a/res/layout-sw600dp/confirm_lock_password.xml
+++ b/res/layout-sw600dp/confirm_lock_password.xml
@@ -54,8 +54,8 @@
android:layout_gravity="center"
android:textSize="32sp"
android:layout_marginTop="15dip"
- android:layout_marginLeft="30dip"
- android:layout_marginRight="30dip"
+ android:layout_marginStart="30dip"
+ android:layout_marginEnd="30dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:background="@drawable/password_field_default"
android:textColor="#ffffffff"
@@ -89,7 +89,7 @@
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:orientation="horizontal">
<Button android:id="@+id/cancel_button"
diff --git a/res/layout-sw600dp/crypt_keeper_password_entry.xml b/res/layout-sw600dp/crypt_keeper_password_entry.xml
index 1e33230c..731fb22 100644
--- a/res/layout-sw600dp/crypt_keeper_password_entry.xml
+++ b/res/layout-sw600dp/crypt_keeper_password_entry.xml
@@ -40,10 +40,10 @@
<TextView android:id="@+id/passwordLabel"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:layout_toRightOf="@+id/encroid"
+ android:layout_toEndOf="@+id/encroid"
android:layout_marginTop="37dip"
- android:paddingLeft="17dip"
- android:paddingRight="17dip"
+ android:paddingStart="17dip"
+ android:paddingEnd="17dip"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/crypt_keeper_enter_password"
@@ -53,7 +53,7 @@
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="320dip"
- android:layout_toRightOf="@+id/passwordLabel"
+ android:layout_toEndOf="@+id/passwordLabel"
android:layout_marginTop="26dip"
android:layout_centerVertical="true"
android:orientation="horizontal"
diff --git a/res/layout-sw600dp/crypt_keeper_progress.xml b/res/layout-sw600dp/crypt_keeper_progress.xml
index 176c9fb..a2e32d7 100644
--- a/res/layout-sw600dp/crypt_keeper_progress.xml
+++ b/res/layout-sw600dp/crypt_keeper_progress.xml
@@ -29,9 +29,9 @@
android:id="@+id/encroid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
- android:paddingRight="65dip"
+ android:paddingEnd="65dip"
android:src="@drawable/encroid_waiting"
android:contentDescription="@null"
/>
@@ -42,9 +42,9 @@
android:layout_height="wrap_content"
android:minHeight="48dip"
android:layout_alignParentTop="true"
- android:layout_alignParentLeft="true"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
+ android:layout_alignParentStart="true"
+ android:layout_marginStart="16dip"
+ android:layout_marginEnd="16dip"
android:textSize="30dip"
android:textColor="@color/title_color"
android:text="@string/crypt_keeper_setup_title"
@@ -72,8 +72,8 @@
android:layout_height="wrap_content"
android:layout_below="@+id/top_divider"
android:paddingTop="21dip"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
+ android:layout_marginStart="16dip"
+ android:layout_marginEnd="16dip"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
@@ -96,10 +96,10 @@
android:id="@+id/factory_reset"
android:layout_width="208dip"
android:layout_height="48dip"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="80dip"
- android:layout_marginRight="16dip"
+ android:layout_marginEnd="16dip"
android:text="@string/master_clear_button_text"
android:visibility="gone"
/>
diff --git a/res/layout-sw600dp/date_time_settings_setupwizard.xml b/res/layout-sw600dp/date_time_settings_setupwizard.xml
index e37a4a6..41e3021 100644
--- a/res/layout-sw600dp/date_time_settings_setupwizard.xml
+++ b/res/layout-sw600dp/date_time_settings_setupwizard.xml
@@ -19,16 +19,16 @@
android:layout_height="match_parent"
android:layout_width="match_parent"
android:paddingTop="96dip"
- android:paddingLeft="40dip"
- android:paddingRight="40dip"
+ android:paddingStart="40dip"
+ android:paddingEnd="40dip"
android:paddingBottom="96dip"
android:orientation="vertical">
<FrameLayout android:id="@+id/timezone_dropdown_anchor"
android:layout_height="0px"
android:layout_width="match_parent"
- android:layout_marginLeft="40dip"
- android:layout_marginRight="40dip"/>
+ android:layout_marginStart="40dip"
+ android:layout_marginEnd="40dip"/>
<LinearLayout android:layout_height="0px"
android:layout_weight="1"
@@ -60,7 +60,7 @@
android:minWidth="208dip"
android:layout_height="48dip"
android:layout_marginTop="10dip"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:text="@string/next_label"/>
</RelativeLayout>
diff --git a/res/layout-sw600dp/preference_inputmethod.xml b/res/layout-sw600dp/preference_inputmethod.xml
index 326e2af..c10d718 100644
--- a/res/layout-sw600dp/preference_inputmethod.xml
+++ b/res/layout-sw600dp/preference_inputmethod.xml
@@ -33,14 +33,14 @@
android:id="@android:id/widget_frame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_marginLeft="10dip"
+ android:layout_marginStart="10dip"
android:gravity="center_vertical"
android:orientation="vertical" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="15dip"
- android:layout_marginRight="6dip"
+ android:layout_marginStart="15dip"
+ android:layout_marginEnd="6dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
@@ -57,7 +57,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
- android:layout_alignLeft="@android:id/title"
+ android:layout_alignStart="@android:id/title"
android:paddingBottom="3dip"
android:visibility="gone"
android:textAppearance="?android:attr/textAppearanceSmall"
@@ -77,8 +77,8 @@
android:id="@+id/inputmethod_settings"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
- android:paddingLeft="15dip"
- android:paddingRight="?android:attr/scrollbarSize"
+ android:paddingStart="15dip"
+ android:paddingEnd="?android:attr/scrollbarSize"
android:src="@drawable/ic_sysbar_quicksettings"
android:contentDescription="@string/input_method_settings_button"
android:layout_gravity="center"
diff --git a/res/layout-sw600dp/settings_top_level.xml b/res/layout-sw600dp/settings_top_level.xml
index 09590b1..ff53c1b 100644
--- a/res/layout-sw600dp/settings_top_level.xml
+++ b/res/layout-sw600dp/settings_top_level.xml
@@ -25,7 +25,7 @@
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight=".4"
- android:layout_marginRight="10dp"/>
+ android:layout_marginEnd="10dp"/>
<FrameLayout android:id="@+id/prefs"
android:layout_width="0px"
android:layout_height="match_parent"
diff --git a/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml b/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
index 20f5784..94833e8 100644
--- a/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
@@ -21,8 +21,8 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingTop="60dip"
- android:paddingLeft="@dimen/screen_margin_sides"
- android:paddingRight="@dimen/screen_margin_sides"
+ android:paddingStart="@dimen/screen_margin_sides"
+ android:paddingEnd="@dimen/screen_margin_sides"
android:paddingBottom="0dip" >
<FrameLayout
@@ -42,9 +42,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="48dip"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:layout_centerVertical="true"
- android:layout_marginLeft="16dip"
+ android:layout_marginStart="16dip"
android:layout_below="@id/top_padding_layout"
android:textSize="32dip"
android:textColor="@color/title_color"
@@ -88,7 +88,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/top_divider"
- android:layout_alignLeft="@id/dummy_for_left_edge"
+ android:layout_alignStart="@id/dummy_for_left_edge"
android:layout_centerHorizontal="true">
<!-- Padding for @id/content shown when keyboard isn't available -->
@@ -115,7 +115,7 @@
android:layout_height="wrap_content"
android:minHeight="160dip"
android:layout_marginTop="10dip"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:visibility="gone" />
<LinearLayout
android:id="@+id/connecting_status_layout"
@@ -174,7 +174,7 @@
android:layout_height="3dip"
android:layout_marginBottom="16dip"
android:layout_below="@id/bottom_padding_layout"
- android:layout_alignLeft="@id/content"
+ android:layout_alignStart="@id/content"
android:background="@color/divider_color" /> <!-- TODO: fix this -->
<LinearLayout
@@ -183,27 +183,27 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/bottom_divider"
- android:layout_alignLeft="@id/bottom_divider">
+ android:layout_alignStart="@id/bottom_divider">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/bottom_divider"
- android:layout_alignLeft="@id/bottom_divider"
- android:layout_alignParentRight="true"
+ android:layout_alignStart="@id/bottom_divider"
+ android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true">
<Button
android:id="@+id/wifi_setup_add_network"
style="@style/setup_wizard_button"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:text="@string/wifi_setup_add_network"
android:enabled="false" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:orientation="horizontal">
<!-- This misleading name is for keeping consistency between non-XL
@@ -215,14 +215,14 @@
<Button android:id="@+id/wifi_setup_connect"
style="@style/setup_wizard_button"
- android:layout_marginLeft="16dip"
+ android:layout_marginStart="16dip"
android:text="@string/wifi_setup_connect"
android:enabled="false"
android:visibility="gone" />
<Button android:id="@+id/wifi_setup_skip_or_next"
style="@style/setup_wizard_button"
- android:layout_marginLeft="16dip"
+ android:layout_marginStart="16dip"
android:text="@string/wifi_setup_skip" />
</LinearLayout>
@@ -230,7 +230,7 @@
<Button android:id="@+id/wifi_setup_refresh_list"
style="@style/setup_wizard_button"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:text="@string/wifi_setup_refresh_list"
android:enabled="false" />