From 79d8e80a304922c34a6bd344f1fa49dd7dfd106d Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Thu, 19 Jul 2012 19:25:50 -0700
Subject: [PATCH] Make Settings app aware of layout direction

- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)

Change-Id: I696c0f66a16640af767da3c05b5d300fd2284ecb
---
 AndroidManifest.xml                           |  3 +-
 res/layout-land/choose_lock_password.xml      |  8 +-
 .../choose_lock_pattern_tutorial.xml          |  2 +-
 res/layout-land/confirm_lock_password.xml     | 12 +--
 .../crypt_keeper_password_entry.xml           |  4 +-
 res/layout-land/crypt_keeper_progress.xml     |  2 +-
 .../choose_lock_password.xml                  |  8 +-
 .../choose_lock_pattern.xml                   |  8 +-
 .../choose_lock_pattern_tutorial.xml          |  4 +-
 .../confirm_lock_password.xml                 |  8 +-
 .../confirm_lock_pattern.xml                  |  4 +-
 .../crypt_keeper_password_entry.xml           |  6 +-
 .../wifi_settings_for_setup_wizard_xl.xml     | 28 +++---
 ...ess_point_category_for_setup_wizard_xl.xml |  2 +-
 res/layout-sw600dp/choose_lock_password.xml   |  6 +-
 res/layout-sw600dp/choose_lock_pattern.xml    |  2 +-
 .../choose_lock_pattern_tutorial.xml          |  2 +-
 res/layout-sw600dp/confirm_lock_password.xml  |  6 +-
 .../crypt_keeper_password_entry.xml           |  8 +-
 res/layout-sw600dp/crypt_keeper_progress.xml  | 18 ++--
 .../date_time_settings_setupwizard.xml        | 10 +--
 res/layout-sw600dp/preference_inputmethod.xml | 12 +--
 res/layout-sw600dp/settings_top_level.xml     |  2 +-
 .../wifi_settings_for_setup_wizard_xl.xml     | 30 +++----
 .../date_time_settings_setupwizard.xml        | 24 +++---
 res/layout-sw720dp/tab_widget.xml             |  4 +-
 res/layout/account_sync_screen.xml            |  4 +-
 res/layout/add_account_screen.xml             |  4 +-
 res/layout/android_beam.xml                   |  4 +-
 res/layout/apn_preference_layout.xml          | 10 +--
 res/layout/app_percentage_item.xml            |  8 +-
 res/layout/bluetooth_connection_access.xml    |  4 +-
 res/layout/bluetooth_discoverable.xml         |  4 +-
 res/layout/bluetooth_pb_access.xml            |  4 +-
 res/layout/bluetooth_pin_confirm.xml          |  4 +-
 res/layout/bluetooth_pin_entry.xml            | 20 ++---
 res/layout/bookmark_picker_item.xml           |  4 +-
 res/layout/choose_lock_password.xml           |  4 +-
 res/layout/choose_lock_pattern_tutorial.xml   |  2 +-
 res/layout/confirm_lock_password.xml          |  6 +-
 res/layout/crypt_keeper_confirm.xml           |  4 +-
 res/layout/crypt_keeper_password_entry.xml    |  4 +-
 res/layout/crypt_keeper_progress.xml          |  4 +-
 res/layout/crypt_keeper_settings.xml          |  4 +-
 res/layout/crypt_keeper_status.xml            |  6 +-
 res/layout/custom_preference.xml              |  8 +-
 res/layout/data_usage_bytes_editor.xml        |  4 +-
 res/layout/data_usage_chart.xml               | 14 +--
 res/layout/data_usage_cycle_editor.xml        |  4 +-
 res/layout/data_usage_cycles.xml              |  4 +-
 res/layout/data_usage_detail.xml              | 10 +--
 res/layout/data_usage_header.xml              |  8 +-
 res/layout/date_time_settings_setupwizard.xml |  6 +-
 .../date_time_setup_custom_list_item_2.xml    |  4 +-
 res/layout/device_admin_add.xml               | 14 +--
 res/layout/device_admin_item.xml              | 10 +--
 res/layout/dialog_edittext.xml                |  4 +-
 res/layout/dream_picker_row.xml               |  4 +-
 res/layout/installed_app_details.xml          | 86 +++++++++----------
 res/layout/intent_sender.xml                  |  4 +-
 res/layout/manage_applications_apps.xml       | 16 ++--
 res/layout/manage_applications_item.xml       | 12 +--
 res/layout/manage_applications_running.xml    |  4 +-
 res/layout/master_clear.xml                   |  6 +-
 res/layout/master_clear_confirm.xml           |  4 +-
 res/layout/ownerinfo.xml                      |  6 +-
 res/layout/pick_item.xml                      |  4 +-
 res/layout/power_usage_action_item.xml        |  6 +-
 res/layout/power_usage_detail_item_text.xml   |  8 +-
 res/layout/power_usage_details.xml            |  4 +-
 res/layout/power_usage_package_item.xml       |  2 +-
 res/layout/preference.xml                     |  6 +-
 res/layout/preference_batteryhistory.xml      |  2 +-
 res/layout/preference_dialog_brightness.xml   |  4 +-
 res/layout/preference_dialog_ringervolume.xml | 32 +++----
 res/layout/preference_header_item.xml         | 12 +--
 res/layout/preference_header_switch_item.xml  | 12 +--
 res/layout/preference_icon.xml                | 12 +--
 res/layout/preference_inputmethod.xml         |  8 +-
 res/layout/preference_memoryusage.xml         |  4 +-
 res/layout/preference_powergauge.xml          | 16 ++--
 res/layout/preference_progress_category.xml   |  8 +-
 .../preference_settings_checkbox_widget.xml   |  2 +-
 res/layout/preference_spellchecker.xml        | 14 +--
 res/layout/preference_tts_engine.xml          | 14 +--
 res/layout/preference_widget_shortcut.xml     |  2 +-
 res/layout/preference_widget_sync_toggle.xml  |  8 +-
 res/layout/profile_icon_small.xml             |  2 +-
 res/layout/proxy.xml                          |  4 +-
 res/layout/radio_info.xml                     |  8 +-
 res/layout/running_processes_item.xml         | 16 ++--
 res/layout/running_processes_view.xml         | 18 ++--
 .../running_service_details_process.xml       |  2 +-
 .../running_service_details_service.xml       |  2 +-
 res/layout/set_backup_pw.xml                  |  2 +-
 res/layout/settings_storage_miscfiles.xml     | 14 +--
 .../settings_storage_miscfiles_list.xml       |  4 +-
 res/layout/setup_preference.xml               | 14 +--
 res/layout/trusted_credential.xml             |  4 +-
 res/layout/trusted_credential_details.xml     |  2 +-
 res/layout/twelve_key_entry.xml               | 64 +++++++-------
 res/layout/two_buttons_panel.xml              |  4 +-
 res/layout/usage_stats.xml                    |  4 +-
 res/layout/usage_stats_item.xml               | 12 +--
 res/layout/user_dictionary_add_word.xml       | 12 +--
 .../user_dictionary_add_word_fullscreen.xml   | 14 +--
 res/layout/user_dictionary_item.xml           |  8 +-
 .../wifi_config_ui_for_setup_wizard.xml       | 12 +--
 res/layout/wifi_setup_custom_list_item_1.xml  |  2 +-
 res/values-sw600dp/styles.xml                 |  4 +-
 res/values/styles.xml                         | 12 +--
 .../settings/AccessibilitySettings.java       |  2 +-
 .../android/settings/DevelopmentSettings.java |  2 +-
 src/com/android/settings/DreamSettings.java   |  2 +-
 .../settings/bluetooth/BluetoothSettings.java |  2 +-
 src/com/android/settings/nfc/AndroidBeam.java |  2 +-
 .../android/settings/widget/ChartView.java    |  2 +-
 .../android/settings/wifi/WifiSettings.java   |  2 +-
 118 files changed, 497 insertions(+), 496 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fe68a9c4770..c4900fd5b9b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -62,7 +62,8 @@
             android:taskAffinity=""
             android:theme="@android:style/Theme.Holo"
             android:uiOptions="splitActionBarWhenNarrow"
-            android:hardwareAccelerated="true">
+            android:hardwareAccelerated="true"
+            android:supportsRtl="true">
 
         <!-- Settings -->
 
diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml
index ade6f252664..08dcf647c31 100644
--- a/res/layout-land/choose_lock_password.xml
+++ b/res/layout-land/choose_lock_password.xml
@@ -33,11 +33,11 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="horizontal"
-            android:layout_marginRight="6dip"
-            android:layout_marginLeft="6dip"
+            android:layout_marginEnd="6dip"
+            android:layout_marginStart="6dip"
             android:layout_marginTop="10dip"
             android:layout_marginBottom="10dip"
-            android:gravity="left"
+            android:gravity="start"
             android:ellipsize="marquee"
             android:textAppearance="?android:attr/textAppearanceMedium"
         />
@@ -79,7 +79,7 @@
         <LinearLayout
             style="@style/SecurityPreferenceButtonContainer"
             android:orientation="horizontal"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true">
 
             <!-- left : cancel -->
diff --git a/res/layout-land/choose_lock_pattern_tutorial.xml b/res/layout-land/choose_lock_pattern_tutorial.xml
index ac693cc756d..362853b6741 100644
--- a/res/layout-land/choose_lock_pattern_tutorial.xml
+++ b/res/layout-land/choose_lock_pattern_tutorial.xml
@@ -40,7 +40,7 @@
             android:layout_width="0dip"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:layout_marginLeft="25dip">
+            android:layout_marginStart="25dip">
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index a9b5640a4be..4130a48ac51 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -34,11 +34,11 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="horizontal"
-            android:layout_marginRight="6dip"
-            android:layout_marginLeft="6dip"
+            android:layout_marginEnd="6dip"
+            android:layout_marginStart="6dip"
             android:layout_marginTop="10dip"
             android:layout_marginBottom="10dip"
-            android:gravity="left"
+            android:gravity="start"
             android:ellipsize="marquee"
             android:textAppearance="?android:attr/textAppearanceMedium"
         />
@@ -89,7 +89,7 @@
             android:layout_width="150dip"
             android:layout_height="wrap_content"
             android:layout_margin="5dip"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:text="@string/lockpassword_cancel_label"
         />
 
@@ -97,8 +97,8 @@
             android:layout_width="150dip"
             android:layout_height="wrap_content"
             android:layout_margin="5dip"
-            android:layout_alignParentRight="true"
-            android:drawableRight="@drawable/ic_btn_next"
+            android:layout_alignParentEnd="true"
+            android:drawableEnd="@drawable/ic_btn_next"
             android:drawablePadding="10dip"
             android:text="@string/lockpassword_continue_label"
         />
diff --git a/res/layout-land/crypt_keeper_password_entry.xml b/res/layout-land/crypt_keeper_password_entry.xml
index 094434edbbf..57cfbedde87 100644
--- a/res/layout-land/crypt_keeper_password_entry.xml
+++ b/res/layout-land/crypt_keeper_password_entry.xml
@@ -50,8 +50,8 @@
         <LinearLayout
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:layout_marginLeft="8dip"
-            android:layout_marginRight="8dip"
+            android:layout_marginStart="8dip"
+            android:layout_marginEnd="8dip"
             android:orientation="horizontal"
         >
             <include layout="@layout/crypt_keeper_password_field" />
diff --git a/res/layout-land/crypt_keeper_progress.xml b/res/layout-land/crypt_keeper_progress.xml
index f8a939f4eba..c2fe2f7c618 100644
--- a/res/layout-land/crypt_keeper_progress.xml
+++ b/res/layout-land/crypt_keeper_progress.xml
@@ -27,7 +27,7 @@
         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:textSize="30dip"
         android:textColor="@color/title_color"
diff --git a/res/layout-sw600dp-land/choose_lock_password.xml b/res/layout-sw600dp-land/choose_lock_password.xml
index 389552905fb..05d4a249658 100644
--- a/res/layout-sw600dp-land/choose_lock_password.xml
+++ b/res/layout-sw600dp-land/choose_lock_password.xml
@@ -34,11 +34,11 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="horizontal"
-            android:layout_marginRight="6dip"
-            android:layout_marginLeft="6dip"
+            android:layout_marginEnd="6dip"
+            android:layout_marginStart="6dip"
             android:layout_marginTop="10dip"
             android:layout_marginBottom="10dip"
-            android:gravity="left"
+            android:gravity="start"
             android:ellipsize="marquee"
             android:textAppearance="?android:attr/textAppearanceLarge"
         />
@@ -66,7 +66,7 @@
     <!-- confirm / restart buttons -->
     <LinearLayout
         style="@style/SecurityPreferenceButtonContainer"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:orientation="horizontal">
 
diff --git a/res/layout-sw600dp-land/choose_lock_pattern.xml b/res/layout-sw600dp-land/choose_lock_pattern.xml
index a32a5fba38e..506570d9045 100644
--- a/res/layout-sw600dp-land/choose_lock_pattern.xml
+++ b/res/layout-sw600dp-land/choose_lock_pattern.xml
@@ -49,15 +49,15 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/headerText"
             android:layout_marginTop="16dip"
-            android:layout_toRightOf="@id/lockPattern"
-            android:layout_marginLeft="100dip"
+            android:layout_toEndOf="@id/lockPattern"
+            android:layout_marginStart="100dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:visibility="gone"/>
 
         <!-- confirm / restart buttons -->
         <LinearLayout android:id="@+id/buttonContainer"
             style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:orientation="horizontal">
 
@@ -79,7 +79,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:layout_marginTop="20dip"
-            android:layout_marginLeft="20dip"
+            android:layout_marginStart="20dip"
             android:layout_above="@id/buttonContainer"
             android:gravity="center_vertical|center_horizontal">
 
diff --git a/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml b/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml
index 1320ba07c51..00ef0399088 100644
--- a/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml
+++ b/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml
@@ -46,7 +46,7 @@
         <!-- navigation buttons -->
         <LinearLayout android:id="@+id/buttonContainer"
             style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:orientation="horizontal">
 
@@ -68,7 +68,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:layout_marginTop="20dip"
-            android:layout_marginLeft="20dip"
+            android:layout_marginStart="20dip"
             android:gravity="center_vertical|center_horizontal"
             android:layout_above="@id/buttonContainer">
 
diff --git a/res/layout-sw600dp-land/confirm_lock_password.xml b/res/layout-sw600dp-land/confirm_lock_password.xml
index c4472dbdda6..5844a60ab9c 100644
--- a/res/layout-sw600dp-land/confirm_lock_password.xml
+++ b/res/layout-sw600dp-land/confirm_lock_password.xml
@@ -35,11 +35,11 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="horizontal"
-            android:layout_marginRight="6dip"
-            android:layout_marginLeft="6dip"
+            android:layout_marginEnd="6dip"
+            android:layout_marginStart="6dip"
             android:layout_marginTop="10dip"
             android:layout_marginBottom="10dip"
-            android:gravity="left"
+            android:gravity="start"
             android:ellipsize="marquee"
             android:textAppearance="?android:attr/textAppearanceLarge"
         />
@@ -67,7 +67,7 @@
     <!-- confirm / restart buttons -->
     <LinearLayout
         style="@style/SecurityPreferenceButtonContainer"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:orientation="horizontal">
 
diff --git a/res/layout-sw600dp-land/confirm_lock_pattern.xml b/res/layout-sw600dp-land/confirm_lock_pattern.xml
index 3e642d5636a..627ff028a66 100644
--- a/res/layout-sw600dp-land/confirm_lock_pattern.xml
+++ b/res/layout-sw600dp-land/confirm_lock_pattern.xml
@@ -45,7 +45,7 @@
         <!-- confirm / restart buttons -->
         <LinearLayout android:id="@+id/buttonContainer"
             style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:orientation="horizontal"
             android:visibility="invisible">
@@ -76,7 +76,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:layout_marginTop="20dip"
-            android:layout_marginLeft="20dip"
+            android:layout_marginStart="20dip"
             android:layout_above="@id/footerText"
             android:gravity="center_vertical|center_horizontal">
 
diff --git a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
index a8f5651479a..81222cca489 100644
--- a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
+++ b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
@@ -43,9 +43,9 @@
         <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_centerVertical="true"
-            android:paddingRight="17dip"
+            android:paddingEnd="17dip"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/crypt_keeper_enter_password"
@@ -55,7 +55,7 @@
         <LinearLayout
             android:layout_height="wrap_content"
             android:layout_width="320dip"
-            android:layout_toRightOf="@+id/passwordLabel"
+            android:layout_toEndOf="@+id/passwordLabel"
             android:layout_centerVertical="true"
             android:orientation="horizontal"
         >
diff --git a/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml b/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml
index 8094b74a20f..70d868a695b 100644
--- a/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-sw600dp-land/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 -->
 
     <RelativeLayout
@@ -182,21 +182,21 @@
         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
@@ -208,20 +208,20 @@
 
             <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_refresh_list"
                     style="@style/setup_wizard_button"
-                    android:layout_marginLeft="16dip"
+                    android:layout_marginStart="16dip"
                     android:text="@string/wifi_setup_refresh_list"
                     android:enabled="false" />
 
             <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>
     </RelativeLayout>
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 4d52deb4312..1777eda2660 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 df53f68b4a0..43be0329b41 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 d8f85cc26da..b0efa8c621c 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 2a616667f8e..e0221bf6adc 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 722153dfac8..cb6fafd94a4 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 1e33230c709..731fb222804 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 176c9fbd6ea..a2e32d73d1d 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 e37a4a63477..41e30216292 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 326e2afd6e1..c10d7181691 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 09590b12c95..ff53c1b920c 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 20f5784a128..94833e8f738 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" />
 
diff --git a/res/layout-sw720dp/date_time_settings_setupwizard.xml b/res/layout-sw720dp/date_time_settings_setupwizard.xml
index b48447266af..32c4d93a6eb 100644
--- a/res/layout-sw720dp/date_time_settings_setupwizard.xml
+++ b/res/layout-sw720dp/date_time_settings_setupwizard.xml
@@ -20,8 +20,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingTop="@dimen/datetime_margin_top"
-    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="@dimen/datetime_margin_bottom">
 
     <!-- Title: Set date & time-->
@@ -30,8 +30,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:minHeight="48dip"
-        android:layout_alignParentLeft="true"
-        android:layout_marginLeft="16dip"
+        android:layout_alignParentStart="true"
+        android:layout_marginStart="16dip"
         android:layout_alignParentTop="true"
         android:textSize="32dip"
         android:textColor="@color/title_color"
@@ -60,9 +60,9 @@
             style="?android:attr/dropDownSpinnerStyle"
             android:layout_width="304dip"
             android:layout_height="48dip"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:layout_alignBottom="@+id/date_time_auto"
-            android:gravity="left|center_vertical"
+            android:gravity="start|center_vertical"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textSize="20dip" />
 
@@ -71,16 +71,16 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:layout_toRightOf="@id/time_zone_button"
-            android:layout_marginLeft="32dip"
-            android:layout_alignParentRight="true">
+            android:layout_toEndOf="@id/time_zone_button"
+            android:layout_marginStart="32dip"
+            android:layout_alignParentEnd="true">
 
             <Switch
                 android:id="@+id/date_time_auto_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:minHeight="?android:attr/listPreferredItemHeight"
-                android:layout_marginLeft="16dip"
+                android:layout_marginStart="16dip"
                 android:text="@string/date_time_auto"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textSize="20dip" />
@@ -154,7 +154,7 @@
         android:id="@+id/bottom_divider"
         android:layout_width="match_parent"
         android:layout_height="3dip"
-        android:layout_alignLeft="@id/timezone_auto_time"
+        android:layout_alignStart="@id/timezone_auto_time"
         android:layout_above="@+id/next_button"
         android:layout_marginBottom="16dip"
         android:background="@color/divider_color" />
@@ -163,6 +163,6 @@
         android:id="@+id/next_button"
         style="@style/setup_wizard_button"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:text="@string/next_label" />
 </RelativeLayout>
diff --git a/res/layout-sw720dp/tab_widget.xml b/res/layout-sw720dp/tab_widget.xml
index 4cd45473572..f591f38a855 100644
--- a/res/layout-sw720dp/tab_widget.xml
+++ b/res/layout-sw720dp/tab_widget.xml
@@ -25,8 +25,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingLeft="@*android:dimen/preference_fragment_padding_side"
-        android:paddingRight="@*android:dimen/preference_fragment_padding_side"
+        android:paddingStart="@*android:dimen/preference_fragment_padding_side"
+        android:paddingEnd="@*android:dimen/preference_fragment_padding_side"
         style="?android:attr/tabWidgetStyle" />
 
 </HorizontalScrollView>
diff --git a/res/layout/account_sync_screen.xml b/res/layout/account_sync_screen.xml
index 117b58af9d9..aa080cf219e 100644
--- a/res/layout/account_sync_screen.xml
+++ b/res/layout/account_sync_screen.xml
@@ -84,8 +84,8 @@
             android:layout_width="150dip"
             android:layout_height="wrap_content"
             android:layout_margin="5dip"
-            android:layout_alignParentRight="true"
-            android:drawableRight="@drawable/ic_btn_next"
+            android:layout_alignParentEnd="true"
+            android:drawableEnd="@drawable/ic_btn_next"
             android:drawablePadding="3dip"
             android:text="@string/finish_button_label"
         />
diff --git a/res/layout/add_account_screen.xml b/res/layout/add_account_screen.xml
index b6305a018ef..7e1564cb121 100644
--- a/res/layout/add_account_screen.xml
+++ b/res/layout/add_account_screen.xml
@@ -21,8 +21,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingLeft="16dip"
-    android:paddingRight="16dip">
+    android:paddingStart="16dip"
+    android:paddingEnd="16dip">
 
     <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list"
         android:layout_width="match_parent"
diff --git a/res/layout/android_beam.xml b/res/layout/android_beam.xml
index 8ce90d7604a..4c9acc23eb1 100644
--- a/res/layout/android_beam.xml
+++ b/res/layout/android_beam.xml
@@ -15,8 +15,8 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:paddingLeft="6dip"
-    android:paddingRight="6dip"
+    android:paddingStart="6dip"
+    android:paddingEnd="6dip"
     android:layout_width="match_parent" android:layout_height="wrap_content"
     android:scrollbars="vertical" >
 
diff --git a/res/layout/apn_preference_layout.xml b/res/layout/apn_preference_layout.xml
index 1694a9342f6..76c9c3d85ce 100644
--- a/res/layout/apn_preference_layout.xml
+++ b/res/layout/apn_preference_layout.xml
@@ -25,8 +25,8 @@
         android:id="@+android:id/text_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16sp"
-        android:layout_marginRight="6sp"
+        android:layout_marginStart="16sp"
+        android:layout_marginEnd="6sp"
         android:layout_marginTop="6sp"
         android:layout_marginBottom="6sp"
         android:layout_weight="1"
@@ -46,7 +46,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:textAppearance="?android:attr/textAppearanceSmall"
             android:maxLines="2" />
 
@@ -57,8 +57,8 @@
         android:id="@+android:id/apn_radiobutton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="4dip"
-        android:layout_marginRight="4dip"
+        android:layout_marginStart="4dip"
+        android:layout_marginEnd="4dip"
         android:layout_gravity="center_vertical"
         android:clickable="true" />
 
diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml
index eee61658ad7..41c4060bcae 100644
--- a/res/layout/app_percentage_item.xml
+++ b/res/layout/app_percentage_item.xml
@@ -18,8 +18,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:paddingTop="8dip"
     android:paddingBottom="8dip"
     android:columnCount="3">
@@ -29,7 +29,7 @@
         android:layout_width="48dip"
         android:layout_height="48dip"
         android:layout_rowSpan="3"
-        android:layout_marginRight="8dip"
+        android:layout_marginEnd="8dip"
         android:scaleType="centerInside"
         android:contentDescription="@null" />
 
@@ -43,7 +43,7 @@
 
     <TextView
         android:id="@android:id/text1"
-        android:layout_marginLeft="8dip"
+        android:layout_marginStart="8dip"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
     <ProgressBar
diff --git a/res/layout/bluetooth_connection_access.xml b/res/layout/bluetooth_connection_access.xml
index 1e74162ec15..7f42177c9ca 100644
--- a/res/layout/bluetooth_connection_access.xml
+++ b/res/layout/bluetooth_connection_access.xml
@@ -31,8 +31,8 @@
             android:id="@+id/message"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:gravity="center_horizontal"
             android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>
diff --git a/res/layout/bluetooth_discoverable.xml b/res/layout/bluetooth_discoverable.xml
index fb65453dec6..b3ddbb9f570 100644
--- a/res/layout/bluetooth_discoverable.xml
+++ b/res/layout/bluetooth_discoverable.xml
@@ -26,8 +26,8 @@
         android:id="@+id/message"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="20dip"
-        android:paddingRight="20dip"
+        android:paddingStart="20dip"
+        android:paddingEnd="20dip"
         android:gravity="center_horizontal"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 </ScrollView>
diff --git a/res/layout/bluetooth_pb_access.xml b/res/layout/bluetooth_pb_access.xml
index 24f0df2d891..01218d6593a 100644
--- a/res/layout/bluetooth_pb_access.xml
+++ b/res/layout/bluetooth_pb_access.xml
@@ -31,8 +31,8 @@
             android:id="@+id/message"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:gravity="center_horizontal"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
diff --git a/res/layout/bluetooth_pin_confirm.xml b/res/layout/bluetooth_pin_confirm.xml
index 5a1b41b1879..a768908dc88 100644
--- a/res/layout/bluetooth_pin_confirm.xml
+++ b/res/layout/bluetooth_pin_confirm.xml
@@ -32,8 +32,8 @@
             android:id="@+id/message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:layout_marginTop="20dip"
             android:layout_marginBottom="20dip"
             android:gravity="center_vertical"
diff --git a/res/layout/bluetooth_pin_entry.xml b/res/layout/bluetooth_pin_entry.xml
index ef73a794c11..44d9dde7167 100644
--- a/res/layout/bluetooth_pin_entry.xml
+++ b/res/layout/bluetooth_pin_entry.xml
@@ -32,8 +32,8 @@
             android:id="@+id/message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:layout_marginTop="20dip"
             android:layout_marginBottom="20dip"
             android:gravity="center_vertical"
@@ -43,8 +43,8 @@
             android:id="@+id/text"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:inputType="textPassword"
             android:singleLine="true" />
 
@@ -53,8 +53,8 @@
             android:text="@string/bluetooth_pin_values_hint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:gravity="center_vertical"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -63,8 +63,8 @@
             android:text="@string/bluetooth_enable_alphanumeric_pin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:gravity="center"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -72,8 +72,8 @@
             android:id="@+id/message_below_pin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:gravity="center_vertical"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
diff --git a/res/layout/bookmark_picker_item.xml b/res/layout/bookmark_picker_item.xml
index b4ffe733a85..113e83a0a5b 100644
--- a/res/layout/bookmark_picker_item.xml
+++ b/res/layout/bookmark_picker_item.xml
@@ -20,7 +20,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingLeft="2dip"
+    android:paddingStart="2dip"
     android:gravity="center_vertical">
 
     <ImageView android:id="@+id/icon"
@@ -33,7 +33,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:paddingLeft="6dip" />
+        android:paddingStart="6dip" />
         
 </LinearLayout>
 
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index e9794134ad6..0c7c11b0a46 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -49,8 +49,8 @@
         android:gravity="center"
         android:layout_gravity="center"
         android:textSize="24sp"
-        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"
diff --git a/res/layout/choose_lock_pattern_tutorial.xml b/res/layout/choose_lock_pattern_tutorial.xml
index 742cef87c41..85145509e2b 100644
--- a/res/layout/choose_lock_pattern_tutorial.xml
+++ b/res/layout/choose_lock_pattern_tutorial.xml
@@ -56,7 +56,7 @@
                  android:layout_width="200dip"
                  android:layout_height="200dip"
                  android:layout_marginTop="10dip"
-                 android:layout_gravity="left"/>
+                 android:layout_gravity="start"/>
 
         </LinearLayout>
 
diff --git a/res/layout/confirm_lock_password.xml b/res/layout/confirm_lock_password.xml
index c952139b9c5..b6c60c3ae9c 100644
--- a/res/layout/confirm_lock_password.xml
+++ b/res/layout/confirm_lock_password.xml
@@ -53,8 +53,8 @@
         android:gravity="center"
         android:layout_gravity="center"
         android:textSize="24sp"
-        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"
@@ -83,7 +83,7 @@
 
     <LinearLayout
         style="@style/SecurityPreferenceButtonContainer"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:orientation="horizontal">
 
diff --git a/res/layout/crypt_keeper_confirm.xml b/res/layout/crypt_keeper_confirm.xml
index b197aa6ac6d..1b6490924f1 100644
--- a/res/layout/crypt_keeper_confirm.xml
+++ b/res/layout/crypt_keeper_confirm.xml
@@ -22,8 +22,8 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dip"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginTop="16dp"
         android:layout_weight="1"
     >
diff --git a/res/layout/crypt_keeper_password_entry.xml b/res/layout/crypt_keeper_password_entry.xml
index 1278327763c..b26f5428b18 100644
--- a/res/layout/crypt_keeper_password_entry.xml
+++ b/res/layout/crypt_keeper_password_entry.xml
@@ -27,8 +27,8 @@
     <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:layout_marginLeft="8dip"
-        android:layout_marginRight="8dip"
+        android:layout_marginStart="8dip"
+        android:layout_marginEnd="8dip"
         android:orientation="horizontal"
     >
         <include layout="@layout/crypt_keeper_password_field" />
diff --git a/res/layout/crypt_keeper_progress.xml b/res/layout/crypt_keeper_progress.xml
index 0d408c264f8..6b8e65f5e8a 100644
--- a/res/layout/crypt_keeper_progress.xml
+++ b/res/layout/crypt_keeper_progress.xml
@@ -27,7 +27,7 @@
         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:textSize="30dip"
         android:textColor="@color/title_color"
@@ -62,7 +62,7 @@
         android:layout_width="wrap_content"
         android:layout_height="0dip"
         android:layout_weight="1"
-        android:layout_gravity="bottom|right"
+        android:layout_gravity="bottom|end"
         android:src="@drawable/encroid_waiting"
         android:contentDescription="@null"
     />
diff --git a/res/layout/crypt_keeper_settings.xml b/res/layout/crypt_keeper_settings.xml
index 3239aa9c26c..b54e0a5919c 100644
--- a/res/layout/crypt_keeper_settings.xml
+++ b/res/layout/crypt_keeper_settings.xml
@@ -23,8 +23,8 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dip"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginTop="16dp"
         android:layout_weight="1"
     >
diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml
index 80da43705c1..df80fe38a35 100644
--- a/res/layout/crypt_keeper_status.xml
+++ b/res/layout/crypt_keeper_status.xml
@@ -56,7 +56,7 @@
             android:textSize="@dimen/crypt_clock_size"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@color/crypt_keeper_clock_foreground"
-            android:layout_alignLeft="@*android:id/timeDisplayBackground"
+            android:layout_alignStart="@*android:id/timeDisplayBackground"
             android:layout_alignTop="@*android:id/timeDisplayBackground"
             android:layout_marginBottom="6dip"
             />
@@ -68,8 +68,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dip"
-        android:layout_marginLeft="8dip"
-        android:layout_marginRight="8dip"
+        android:layout_marginStart="8dip"
+        android:layout_marginEnd="8dip"
         android:textSize="18sp"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:text="@string/enter_password"
diff --git a/res/layout/custom_preference.xml b/res/layout/custom_preference.xml
index fcdc9f56761..087a37ca1fd 100644
--- a/res/layout/custom_preference.xml
+++ b/res/layout/custom_preference.xml
@@ -22,7 +22,7 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <!-- <View
         android:layout_width="@dimen/preference_widget_width"
@@ -31,8 +31,8 @@
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="6dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="6dip"
+        android:layout_marginEnd="6dip"
         android:layout_marginTop="6dip"
         android:layout_marginBottom="6dip"
         android:layout_weight="1">
@@ -49,7 +49,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:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorSecondary"
             android:maxLines="4" />
diff --git a/res/layout/data_usage_bytes_editor.xml b/res/layout/data_usage_bytes_editor.xml
index ec6e64f287c..8de74505319 100644
--- a/res/layout/data_usage_bytes_editor.xml
+++ b/res/layout/data_usage_bytes_editor.xml
@@ -26,8 +26,8 @@
         android:minWidth="48dip"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
+        android:layout_marginStart="16dip"
+        android:layout_marginEnd="16dip"
         android:focusable="true"
         android:focusableInTouchMode="true" />
 
diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml
index 2501e9d0875..cec2af2f84a 100644
--- a/res/layout/data_usage_chart.xml
+++ b/res/layout/data_usage_chart.xml
@@ -20,11 +20,11 @@
     android:id="@+id/chart"
     android:layout_width="match_parent"
     android:layout_height="@dimen/data_usage_chart_height"
-    android:layout_marginLeft="-16dip"
-    android:layout_marginRight="-16dip"
+    android:layout_marginStart="-16dip"
+    android:layout_marginEnd="-16dip"
     android:layout_marginBottom="-32dip"
-    android:paddingLeft="24dip"
-    android:paddingRight="24dip"
+    android:paddingStart="24dip"
+    android:paddingEnd="24dip"
     android:paddingTop="16dip"
     android:paddingBottom="48dip"
     settings:optimalWidth="@dimen/data_usage_chart_optimalWidth"
@@ -34,7 +34,7 @@
         android:id="@+id/grid"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="left|bottom"
+        android:layout_gravity="start|bottom"
         settings:primaryDrawable="@drawable/data_grid_primary"
         settings:secondaryDrawable="@drawable/data_grid_secondary"
         settings:borderDrawable="@drawable/data_grid_border"
@@ -44,7 +44,7 @@
         android:id="@+id/series"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="left|bottom"
+        android:layout_gravity="start|bottom"
         settings:strokeColor="@android:color/holo_blue_light"
         settings:fillColor="#c033b5e5"
         settings:fillColorSecondary="#6633b5e5" />
@@ -53,7 +53,7 @@
         android:id="@+id/detail_series"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="left|bottom"
+        android:layout_gravity="start|bottom"
         settings:strokeColor="#d88d3a"
         settings:fillColor="#c0ba7f3e"
         settings:fillColorSecondary="#60ba7f3e" />
diff --git a/res/layout/data_usage_cycle_editor.xml b/res/layout/data_usage_cycle_editor.xml
index dffbe18fb8e..ff5fceb8644 100644
--- a/res/layout/data_usage_cycle_editor.xml
+++ b/res/layout/data_usage_cycle_editor.xml
@@ -32,8 +32,8 @@
         android:layout_width="48dip"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
+        android:layout_marginStart="16dip"
+        android:layout_marginEnd="16dip"
         android:focusable="true"
         android:focusableInTouchMode="true" />
 
diff --git a/res/layout/data_usage_cycles.xml b/res/layout/data_usage_cycles.xml
index c9647c8ea30..2a67d6b98b8 100644
--- a/res/layout/data_usage_cycles.xml
+++ b/res/layout/data_usage_cycles.xml
@@ -20,8 +20,8 @@
     android:layout_height="40dip"
     android:orientation="horizontal"
     android:gravity="center_vertical"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight">
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/res/layout/data_usage_detail.xml b/res/layout/data_usage_detail.xml
index 6c09d09bcee..eaac49c2cfd 100644
--- a/res/layout/data_usage_detail.xml
+++ b/res/layout/data_usage_detail.xml
@@ -24,8 +24,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft"
-        android:layout_marginRight="?android:attr/listPreferredItemPaddingRight"
+        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
         android:orientation="horizontal">
 
         <LinearLayout
@@ -33,7 +33,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_marginTop="8dip"
-            android:layout_marginRight="8dip"
+            android:layout_marginEnd="8dip"
             android:orientation="vertical">
 
             <ImageView
@@ -85,8 +85,8 @@
         android:id="@+id/app_settings"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft"
-        android:layout_marginRight="?android:attr/listPreferredItemPaddingRight"
+        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
         android:layout_marginTop="16dip"
         android:layout_marginBottom="16dip"
         android:text="@string/data_usage_app_settings" />
diff --git a/res/layout/data_usage_header.xml b/res/layout/data_usage_header.xml
index 619956d77c9..0a8006b3a1a 100644
--- a/res/layout/data_usage_header.xml
+++ b/res/layout/data_usage_header.xml
@@ -41,8 +41,8 @@
         android:id="@+id/usage_summary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
         android:paddingTop="8dip"
         android:paddingBottom="8dip"
         android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -52,8 +52,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
         android:paddingBottom="8dip"
         android:text="@string/data_usage_empty"
         android:textAppearance="?android:attr/textAppearanceSmall" />
diff --git a/res/layout/date_time_settings_setupwizard.xml b/res/layout/date_time_settings_setupwizard.xml
index d05098ae381..7227f2b5305 100644
--- a/res/layout/date_time_settings_setupwizard.xml
+++ b/res/layout/date_time_settings_setupwizard.xml
@@ -23,8 +23,8 @@
     <View
         android:id="@+id/timezone_dropdown_anchor"
         android:layout_width="match_parent"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip"
+        android:layout_marginStart="20dip"
+        android:layout_marginEnd="20dip"
         android:layout_height="0px" />
 
     <LinearLayout android:layout_height="0px"
@@ -45,7 +45,7 @@
         <Button android:id="@+id/next_button"
             android:layout_width="150dip"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:text="@string/next_label"
         />
 
diff --git a/res/layout/date_time_setup_custom_list_item_2.xml b/res/layout/date_time_setup_custom_list_item_2.xml
index 623ac32d1ec..ed32fb73f20 100644
--- a/res/layout/date_time_setup_custom_list_item_2.xml
+++ b/res/layout/date_time_setup_custom_list_item_2.xml
@@ -27,7 +27,7 @@
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:minHeight="16dip"
-              android:layout_marginLeft="10dip"
+              android:layout_marginStart="10dip"
               android:textAppearance="?android:attr/textAppearanceMedium"
               />
 
@@ -36,7 +36,7 @@
               android:layout_height="wrap_content"
               android:minHeight="10dip"
               android:layout_below="@android:id/text1"
-              android:layout_alignLeft="@android:id/text1"
+              android:layout_alignStart="@android:id/text1"
               android:textAppearance="?android:attr/textAppearanceSmall"
               />
 
diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml
index 3b4824f7478..c54eccecfea 100644
--- a/res/layout/device_admin_add.xml
+++ b/res/layout/device_admin_add.xml
@@ -25,8 +25,8 @@
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1.0"
-        android:paddingLeft="16dip"
-        android:paddingRight="16dip"
+        android:paddingStart="16dip"
+        android:paddingEnd="16dip"
         android:scrollbarStyle="outsideOverlay"
         android:gravity="top">
         <LinearLayout
@@ -42,7 +42,7 @@
                 <ImageView android:id="@+id/admin_icon"
                     android:layout_width="@android:dimen/app_icon_size"
                     android:layout_height="@android:dimen/app_icon_size"
-                    android:layout_marginRight="16dip"
+                    android:layout_marginEnd="16dip"
                     android:layout_gravity="center_vertical"
                     android:scaleType="fitCenter"
                     android:contentDescription="@null" />
@@ -94,8 +94,8 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:orientation="vertical"
-                    android:paddingLeft="16dip"
-                    android:paddingRight="12dip" />
+                    android:paddingStart="16dip"
+                    android:paddingEnd="12dip" />
             </LinearLayout>
 
         </LinearLayout>
@@ -121,7 +121,7 @@
                 android:visibility="gone" />
             <Button android:id="@+id/cancel_button"
                 android:layout_width="0dip"
-                android:layout_gravity="right"
+                android:layout_gravity="end"
                 android:layout_weight="1"
                 android:maxLines="2"
                 android:text="@string/cancel"
@@ -129,7 +129,7 @@
                 android:layout_height="wrap_content" />
             <Button android:id="@+id/action_button"
                 android:layout_width="0dip"
-                android:layout_gravity="left"
+                android:layout_gravity="start"
                 android:layout_weight="1"
                 android:maxLines="2"
                 style="?android:attr/buttonBarButtonStyle"
diff --git a/res/layout/device_admin_item.xml b/res/layout/device_admin_item.xml
index 24dab5ed019..56be346c96b 100644
--- a/res/layout/device_admin_item.xml
+++ b/res/layout/device_admin_item.xml
@@ -22,8 +22,8 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
-    android:paddingRight="6dip"
-    android:paddingLeft="6dip"
+    android:paddingEnd="6dip"
+    android:paddingStart="6dip"
     android:gravity="center_vertical" >
 
     <LinearLayout
@@ -63,7 +63,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dip"
             android:layout_below="@id/name"
-            android:layout_alignLeft="@id/name"
+            android:layout_alignStart="@id/name"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorSecondary"
             android:maxLines="4" />
@@ -75,8 +75,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginRight="16dip"
-        android:layout_marginLeft="16dip"
+        android:layout_marginEnd="16dip"
+        android:layout_marginStart="16dip"
         android:focusable="false"
         android:clickable="false" />
 
diff --git a/res/layout/dialog_edittext.xml b/res/layout/dialog_edittext.xml
index 80911da7bbc..0da47a92188 100644
--- a/res/layout/dialog_edittext.xml
+++ b/res/layout/dialog_edittext.xml
@@ -17,8 +17,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:paddingLeft="8dip"
-    android:paddingRight="8dip">
+    android:paddingStart="8dip"
+    android:paddingEnd="8dip">
     
     <EditText 
         android:id="@+id/edittext"
diff --git a/res/layout/dream_picker_row.xml b/res/layout/dream_picker_row.xml
index 18fe4f0296e..b445cf4b764 100644
--- a/res/layout/dream_picker_row.xml
+++ b/res/layout/dream_picker_row.xml
@@ -20,7 +20,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingLeft="2dip"
+    android:paddingStart="2dip"
     android:gravity="center_vertical">
 
     <ImageView android:id="@+id/icon"
@@ -33,7 +33,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:paddingLeft="6dip" />
+        android:paddingStart="6dip" />
         
 </LinearLayout>
 
diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index d69f98a9052..9e1eeb5ba76 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -24,7 +24,7 @@
         android:id="@+id/all_details"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingRight="6dip"
+        android:paddingEnd="6dip"
         android:paddingBottom="5dip"
         android:orientation="vertical">
 
@@ -34,8 +34,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:orientation="vertical"
-            android:paddingRight="6dip"
-            android:paddingLeft="6dip"
+            android:paddingEnd="6dip"
+            android:paddingStart="6dip"
             android:paddingTop="5dip"
             android:paddingBottom="5dip" >
 
@@ -53,8 +53,8 @@
             <CheckBox android:id="@+id/notification_switch"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="12dip"
-                android:layout_gravity="left"
+                android:layout_marginStart="12dip"
+                android:layout_gravity="start"
                 android:text="@string/app_notifications_switch_label" />
 
         </LinearLayout>
@@ -67,7 +67,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="6dip"
+            android:paddingStart="6dip"
             android:orientation="vertical">
             <LinearLayout
                 android:layout_width="match_parent"
@@ -83,7 +83,7 @@
                     android:layout_width="wrap_content"
                     android:maxLines="1"
                     android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
+                    android:paddingStart="6dip"/>
 
                 <ImageView
                     android:id="@+id/info_size_dots"
@@ -92,15 +92,15 @@
                     android:layout_weight="1"
                     android:layout_height="1px"
                     android:layout_gravity="bottom"
-                    android:layout_marginLeft="1dip"
-                    android:layout_marginRight="1dip"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
                     android:layout_marginBottom="4dip"
                     android:scaleType="center"
                     android:contentDescription="@null" />
                 <TextView
                     android:id="@+id/total_size_text"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
+                    android:paddingEnd="6dip"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
@@ -121,7 +121,7 @@
                     android:layout_width="wrap_content"
                     android:maxLines="1"
                     android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
+                    android:paddingStart="6dip"/>
                 <ImageView
                     android:id="@+id/info_size_dots"
                     android:src="@drawable/dotted_line_480px"
@@ -129,8 +129,8 @@
                     android:layout_weight="1"
                     android:layout_height="1px"
                     android:layout_gravity="bottom"
-                    android:layout_marginLeft="1dip"
-                    android:layout_marginRight="1dip"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
                     android:layout_marginBottom="4dip"
                     android:scaleType="center"
                     android:contentDescription="@null" />
@@ -138,7 +138,7 @@
                     android:id="@+id/application_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
+                    android:paddingEnd="6dip"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
@@ -159,7 +159,7 @@
                     android:layout_width="wrap_content"
                     android:maxLines="1"
                     android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
+                    android:paddingStart="6dip"/>
                 <ImageView
                     android:id="@+id/info_size_dots"
                     android:src="@drawable/dotted_line_480px"
@@ -167,8 +167,8 @@
                     android:layout_weight="1"
                     android:layout_height="1px"
                     android:layout_gravity="bottom"
-                    android:layout_marginLeft="1dip"
-                    android:layout_marginRight="1dip"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
                     android:layout_marginBottom="4dip"
                     android:scaleType="center"
                     android:contentDescription="@null" />
@@ -176,7 +176,7 @@
                     android:id="@+id/external_code_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
+                    android:paddingEnd="6dip"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
@@ -198,7 +198,7 @@
                     android:layout_width="wrap_content"
                     android:maxLines="1"
                     android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
+                    android:paddingStart="6dip"/>
                 <ImageView
                     android:id="@+id/info_size_dots"
                     android:src="@drawable/dotted_line_480px"
@@ -206,8 +206,8 @@
                     android:layout_weight="1"
                     android:layout_height="1px"
                     android:layout_gravity="bottom"
-                    android:layout_marginLeft="1dip"
-                    android:layout_marginRight="1dip"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
                     android:layout_marginBottom="4dip"
                     android:scaleType="center"
                     android:contentDescription="@null" />
@@ -215,7 +215,7 @@
                     android:id="@+id/data_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
+                    android:paddingEnd="6dip"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
@@ -236,7 +236,7 @@
                     android:layout_width="wrap_content"
                     android:maxLines="1"
                     android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
+                    android:paddingStart="6dip"/>
                 <ImageView
                     android:id="@+id/info_size_dots"
                     android:src="@drawable/dotted_line_480px"
@@ -244,8 +244,8 @@
                     android:layout_weight="1"
                     android:layout_height="1px"
                     android:layout_gravity="bottom"
-                    android:layout_marginLeft="1dip"
-                    android:layout_marginRight="1dip"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
                     android:layout_marginBottom="4dip"
                     android:scaleType="center"
                     android:contentDescription="@null" />
@@ -253,7 +253,7 @@
                     android:id="@+id/external_data_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
+                    android:paddingEnd="6dip"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
@@ -293,15 +293,15 @@
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
                     android:gravity="center_vertical"
-                    android:paddingLeft="6dip"/>
+                    android:paddingStart="6dip"/>
                 <ImageView
                     android:src="@drawable/dotted_line_480px"
                     android:layout_width="0dip"
                     android:layout_weight="1"
                     android:layout_height="1px"
                     android:layout_gravity="bottom"
-                    android:layout_marginLeft="1dip"
-                    android:layout_marginRight="1dip"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
                     android:layout_marginBottom="4dip"
                     android:scaleType="center"
                     android:contentDescription="@null" />
@@ -309,14 +309,14 @@
                     android:id="@+id/cache_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
+                    android:paddingEnd="6dip"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
             </LinearLayout>
 
             <Button android:id="@+id/clear_cache_button"
-                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
                 android:layout_below="@id/cache_size"
                 android:layout_centerHorizontal="true"
                 android:layout_width="200dip"
@@ -336,14 +336,14 @@
             android:layout_gravity="center_vertical">
             <TextView android:id="@+id/auto_launch"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingTop="6dip"
-                android:paddingRight="6dip"
-                android:paddingLeft="6dip" />
+                android:paddingEnd="6dip"
+                android:paddingStart="6dip" />
             <Button android:id="@+id/clear_activities_button"
-                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
                 android:layout_below="@id/auto_launch"
                 android:layout_centerHorizontal="true"
                 android:layout_width="200dip"
@@ -362,24 +362,24 @@
                 android:text="@string/screen_compatibility_label" />
 
             <TextView android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingTop="6dip"
-                android:paddingRight="6dip"
-                android:paddingLeft="6dip"
+                android:paddingEnd="6dip"
+                android:paddingStart="6dip"
                 android:text="@string/screen_compatibility_text"/>
             <CheckBox android:id="@+id/ask_compatibility_cb"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="12dip"
-                android:layout_gravity="left"
+                android:layout_marginStart="12dip"
+                android:layout_gravity="start"
                 android:text="@string/ask_compatibility" />
             <CheckBox android:id="@+id/enable_compatibility_cb"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="12dip"
-                android:layout_gravity="left"
+                android:layout_marginStart="12dip"
+                android:layout_gravity="start"
                 android:text="@string/enable_compatibility" />
         </LinearLayout>
 
@@ -397,7 +397,7 @@
                 android:text="@string/security_settings_desc"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:paddingTop="6dip"
-                android:paddingLeft="6dip"
+                android:paddingStart="6dip"
                 android:paddingBottom="6dip"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
diff --git a/res/layout/intent_sender.xml b/res/layout/intent_sender.xml
index 8a85bf84c04..bf8fd6496ce 100644
--- a/res/layout/intent_sender.xml
+++ b/res/layout/intent_sender.xml
@@ -18,8 +18,8 @@
 */
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:paddingLeft="6dip"
-    android:paddingRight="6dip"
+    android:paddingStart="6dip"
+    android:paddingEnd="6dip"
     android:paddingBottom="3dip"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/res/layout/manage_applications_apps.xml b/res/layout/manage_applications_apps.xml
index 51ab4127a8f..394382ec4f3 100644
--- a/res/layout/manage_applications_apps.xml
+++ b/res/layout/manage_applications_apps.xml
@@ -47,11 +47,11 @@
                 android:clipChildren="false"
                 android:clipToPadding="false"
                 android:paddingTop="30dp"
-                android:paddingLeft="4dp"
-                android:paddingRight="4dp"
+                android:paddingStart="4dp"
+                android:paddingEnd="4dp"
                 android:paddingBottom="1dp"
-                android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
-                android:layout_marginRight="@*android:dimen/preference_fragment_padding_side">
+                android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
+                android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side">
             <TextView android:id="@+id/usedStorageText"
                 android:layout_width="0px"
                 android:layout_height="wrap_content"
@@ -72,11 +72,11 @@
                 android:singleLine="true"
                 android:text="@string/internal_storage" />
             <TextView android:id="@+id/freeStorageText"
-                android:layout_gravity="center_vertical|right"
+                android:layout_gravity="center_vertical|end"
                 android:layout_width="0px"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:gravity="right"
+                android:gravity="end"
                 android:textAppearance="?android:attr/textAppearanceSmallInverse"
                 android:textColor="#000"
                 android:singleLine="true" />
@@ -87,8 +87,8 @@
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
-            android:layout_marginRight="@*android:dimen/preference_fragment_padding_side"
+            android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
+            android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side"
             android:visibility="gone"
             android:gravity="center">
 
diff --git a/res/layout/manage_applications_item.xml b/res/layout/manage_applications_item.xml
index 6708647ebbd..3c7944e6f2f 100755
--- a/res/layout/manage_applications_item.xml
+++ b/res/layout/manage_applications_item.xml
@@ -22,8 +22,8 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
-    android:paddingRight="6dip"
-    android:paddingLeft="6dip"
+    android:paddingEnd="6dip"
+    android:paddingStart="6dip"
     android:paddingTop="5dip"
     android:paddingBottom="5dip"
     android:gravity="center_vertical" >
@@ -31,7 +31,7 @@
     <ImageView android:id="@+id/app_icon"
         android:layout_width="@android:dimen/app_icon_size"
         android:layout_height="@android:dimen/app_icon_size"
-        android:layout_marginRight="11dip"
+        android:layout_marginEnd="11dip"
         android:layout_gravity="center_vertical"
         android:scaleType="fitCenter"
         android:contentDescription="@null"/>
@@ -56,14 +56,14 @@
             android:baselineAlignedChildIndex="0" >
             <TextView android:id="@+id/app_size"
                 android:layout_marginTop="-4dip"
-                android:layout_gravity="center_vertical|left"
+                android:layout_gravity="center_vertical|start"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
             <TextView android:id="@+id/app_disabled"
                 android:layout_marginTop="-4dip"
-                android:layout_gravity="center_vertical|right"
+                android:layout_gravity="center_vertical|end"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
@@ -76,7 +76,7 @@
     <CheckBox android:id="@+id/app_on_sdcard"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
+        android:layout_marginStart="5dip"
         android:layout_gravity="center_vertical"
         android:visibility="gone"
         android:clickable="false"
diff --git a/res/layout/manage_applications_running.xml b/res/layout/manage_applications_running.xml
index 634de1c7b87..0bc69fbc88c 100644
--- a/res/layout/manage_applications_running.xml
+++ b/res/layout/manage_applications_running.xml
@@ -27,8 +27,8 @@
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
-            android:layout_marginRight="@*android:dimen/preference_fragment_padding_side"
+            android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
+            android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side"
             android:visibility="gone"
             android:gravity="center">
 
diff --git a/res/layout/master_clear.xml b/res/layout/master_clear.xml
index 268daa003ed..db62936e9c5 100644
--- a/res/layout/master_clear.xml
+++ b/res/layout/master_clear.xml
@@ -23,8 +23,8 @@
     <ScrollView
             android:layout_width="match_parent"
             android:layout_height="0dip"
-            android:layout_marginLeft="12dp"
-            android:layout_marginRight="12dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
             android:layout_marginTop="12dp"
             android:layout_weight="1">
         <LinearLayout android:layout_width="match_parent"
@@ -70,7 +70,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:paddingRight="8dp"
+                        android:paddingEnd="8dp"
                         android:focusable="false"
                         android:clickable="false"
                         android:duplicateParentState="true" />
diff --git a/res/layout/master_clear_confirm.xml b/res/layout/master_clear_confirm.xml
index 0599b1037a2..6e5027831c5 100644
--- a/res/layout/master_clear_confirm.xml
+++ b/res/layout/master_clear_confirm.xml
@@ -22,8 +22,8 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
         android:layout_marginTop="12dp"
         android:textSize="20sp"
         android:text="@string/master_clear_final_desc" />
diff --git a/res/layout/ownerinfo.xml b/res/layout/ownerinfo.xml
index 1001a21b35c..d33f156ba5f 100644
--- a/res/layout/ownerinfo.xml
+++ b/res/layout/ownerinfo.xml
@@ -15,8 +15,8 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:paddingLeft="6dip"
-    android:paddingRight="6dip"
+    android:paddingStart="6dip"
+    android:paddingEnd="6dip"
     android:layout_width="match_parent" android:layout_height="wrap_content"
     android:scrollbars="vertical" >
 
@@ -55,7 +55,7 @@
             <EditText android:id="@+id/owner_info_edit_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="62dip"
+                android:layout_marginStart="62dip"
                 android:layout_marginTop="40dip"
                 android:gravity="top"
                 android:hint="@string/owner_info_settings_edit_text_hint"
diff --git a/res/layout/pick_item.xml b/res/layout/pick_item.xml
index 62fc4f4814a..5c58a798908 100755
--- a/res/layout/pick_item.xml
+++ b/res/layout/pick_item.xml
@@ -21,5 +21,5 @@
     android:textAppearance="?android:attr/textAppearanceLargeInverse"
     android:gravity="center_vertical"
     android:drawablePadding="14dip"
-    android:paddingLeft="15dip"
-    android:paddingRight="15dip" />
+    android:paddingStart="15dip"
+    android:paddingEnd="15dip" />
diff --git a/res/layout/power_usage_action_item.xml b/res/layout/power_usage_action_item.xml
index e4d8b5a21a2..9e8551eb7d5 100644
--- a/res/layout/power_usage_action_item.xml
+++ b/res/layout/power_usage_action_item.xml
@@ -19,10 +19,10 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingLeft="4dip"
+    android:paddingStart="4dip"
     android:focusable="true"
     android:orientation="vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <TextView android:id="@+id/summary"
             android:layout_width="match_parent"
@@ -47,7 +47,7 @@
         <Button
                 android:id="@+id/action_button"
                 android:layout_width="150dip"
-                android:paddingRight="6dip"
+                android:paddingEnd="6dip"
                 android:layout_weight="0.3"
                 android:layout_height="wrap_content"/>
     </LinearLayout>
diff --git a/res/layout/power_usage_detail_item_text.xml b/res/layout/power_usage_detail_item_text.xml
index 6c21274c6c7..fb8c705ce7f 100644
--- a/res/layout/power_usage_detail_item_text.xml
+++ b/res/layout/power_usage_detail_item_text.xml
@@ -26,19 +26,19 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textStyle="bold"
         android:singleLine="true"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_marginBottom="4dip"
         android:layout_marginTop="4dip"
-        android:layout_marginLeft="4dip" />
+        android:layout_marginStart="4dip" />
     <TextView
         android:id="@+id/value"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textStyle="normal"
         android:singleLine="true"
         android:layout_marginBottom="4dip"
         android:layout_marginTop="4dip"
-        android:layout_marginRight="10dip"/>
+        android:layout_marginEnd="10dip"/>
 </RelativeLayout>
diff --git a/res/layout/power_usage_details.xml b/res/layout/power_usage_details.xml
index 99567a17d9d..001ffec3f2a 100644
--- a/res/layout/power_usage_details.xml
+++ b/res/layout/power_usage_details.xml
@@ -47,7 +47,7 @@
             android:id="@+id/details"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="6dip"
+            android:paddingStart="6dip"
             android:orientation="vertical">
 
             <!-- Insert detail items here -->
@@ -80,7 +80,7 @@
             android:id="@+id/packages_section"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="6dip"
+            android:paddingStart="6dip"
             android:orientation="vertical">
 
             <!-- Insert detail items here -->
diff --git a/res/layout/power_usage_package_item.xml b/res/layout/power_usage_package_item.xml
index 750e062616c..d9392294d54 100644
--- a/res/layout/power_usage_package_item.xml
+++ b/res/layout/power_usage_package_item.xml
@@ -25,7 +25,7 @@
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:singleLine="true"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_marginBottom="2dip"
         android:layout_marginTop="2dip" />
 </RelativeLayout>
diff --git a/res/layout/preference.xml b/res/layout/preference.xml
index aef21a1f257..ef4444a8c7f 100644
--- a/res/layout/preference.xml
+++ b/res/layout/preference.xml
@@ -19,8 +19,8 @@
     android:layout_height="wrap_content"
     android:minHeight="48dip"
     android:gravity="center_vertical"
-    android:paddingLeft="@*android:dimen/preference_item_padding_side"
-    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingStart="@*android:dimen/preference_item_padding_side"
+    android:paddingEnd="?android:attr/scrollbarSize"
     android:background="?android:attr/selectableItemBackground">
 
     <RelativeLayout
@@ -44,7 +44,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:visibility="gone"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorSecondary"
diff --git a/res/layout/preference_batteryhistory.xml b/res/layout/preference_batteryhistory.xml
index 53dce74d07e..26556157204 100644
--- a/res/layout/preference_batteryhistory.xml
+++ b/res/layout/preference_batteryhistory.xml
@@ -21,7 +21,7 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
     android:id="@+android:id/battery_history_chart"
-    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingEnd="?android:attr/scrollbarSize"
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:shadowRadius="4"
     android:shadowColor="?android:attr/colorBackground"
diff --git a/res/layout/preference_dialog_brightness.xml b/res/layout/preference_dialog_brightness.xml
index 82c6f281abf..b3d62cb2492 100644
--- a/res/layout/preference_dialog_brightness.xml
+++ b/res/layout/preference_dialog_brightness.xml
@@ -40,8 +40,8 @@
                 android:text="@string/automatic_brightness"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:layout_marginTop="6dip"
-                android:layout_marginLeft="20dip"
-                android:layout_marginRight="20dip" />
+                android:layout_marginStart="20dip"
+                android:layout_marginEnd="20dip" />
 
         <SeekBar android:id="@*android:id/seekbar"
                 android:layout_width="match_parent"
diff --git a/res/layout/preference_dialog_ringervolume.xml b/res/layout/preference_dialog_ringervolume.xml
index a92f0ef1640..1643cabe082 100644
--- a/res/layout/preference_dialog_ringervolume.xml
+++ b/res/layout/preference_dialog_ringervolume.xml
@@ -44,8 +44,8 @@
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingLeft="16dip"
-                android:layout_gravity="left"
+                android:paddingStart="16dip"
+                android:layout_gravity="start"
                 android:text="@string/volume_media_description"
             />
 
@@ -53,7 +53,7 @@
         <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="8dip"
+                android:paddingStart="8dip"
                 android:orientation="horizontal"
                 android:gravity="center_vertical">
 
@@ -70,7 +70,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:paddingTop="2dip"
-                        android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+                        android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
         </LinearLayout>
 
         <!-- Used for the ringer/notification volume -->
@@ -86,15 +86,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dip"
-                    android:paddingLeft="16dip"
-                    android:layout_gravity="left"
+                    android:paddingStart="16dip"
+                    android:layout_gravity="start"
                     android:text="@string/volume_ring_description"
                 />
 
             <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="8dip"
+                    android:paddingStart="8dip"
                     android:orientation="horizontal"
                     android:gravity="center_vertical">
 
@@ -111,7 +111,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:paddingTop="2dip"
-                            android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+                            android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
             </LinearLayout>
 
         </LinearLayout>
@@ -129,15 +129,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dip"
-                    android:paddingLeft="16dip"
-                    android:layout_gravity="left"
+                    android:paddingStart="16dip"
+                    android:layout_gravity="start"
                     android:text="@string/volume_notification_description"
                 />
 
             <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="8dip"
+                    android:paddingStart="8dip"
                     android:orientation="horizontal"
                     android:gravity="center_vertical">
 
@@ -154,7 +154,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:paddingTop="2dip"
-                            android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+                            android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
             </LinearLayout>
 
         </LinearLayout>
@@ -164,8 +164,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dip"
-                android:paddingLeft="16dip"
-                android:layout_gravity="left"
+                android:paddingStart="16dip"
+                android:layout_gravity="start"
                 android:text="@string/volume_alarm_description"
             />
 
@@ -173,7 +173,7 @@
         <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="8dip"
+                android:paddingStart="8dip"
                 android:orientation="horizontal"
                 android:gravity="center_vertical">
 
@@ -188,7 +188,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:paddingTop="2dip"
-                        android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+                        android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
         </LinearLayout>
 
     </LinearLayout>
diff --git a/res/layout/preference_header_item.xml b/res/layout/preference_header_item.xml
index 28da8a1da16..36ed8e463fc 100644
--- a/res/layout/preference_header_item.xml
+++ b/res/layout/preference_header_item.xml
@@ -21,12 +21,12 @@
     android:minHeight="48dp"
     android:background="?android:attr/activatedBackgroundIndicator"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <LinearLayout
         android:layout_width="@dimen/header_icon_width"
-        android:layout_marginLeft="6dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="6dip"
+        android:layout_marginEnd="6dip"
         android:layout_height="wrap_content">
         <ImageView
             android:id="@+id/icon"
@@ -38,8 +38,8 @@
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="6dip"
         android:layout_marginTop="6dip"
         android:layout_marginBottom="6dip"
         android:layout_weight="1">
@@ -56,7 +56,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:textAppearance="?android:attr/textAppearanceSmall"
             android:ellipsize="end"
             android:maxLines="2" />
diff --git a/res/layout/preference_header_switch_item.xml b/res/layout/preference_header_switch_item.xml
index 9d89c252bf7..4ab09d62862 100644
--- a/res/layout/preference_header_switch_item.xml
+++ b/res/layout/preference_header_switch_item.xml
@@ -21,12 +21,12 @@
     android:minHeight="48dp"
     android:background="?android:attr/activatedBackgroundIndicator"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <LinearLayout
         android:layout_width="@dimen/header_icon_width"
-        android:layout_marginLeft="6dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="6dip"
+        android:layout_marginEnd="6dip"
         android:layout_height="wrap_content">
         <ImageView
             android:id="@+id/icon"
@@ -38,8 +38,8 @@
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="6dip"
         android:layout_marginTop="6dip"
         android:layout_marginBottom="6dip"
         android:layout_weight="1">
@@ -56,7 +56,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:textAppearance="?android:attr/textAppearanceSmall"
             android:ellipsize="end"
             android:maxLines="2" />
diff --git a/res/layout/preference_icon.xml b/res/layout/preference_icon.xml
index 76606468cc6..8e625081e38 100644
--- a/res/layout/preference_icon.xml
+++ b/res/layout/preference_icon.xml
@@ -23,22 +23,22 @@
     android:layout_height="wrap_content"
     android:minHeight="56dp"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
     
     <ImageView
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="6dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="6dip"
+        android:layout_marginEnd="6dip"
         android:layout_gravity="center"
         android:contentDescription="@null" />
 
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="6dip"
         android:layout_marginTop="6dip"
         android:layout_marginBottom="6dip"
         android:layout_weight="1">
@@ -55,7 +55,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:textAppearance="?android:attr/textAppearanceSmall"
             android:maxLines="2" />
 
diff --git a/res/layout/preference_inputmethod.xml b/res/layout/preference_inputmethod.xml
index f477a6e3192..589ddc9835b 100644
--- a/res/layout/preference_inputmethod.xml
+++ b/res/layout/preference_inputmethod.xml
@@ -38,7 +38,7 @@
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="6dip"
+            android:layout_marginEnd="6dip"
             android:layout_marginTop="6dip"
             android:layout_marginBottom="6dip"
             android:layout_weight="1">
@@ -55,7 +55,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"
@@ -75,8 +75,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/preference_memoryusage.xml b/res/layout/preference_memoryusage.xml
index 28825358a37..ddc619dd77d 100644
--- a/res/layout/preference_memoryusage.xml
+++ b/res/layout/preference_memoryusage.xml
@@ -20,8 +20,8 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize"
-    android:paddingLeft="@*android:dimen/preference_widget_width">
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:paddingStart="@*android:dimen/preference_widget_width">
 
     <com.android.settings.deviceinfo.PercentageBarChart
         android:id="@+id/percentage_bar_chart"
diff --git a/res/layout/preference_powergauge.xml b/res/layout/preference_powergauge.xml
index e6188dce1fb..5efc028f715 100644
--- a/res/layout/preference_powergauge.xml
+++ b/res/layout/preference_powergauge.xml
@@ -19,21 +19,21 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingLeft="16dip"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingStart="16dip"
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <ImageView
         android:id="@+id/appIcon"
         android:layout_width="48dip"
         android:layout_height="wrap_content"
-        android:layout_marginRight="6dip"
+        android:layout_marginEnd="6dip"
         android:layout_gravity="center"
         android:contentDescription="@null" />
 
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="8dip"
+        android:layout_marginEnd="8dip"
         android:layout_marginTop="2dip"
         android:layout_marginBottom="6dip"
         android:layout_weight="1">
@@ -43,9 +43,9 @@
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:layout_marginTop="2dip"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:layout_alignParentTop="true"
-            android:layout_toLeftOf="@+id/percent"
+            android:layout_toStartOf="@+id/percent"
             android:ellipsize="marquee"
             android:textAppearance="?android:attr/textAppearanceMedium"/>
 
@@ -53,7 +53,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignBottom="@android:id/title"
             android:layout_gravity="bottom"
             android:textAppearance="?android:attr/textAppearanceSmall"
@@ -72,7 +72,7 @@
         <TextView android:id="@+android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignLeft="@id/appGauge"
+            android:layout_alignStart="@id/appGauge"
             android:layout_below="@id/appGauge"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:maxLines="2" />
diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml
index ad782f24e3d..6e8188cadd0 100644
--- a/res/layout/preference_progress_category.xml
+++ b/res/layout/preference_progress_category.xml
@@ -25,12 +25,12 @@
     <TextView
         style="?android:attr/listSeparatorTextViewStyle"
         android:background="@null"
-        android:paddingLeft="16dip"
+        android:paddingStart="16dip"
         android:id="@+android:id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_gravity="left|bottom"
+        android:layout_gravity="start|bottom"
     />
 
     <ProgressBar
@@ -39,8 +39,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
+        android:layout_marginStart="16dip"
+        android:layout_marginEnd="16dip"
         style="?android:attr/progressBarStyleSmallTitle"
         />
 
diff --git a/res/layout/preference_settings_checkbox_widget.xml b/res/layout/preference_settings_checkbox_widget.xml
index 960661f3a23..41cfaa55fd3 100644
--- a/res/layout/preference_settings_checkbox_widget.xml
+++ b/res/layout/preference_settings_checkbox_widget.xml
@@ -17,7 +17,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <!-- Settings button -->
     <ImageView
diff --git a/res/layout/preference_spellchecker.xml b/res/layout/preference_spellchecker.xml
index f64c26c6f08..3e73fa1d868 100644
--- a/res/layout/preference_spellchecker.xml
+++ b/res/layout/preference_spellchecker.xml
@@ -38,7 +38,7 @@
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="6dip"
+            android:layout_marginEnd="6dip"
             android:layout_marginTop="6dip"
             android:layout_marginBottom="6dip"
             android:layout_weight="1">
@@ -55,7 +55,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:visibility="gone"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textSize="13sp"
@@ -81,8 +81,8 @@
         <ImageView
             android:layout_width="40dip"
             android:layout_height="fill_parent"
-            android:paddingLeft="5dip"
-            android:paddingRight="5dip"
+            android:paddingStart="5dip"
+            android:paddingEnd="5dip"
             android:src="@drawable/ic_sysbar_quicksettings"
             android:layout_gravity="center"
             android:contentDescription="@string/spellchecker_quick_settings" />
@@ -98,10 +98,10 @@
         android:id="@+id/pref_right_button2"
         android:layout_width="40dip"
         android:layout_height="fill_parent"
-        android:paddingLeft="5dip"
-        android:paddingRight="5dip"
+        android:paddingStart="5dip"
+        android:paddingEnd="5dip"
         android:src="@drawable/ic_menu_3d_globe"
-        android:layout_gravity="right"
+        android:layout_gravity="end"
         android:clickable="true"
         android:focusable="true"
         android:background="?android:attr/selectableItemBackground"
diff --git a/res/layout/preference_tts_engine.xml b/res/layout/preference_tts_engine.xml
index 3cbdff425c2..a9d0043c423 100644
--- a/res/layout/preference_tts_engine.xml
+++ b/res/layout/preference_tts_engine.xml
@@ -33,8 +33,8 @@
             android:id="@+id/tts_engine_radiobutton"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dip"
-            android:layout_marginRight="4dip"
+            android:layout_marginStart="10dip"
+            android:layout_marginEnd="4dip"
             android:layout_gravity="center_vertical"
             android:orientation="vertical"
             android:clickable="true" />
@@ -42,8 +42,8 @@
             android:id="@+id/tts_engine_pref_text"
             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">
@@ -60,7 +60,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:visibility="gone"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textSize="13sp"
@@ -78,8 +78,8 @@
         android:id="@+id/tts_engine_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/tts_engine_settings_button"
         android:layout_gravity="center"
diff --git a/res/layout/preference_widget_shortcut.xml b/res/layout/preference_widget_shortcut.xml
index 4f146670e67..1a885a2eac8 100644
--- a/res/layout/preference_widget_shortcut.xml
+++ b/res/layout/preference_widget_shortcut.xml
@@ -18,7 +18,7 @@
     android:id="@+id/shortcut" 
     android:layout_width="40dip"
     android:layout_height="40dip"
-    android:layout_marginRight="4sp"
+    android:layout_marginEnd="4sp"
     android:layout_gravity="center_vertical"
     android:background="#555555"
     android:gravity="center"
diff --git a/res/layout/preference_widget_sync_toggle.xml b/res/layout/preference_widget_sync_toggle.xml
index 7cb2997ec98..115098bc606 100644
--- a/res/layout/preference_widget_sync_toggle.xml
+++ b/res/layout/preference_widget_sync_toggle.xml
@@ -19,14 +19,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="center_vertical|right"
-    android:gravity="center_vertical|right">
+    android:layout_gravity="center_vertical|end"
+    android:gravity="center_vertical|end">
 
     <ImageView
         android:id="@+id/sync_failed"
         android:src="@drawable/ic_sync_error_holo"
         android:layout_width="wrap_content"
-        android:layout_marginRight="8dip"
+        android:layout_marginEnd="8dip"
         android:layout_height="wrap_content"
         android:contentDescription="@string/sync_failed" />
 
@@ -35,7 +35,7 @@
         android:src="@drawable/ic_list_sync_anim"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="8dip"
+        android:layout_marginEnd="8dip"
         android:contentDescription="@string/sync_active" />
 
     <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/res/layout/profile_icon_small.xml b/res/layout/profile_icon_small.xml
index 9967f77d221..3fd4bfcff7c 100644
--- a/res/layout/profile_icon_small.xml
+++ b/res/layout/profile_icon_small.xml
@@ -18,7 +18,7 @@
         android:id="@+id/icon"
         android:layout_width="30dp"
         android:layout_height="30dp"
-        android:layout_marginRight="4dip"
+        android:layout_marginEnd="4dip"
         android:gravity="center"
         android:layout_gravity="center_vertical"
         android:contentDescription="@null" />
diff --git a/res/layout/proxy.xml b/res/layout/proxy.xml
index 5fc42e701c4..64098228a80 100644
--- a/res/layout/proxy.xml
+++ b/res/layout/proxy.xml
@@ -23,8 +23,8 @@
 
     <LinearLayout
         android:orientation="vertical"
-        android:paddingLeft="6dip"
-        android:paddingRight="6dip"
+        android:paddingStart="6dip"
+        android:paddingEnd="6dip"
         android:paddingBottom="3dip"
         android:layout_width="match_parent" android:layout_height="wrap_content"
         android:scrollbars="vertical" >
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index d9e5f4d5750..e040900ec35 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -233,7 +233,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/radio_info_smsc_refresh_label"
-                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
                     />
             <Button android:id="@+id/update_smsc"
                     android:textSize="14sp"
@@ -241,14 +241,14 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/radio_info_smsc_update_label"
-                    android:layout_toLeftOf="@+id/refresh_smsc"
+                    android:layout_toStartOf="@+id/refresh_smsc"
                     android:layout_alignBaseline="@+id/refresh_smsc"
                     />
             <EditText android:id="@+id/smsc"
                       style="@style/form_value"
                       android:layout_alignBaseline="@+id/refresh_smsc"
-                      android:layout_toLeftOf="@id/update_smsc"
-                      android:layout_toRightOf="@id/smsc_label" />
+                      android:layout_toStartOf="@id/update_smsc"
+                      android:layout_toEndOf="@id/smsc_label" />
         </RelativeLayout>
 
         <!-- Test setting to ignore bad DNS, useful in lab environments -->
diff --git a/res/layout/running_processes_item.xml b/res/layout/running_processes_item.xml
index f46527af223..7cc2d8df1fe 100644
--- a/res/layout/running_processes_item.xml
+++ b/res/layout/running_processes_item.xml
@@ -29,14 +29,14 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:orientation="horizontal"
-        android:paddingRight="6dip"
-        android:paddingLeft="6dip"
+        android:paddingEnd="6dip"
+        android:paddingStart="6dip"
         android:gravity="center_vertical" >
     
         <ImageView android:id="@+id/icon"
             android:layout_width="@android:dimen/app_icon_size"
             android:layout_height="@android:dimen/app_icon_size"
-            android:layout_marginRight="11dip"
+            android:layout_marginEnd="11dip"
             android:layout_gravity="center_vertical"
             android:scaleType="fitCenter"
             android:contentDescription="@null" />
@@ -54,14 +54,14 @@
                     android:layout_width="0px"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:paddingRight="4dip"
+                    android:paddingEnd="4dip"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:textStyle="bold"
                     android:singleLine="true"
                     android:ellipsize="marquee"
                     android:layout_marginBottom="2dip" />
                 <TextView android:id="@+id/size"
-                    android:layout_gravity="center_vertical|right"
+                    android:layout_gravity="center_vertical|end"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="0"
@@ -74,16 +74,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                 <TextView android:id="@+id/description"
-                    android:layout_gravity="center_vertical|left"
+                    android:layout_gravity="center_vertical|start"
                     android:layout_width="0px"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:paddingRight="4dip"
+                    android:paddingEnd="4dip"
                     android:singleLine="true"
                     android:ellipsize="marquee"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
                 <TextView android:id="@+id/uptime"
-                    android:layout_gravity="center_vertical|right"
+                    android:layout_gravity="center_vertical|end"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="0"
diff --git a/res/layout/running_processes_view.xml b/res/layout/running_processes_view.xml
index e23de16c4fb..b5fb8101e69 100644
--- a/res/layout/running_processes_view.xml
+++ b/res/layout/running_processes_view.xml
@@ -26,8 +26,8 @@
         <ListView android:id="@android:id/list"
                 android:layout_width="match_parent" 
                 android:layout_height="match_parent"
-                android:paddingLeft="@*android:dimen/preference_fragment_padding_side"
-                android:paddingRight="@*android:dimen/preference_fragment_padding_side"
+                android:paddingStart="@*android:dimen/preference_fragment_padding_side"
+                android:paddingEnd="@*android:dimen/preference_fragment_padding_side"
                 android:drawSelectorOnTop="false"
                 android:scrollbarStyle="outsideOverlay"
                 android:fastScrollEnabled="true" />
@@ -47,17 +47,17 @@
             android:clipChildren="false"
             android:clipToPadding="false"
             android:paddingTop="30dp"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp"
+            android:paddingStart="4dp"
+            android:paddingEnd="4dp"
             android:paddingBottom="1dp"
-            android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
-            android:layout_marginRight="@*android:dimen/preference_fragment_padding_side">
+            android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
+            android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side">
         <TextView android:id="@+id/foregroundText"
             android:layout_width="0px"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:focusable="true"
-            android:gravity="left|bottom"
+            android:gravity="start|bottom"
             android:textAppearance="?android:attr/textAppearanceSmallInverse"
             android:textColor="#000"
             android:singleLine="true" />
@@ -74,12 +74,12 @@
             android:singleLine="true"
             android:text="@string/memory" />
         <TextView android:id="@+id/backgroundText"
-            android:layout_gravity="center_vertical|right"
+            android:layout_gravity="center_vertical|end"
             android:layout_width="0px"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:focusable="true"
-            android:gravity="right|bottom"
+            android:gravity="end|bottom"
             android:textAppearance="?android:attr/textAppearanceSmallInverse"
             android:textColor="#000"
             android:singleLine="true" />
diff --git a/res/layout/running_service_details_process.xml b/res/layout/running_service_details_process.xml
index d12b4865493..caf5664c7a8 100644
--- a/res/layout/running_service_details_process.xml
+++ b/res/layout/running_service_details_process.xml
@@ -31,7 +31,7 @@
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        android:paddingLeft="14dip"
+        android:paddingStart="14dip"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
 </LinearLayout>
diff --git a/res/layout/running_service_details_service.xml b/res/layout/running_service_details_service.xml
index b9f9bbe3dbc..56cd971f5b7 100644
--- a/res/layout/running_service_details_service.xml
+++ b/res/layout/running_service_details_service.xml
@@ -38,7 +38,7 @@
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        android:paddingLeft="14dip"
+        android:paddingStart="14dip"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <include
diff --git a/res/layout/set_backup_pw.xml b/res/layout/set_backup_pw.xml
index 3743c812505..ce9a39880f8 100644
--- a/res/layout/set_backup_pw.xml
+++ b/res/layout/set_backup_pw.xml
@@ -75,7 +75,7 @@
     <Button
             android:id="@+id/backup_pw_set_button"
             android:layout_below="@id/confirm_new_backup_pw"
-            android:layout_toRightOf="@id/backup_pw_cancel_button"
+            android:layout_toEndOf="@id/backup_pw_cancel_button"
             android:text="@string/backup_pw_set_button_text"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content" />
diff --git a/res/layout/settings_storage_miscfiles.xml b/res/layout/settings_storage_miscfiles.xml
index 7c52efab5d8..0360cde7773 100644
--- a/res/layout/settings_storage_miscfiles.xml
+++ b/res/layout/settings_storage_miscfiles.xml
@@ -21,7 +21,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
-    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingEnd="?android:attr/scrollbarSize"
     android:background="?android:attr/selectableItemBackground"
     android:gravity="center_vertical"
     android:focusable="true">
@@ -29,26 +29,26 @@
     <CheckBox android:id="@+id/misc_checkbox"
               android:layout_width="wrap_content"
               android:layout_height="match_parent"
-              android:layout_alignParentLeft="true"
-              android:paddingLeft="16dip"
+              android:layout_alignParentStart="true"
+              android:paddingStart="16dip"
               android:scaleType="fitCenter"
               android:layout_centerVertical="true"/>
 
     <TextView android:id="@+id/misc_filename"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:layout_toRightOf="@id/misc_checkbox"
+              android:layout_toEndOf="@id/misc_checkbox"
               android:maxLines="1"
-              android:paddingLeft="16dip"
+              android:paddingStart="16dip"
               android:textAppearance="?android:attr/textAppearanceSmall"/>
 
     <TextView android:id="@+id/misc_filesize"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:layout_toRightOf="@id/misc_checkbox"
+              android:layout_toEndOf="@id/misc_checkbox"
               android:layout_below="@id/misc_filename"
               android:maxLines="1"
-              android:paddingLeft="16dip"
+              android:paddingStart="16dip"
               android:textStyle="bold"
               android:textAppearance="?android:attr/textAppearanceSmall" />
 </com.android.settings.deviceinfo.FileItemInfoLayout>
diff --git a/res/layout/settings_storage_miscfiles_list.xml b/res/layout/settings_storage_miscfiles_list.xml
index 5f8c5eda710..b712073a368 100644
--- a/res/layout/settings_storage_miscfiles_list.xml
+++ b/res/layout/settings_storage_miscfiles_list.xml
@@ -21,8 +21,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingRight="16dip"
-    android:paddingLeft="16dip">
+    android:paddingEnd="16dip"
+    android:paddingStart="16dip">
 
     <ListView android:id="@android:id/list"
               android:layout_width="match_parent"
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index 79d59b3db3e..30b33736c9d 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -49,8 +49,8 @@
                 android:id="@+id/more"
                 android:layout_width="@dimen/setup_button_size"
                 android:layout_height="@dimen/setup_button_size"
-                android:layout_marginLeft="8dip"
-                android:layout_marginRight="8dip"
+                android:layout_marginStart="8dip"
+                android:layout_marginEnd="8dip"
                 android:layout_marginBottom="8dip"
                 android:src="@*android:drawable/ic_menu_moreoverflow_holo_dark"
                 android:background="?android:attr/actionBarItemBackground"
@@ -107,7 +107,7 @@
             android:background="?android:attr/selectableItemBackground"
             android:gravity="center_vertical"
             android:minHeight="?android:attr/listPreferredItemHeight"
-            android:paddingRight="?android:attr/scrollbarSize" >
+            android:paddingEnd="?android:attr/scrollbarSize" >
 
             <ImageView
                 android:id="@+id/add_icon"
@@ -121,8 +121,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="6dip"
-                android:layout_marginLeft="15dip"
-                android:layout_marginRight="6dip"
+                android:layout_marginStart="15dip"
+                android:layout_marginEnd="6dip"
                 android:layout_marginTop="6dip"
                 android:layout_weight="1"
                 android:ellipsize="marquee"
@@ -144,14 +144,14 @@
                 android:id="@+id/back_button"
                 android:layout_width="150dip"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_margin="5dip"
                 android:text="@string/wifi_setup_back" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
                 android:orientation="horizontal" >
 
                 <Button
diff --git a/res/layout/trusted_credential.xml b/res/layout/trusted_credential.xml
index a2b84e25345..e559a6ef18b 100644
--- a/res/layout/trusted_credential.xml
+++ b/res/layout/trusted_credential.xml
@@ -18,7 +18,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingEnd="?android:attr/scrollbarSize"
     android:background="?android:attr/selectableItemBackground"
     android:padding="15dip"
     >
@@ -39,7 +39,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/trusted_credential_subject_primary"
-            android:layout_alignLeft="@id/trusted_credential_subject_primary"
+            android:layout_alignStart="@id/trusted_credential_subject_primary"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorSecondary"
         />
diff --git a/res/layout/trusted_credential_details.xml b/res/layout/trusted_credential_details.xml
index e220e1c21f7..c8c16f73bea 100644
--- a/res/layout/trusted_credential_details.xml
+++ b/res/layout/trusted_credential_details.xml
@@ -18,6 +18,6 @@
     android:id="@+id/cert_remove_button"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
-    android:layout_gravity="right"
+    android:layout_gravity="end"
     android:layout_margin="6dip"
     />
diff --git a/res/layout/twelve_key_entry.xml b/res/layout/twelve_key_entry.xml
index 81ead98f90d..e1d3172aabe 100644
--- a/res/layout/twelve_key_entry.xml
+++ b/res/layout/twelve_key_entry.xml
@@ -24,16 +24,16 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="64dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="2dip"
         android:orientation="horizontal">
 
         <Button android:id="@+id/one"
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -42,8 +42,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -52,8 +52,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -63,16 +63,16 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="64dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="2dip"
         android:orientation="horizontal">
 
         <Button android:id="@+id/four"
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -81,8 +81,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -91,8 +91,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -101,16 +101,16 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="64dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="2dip"
         android:orientation="horizontal">
 
         <Button android:id="@+id/seven"
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -119,8 +119,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -129,8 +129,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -140,16 +140,16 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="64dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="2dip"
         android:orientation="horizontal">
 
         <Button android:id="@+id/ok"
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textStyle="bold"
             android:text="@android:string/ok"
@@ -159,8 +159,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -169,8 +169,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textStyle="bold"
             android:text="@android:string/cancel"
diff --git a/res/layout/two_buttons_panel.xml b/res/layout/two_buttons_panel.xml
index 5d763121460..1a5975a2ab3 100755
--- a/res/layout/two_buttons_panel.xml
+++ b/res/layout/two_buttons_panel.xml
@@ -24,8 +24,8 @@
         android:layout_height="wrap_content"
         android:gravity="bottom"
         android:paddingTop="4dip"
-        android:paddingLeft="2dip"
-        android:paddingRight="2dip"
+        android:paddingStart="2dip"
+        android:paddingEnd="2dip"
         android:orientation="horizontal">
         <Button
             android:id="@+id/left_button"
diff --git a/res/layout/usage_stats.xml b/res/layout/usage_stats.xml
index 9ce338cb349..96e1bd1054f 100755
--- a/res/layout/usage_stats.xml
+++ b/res/layout/usage_stats.xml
@@ -24,11 +24,11 @@
             android:text="@string/app_name_label"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="wrap_content"
-            android:paddingRight="6dip"
+            android:paddingEnd="6dip"
             android:layout_height="wrap_content" />
         <TextView
             android:text="@string/launch_count_label"
-            android:paddingRight="6dip"
+            android:paddingEnd="6dip"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
diff --git a/res/layout/usage_stats_item.xml b/res/layout/usage_stats_item.xml
index bdadf85fae6..c231b589f78 100755
--- a/res/layout/usage_stats_item.xml
+++ b/res/layout/usage_stats_item.xml
@@ -27,24 +27,24 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:paddingRight="6dip"
-        android:paddingLeft="12dip"
+        android:paddingEnd="6dip"
+        android:paddingStart="12dip"
         android:maxLines="1" />
 
     <TextView android:id="@+id/launch_count"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:paddingRight="6dip"
-        android:paddingLeft="12dip"
+        android:paddingEnd="6dip"
+        android:paddingStart="12dip"
         android:maxLines="1" />
 
     <TextView android:id="@+id/usage_time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:paddingRight="6dip"
-        android:paddingLeft="12dip"
+        android:paddingEnd="6dip"
+        android:paddingStart="12dip"
         android:maxLines="1" />
 </LinearLayout>
 
diff --git a/res/layout/user_dictionary_add_word.xml b/res/layout/user_dictionary_add_word.xml
index 4089299987e..d8b869477ac 100644
--- a/res/layout/user_dictionary_add_word.xml
+++ b/res/layout/user_dictionary_add_word.xml
@@ -28,9 +28,9 @@
           android:ellipsize="end"
           android:layout_width="match_parent"
           android:layout_height="64dip"
-          android:layout_marginLeft="16dip"
-          android:layout_marginRight="16dip"
-          android:gravity="center_vertical|left"
+          android:layout_marginStart="16dip"
+          android:layout_marginEnd="16dip"
+          android:gravity="center_vertical|start"
           android:text="@string/user_dict_settings_add_dialog_title" />
     <View android:layout_width="match_parent"
           android:layout_height="2dip"
@@ -42,7 +42,7 @@
             android:layout_height="match_parent"
             android:layout_width="match_parent"
             android:layout_gravity="fill_horizontal|center_vertical"
-            android:layout_marginLeft="8dip"
+            android:layout_marginStart="8dip"
             android:layout_marginBottom="8dip"
             android:layout_marginTop="8dip"
             android:inputType="textNoSuggestions"
@@ -62,7 +62,7 @@
                   android:orientation="horizontal"
                   android:measureWithLargestChild="true">
       <Button android:layout_width="0dip"
-              android:layout_gravity="left"
+              android:layout_gravity="start"
               android:layout_weight="1"
               android:maxLines="2"
               style="?android:attr/buttonBarButtonStyle"
@@ -71,7 +71,7 @@
               android:layout_height="wrap_content"
               android:onClick="onClickCancel" />
       <Button android:layout_width="0dip"
-              android:layout_gravity="right"
+              android:layout_gravity="end"
               android:layout_weight="1"
               android:maxLines="2"
               style="?android:attr/buttonBarButtonStyle"
diff --git a/res/layout/user_dictionary_add_word_fullscreen.xml b/res/layout/user_dictionary_add_word_fullscreen.xml
index c0f3f533fce..f29c6696a39 100644
--- a/res/layout/user_dictionary_add_word_fullscreen.xml
+++ b/res/layout/user_dictionary_add_word_fullscreen.xml
@@ -30,7 +30,7 @@
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:layout_gravity="fill_horizontal|center_vertical"
-            android:layout_marginLeft="8dip"
+            android:layout_marginStart="8dip"
             android:layout_marginBottom="8dip"
             android:layout_marginTop="8dip"
             android:inputType="textNoSuggestions"
@@ -40,20 +40,20 @@
   <GridLayout android:id="@+id/user_dictionary_add_word_grid"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:layout_marginLeft="8dip"
-              android:layout_marginRight="8dip"
+              android:layout_marginStart="8dip"
+              android:layout_marginEnd="8dip"
               android:columnCount="2">
     <TextView android:id="@+id/user_dictionary_add_shortcut_label"
               style="?android:attr/textAppearanceSmall"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:layout_gravity="left|center_vertical"
+              android:layout_gravity="start|center_vertical"
               android:text="@string/user_dict_settings_add_shortcut_option_name" />
     <EditText android:id="@+id/user_dictionary_add_shortcut"
               android:maxLength="@integer/maximum_user_dictionary_word_length"
               android:layout_width="wrap_content"
               android:layout_gravity="fill_horizontal|center_vertical"
-              android:layout_marginLeft="8dip"
+              android:layout_marginStart="8dip"
               android:layout_marginBottom="8dip"
               android:layout_marginTop="8dip"
               android:inputType="textNoSuggestions"
@@ -62,10 +62,10 @@
               style="?android:attr/textAppearanceSmall"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:layout_gravity="left|center_vertical"
+              android:layout_gravity="start|center_vertical"
               android:text="@string/user_dict_settings_add_locale_option_name" />
     <Spinner  android:id="@+id/user_dictionary_add_locale"
-              android:layout_marginLeft="8dip"
+              android:layout_marginStart="8dip"
               android:layout_marginBottom="8dip"
               android:layout_marginTop="8dip"
               android:layout_width="wrap_content"
diff --git a/res/layout/user_dictionary_item.xml b/res/layout/user_dictionary_item.xml
index 749986e4c12..82d8629dc0c 100644
--- a/res/layout/user_dictionary_item.xml
+++ b/res/layout/user_dictionary_item.xml
@@ -19,13 +19,13 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingEnd="?android:attr/scrollbarSize"
     android:background="?android:attr/selectableItemBackground" >
 
   <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">
@@ -42,7 +42,7 @@
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_below="@android:id/text1"
-              android:layout_alignLeft="@android:id/text1"
+              android:layout_alignStart="@android:id/text1"
               android:textAppearance="?android:attr/textAppearanceSmall"
               android:textColor="?android:attr/textColorSecondary"
               android:maxLines="1" />
diff --git a/res/layout/wifi_config_ui_for_setup_wizard.xml b/res/layout/wifi_config_ui_for_setup_wizard.xml
index 1b10f9015fc..fef10b3f566 100644
--- a/res/layout/wifi_config_ui_for_setup_wizard.xml
+++ b/res/layout/wifi_config_ui_for_setup_wizard.xml
@@ -68,19 +68,19 @@
                 android:minWidth="128dip"
                 android:layout_height="wrap_content"
                 android:minHeight="56dip"
-                android:paddingRight="16dip"
-                android:layout_alignParentLeft="true"
+                android:paddingEnd="16dip"
+                android:layout_alignParentStart="true"
                 android:text="@string/wifi_ssid"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textSize="20sp"
-                android:gravity="left|center_vertical" />
+                android:gravity="start|center_vertical" />
 
             <FrameLayout
                 android:id="@+id/ssid_layout"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignBottom="@id/ssid_text"
-                android:layout_toRightOf="@id/ssid_text">
+                android:layout_toEndOf="@id/ssid_text">
                 <EditText
                     android:id="@+id/ssid"
                     android:layout_width="368dip"
@@ -105,7 +105,7 @@
                 android:text="@string/wifi_password"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textSize="20sp"
-                android:gravity="left|center_vertical" />
+                android:gravity="start|center_vertical" />
 
             <LinearLayout
                 android:id="@+id/password_layout"
@@ -162,7 +162,7 @@
                     android:layout_width="368dip"
                     android:layout_height="wrap_content"
                     android:minHeight="56dip"
-                    android:paddingLeft="4dip"/>
+                    android:paddingStart="4dip"/>
             </FrameLayout>
         </TableRow>
     </TableLayout>
diff --git a/res/layout/wifi_setup_custom_list_item_1.xml b/res/layout/wifi_setup_custom_list_item_1.xml
index 9d329ea6264..3ef7e258faf 100644
--- a/res/layout/wifi_setup_custom_list_item_1.xml
+++ b/res/layout/wifi_setup_custom_list_item_1.xml
@@ -22,6 +22,6 @@
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:textSize="20sp"
     android:gravity="center_vertical"
-    android:paddingLeft="16dip"
+    android:paddingStart="16dip"
     android:minHeight="48dip"
 />
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 2b01d7feaf2..f780f53c2b9 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -24,8 +24,8 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">8dip</item>
-        <item name="android:layout_marginLeft">16dip</item>
-        <item name="android:layout_marginRight">16dip</item>
+        <item name="android:layout_marginStart">16dip</item>
+        <item name="android:layout_marginEnd">16dip</item>
         <item name="android:orientation">horizontal</item>
         <item name="android:gravity">center_vertical</item>
     </style>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 42f2837687d..502d76df92c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -20,7 +20,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:textAppearance">@style/TextAppearance.info_label</item>
-        <item name="android:paddingRight">4dip</item>
+        <item name="android:paddingEnd">4dip</item>
     </style>
 
     <style name="info_value">
@@ -37,9 +37,9 @@
 
     <style name="info_layout">
         <item name="android:orientation">vertical</item>
-        <item name="android:paddingLeft">10dip</item>
+        <item name="android:paddingStart">10dip</item>
         <item name="android:paddingTop">10dip</item>
-        <item name="android:paddingRight">10dip</item>
+        <item name="android:paddingEnd">10dip</item>
         <item name="android:paddingBottom">10dip</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
@@ -110,10 +110,10 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">8dip</item>
-        <item name="android:layout_marginLeft">16dip</item>
-        <item name="android:layout_marginRight">16dip</item>
+        <item name="android:layout_marginStart">16dip</item>
+        <item name="android:layout_marginEnd">16dip</item>
         <item name="android:orientation">vertical</item>
-        <item name="android:gravity">left</item>
+        <item name="android:gravity">start</item>
     </style>
 
     <style name="wifi_item_label">
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index 6167f78a83d..666542c6c71 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -575,7 +575,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
         activity.getActionBar().setCustomView(toggleSwitch,
                 new ActionBar.LayoutParams(ActionBar.LayoutParams.WRAP_CONTENT,
                         ActionBar.LayoutParams.WRAP_CONTENT,
-                        Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+                        Gravity.CENTER_VERTICAL | Gravity.END));
         return toggleSwitch;
     }
 
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index f5789aedaa4..18f7c7243d7 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -260,7 +260,7 @@ public class DevelopmentSettings extends PreferenceFragment
         activity.getActionBar().setCustomView(mEnabledSwitch, new ActionBar.LayoutParams(
                 ActionBar.LayoutParams.WRAP_CONTENT,
                 ActionBar.LayoutParams.WRAP_CONTENT,
-                Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+                Gravity.CENTER_VERTICAL | Gravity.END));
     }
 
     @Override
diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
index d9953aafcfb..1b1854aa098 100644
--- a/src/com/android/settings/DreamSettings.java
+++ b/src/com/android/settings/DreamSettings.java
@@ -80,7 +80,7 @@ public class DreamSettings extends SettingsPreferenceFragment {
             activity.getActionBar().setCustomView(mEnableSwitch, new ActionBar.LayoutParams(
                     ActionBar.LayoutParams.WRAP_CONTENT,
                     ActionBar.LayoutParams.WRAP_CONTENT,
-                    Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+                    Gravity.CENTER_VERTICAL | Gravity.END));
             activity.getActionBar().setTitle(R.string.screensaver_settings_title);
         }
 
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index d30e4284043..f44efc4c63a 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -125,7 +125,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment {
                 activity.getActionBar().setCustomView(actionBarSwitch, new ActionBar.LayoutParams(
                         ActionBar.LayoutParams.WRAP_CONTENT,
                         ActionBar.LayoutParams.WRAP_CONTENT,
-                        Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+                        Gravity.CENTER_VERTICAL | Gravity.END));
             }
         }
 
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
index a6bd037c38c..bf02c131530 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -58,7 +58,7 @@ public class AndroidBeam extends Fragment
                 activity.getActionBar().setCustomView(mActionBarSwitch, new ActionBar.LayoutParams(
                         ActionBar.LayoutParams.WRAP_CONTENT,
                         ActionBar.LayoutParams.WRAP_CONTENT,
-                        Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+                        Gravity.CENTER_VERTICAL | Gravity.END));
                 activity.getActionBar().setTitle(R.string.android_beam_settings_title);
             }
         }
diff --git a/src/com/android/settings/widget/ChartView.java b/src/com/android/settings/widget/ChartView.java
index f410d573c82..64416128d19 100644
--- a/src/com/android/settings/widget/ChartView.java
+++ b/src/com/android/settings/widget/ChartView.java
@@ -38,7 +38,7 @@ import com.android.settings.R;
 public class ChartView extends FrameLayout {
     // TODO: extend something that supports two-dimensional scrolling
 
-    private static final int SWEEP_GRAVITY = Gravity.TOP | Gravity.LEFT;
+    private static final int SWEEP_GRAVITY = Gravity.TOP | Gravity.START;
 
     ChartAxis mHoriz;
     ChartAxis mVert;
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index de42f2a4847..c180641def6 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -344,7 +344,7 @@ public class WifiSettings extends SettingsPreferenceFragment
                     activity.getActionBar().setCustomView(actionBarSwitch, new ActionBar.LayoutParams(
                             ActionBar.LayoutParams.WRAP_CONTENT,
                             ActionBar.LayoutParams.WRAP_CONTENT,
-                            Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+                            Gravity.CENTER_VERTICAL | Gravity.END));
                 }
             }