M42 snap browser

Change-Id: If52741ad5e34241aa9f928244942a33a91610e58
diff --git a/res/layout/add_new_bookmark.xml b/res/layout/add_new_bookmark.xml
index 28c9c60..cd6d22c 100644
--- a/res/layout/add_new_bookmark.xml
+++ b/res/layout/add_new_bookmark.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,13 +14,13 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
-        android:layout_width="match_parent" 
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
         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"
@@ -28,8 +28,8 @@
     <ImageView android:id="@+id/favicon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dip"
-            android:layout_marginRight="11dip"
+            android:layout_marginStart="5dip"
+            android:layout_marginEnd="11dip"
             android:focusable="false"
             android:src="@drawable/ic_action_bookmark_checked"
             android:scaleType="fitCenter"
@@ -39,18 +39,18 @@
             android:layout_height="wrap_content"
             android:orientation="vertical"
             >
-        <TextView android:id="@+id/title" 
+        <TextView android:id="@+id/title"
                 android:text="@string/add_new_bookmark"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textStyle="bold" 
-                android:layout_width="wrap_content" 
+                android:textStyle="bold"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="2dip"
                 />
-        <TextView android:id="@+id/url" 
+        <TextView android:id="@+id/url"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:maxLines="1"
-                android:layout_width="wrap_content" 
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
                 android:ellipsize="end"
diff --git a/res/layout/app_row.xml b/res/layout/app_row.xml
index 8ec5ec7..4a534e6 100644
--- a/res/layout/app_row.xml
+++ b/res/layout/app_row.xml
@@ -38,7 +38,7 @@
   android:padding="4.0dip"
   android:layout_width="48.0dip"
   android:layout_height="48.0dip"
-  android:layout_marginLeft="12.0dip"
+  android:layout_marginStart="12.0dip"
   android:scaleType="fitCenter"
 />
 <TextView
@@ -47,7 +47,7 @@
   android:gravity="start|center"
   android:layout_width="match_parent"
   android:layout_height="48.0dip"
-  android:layout_marginLeft="12.0dip"
+  android:layout_marginStart="12.0dip"
   android:maxLines="2"
 />
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/bookmark_group_view.xml b/res/layout/bookmark_group_view.xml
index cf4498e..e5bc767 100644
--- a/res/layout/bookmark_group_view.xml
+++ b/res/layout/bookmark_group_view.xml
@@ -17,7 +17,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeightSmall"
+    android:layout_height="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
     android:background="?android:attr/listChoiceBackgroundIndicator">
 
@@ -25,13 +25,13 @@
         android:id="@+id/group_name"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:paddingLeft="50dp"
+        android:paddingStart="50dp"
         android:textAppearance="@style/BookmarkText"
         android:gravity="center_vertical" />
 
     <FrameLayout
         android:id="@+id/crumb_holder"
-        android:paddingLeft="16dp"
+        android:paddingStart="16dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
diff --git a/res/layout/bookmark_list.xml b/res/layout/bookmark_list.xml
index 4425a26..b4ff2d3 100644
--- a/res/layout/bookmark_list.xml
+++ b/res/layout/bookmark_list.xml
@@ -20,7 +20,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:minHeight="@dimen/widgetItemMinHeight"
-    android:paddingLeft="16dip"
+    android:paddingStart="16dip"
     android:background="@drawable/bookmark_thumb_selector">
     <ImageView
         android:id="@+id/favicon"
@@ -34,9 +34,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_toRightOf="@id/favicon"
+        android:layout_toEndOf="@id/favicon"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:paddingLeft="16dip"
+        android:paddingStart="16dip"
         android:maxLines="1"
         android:scrollHorizontally="true"
         android:ellipsize="marquee"/>
diff --git a/res/layout/bookmark_sync_wizard_item.xml b/res/layout/bookmark_sync_wizard_item.xml
index 91ec3de..a9a7a2d 100644
--- a/res/layout/bookmark_sync_wizard_item.xml
+++ b/res/layout/bookmark_sync_wizard_item.xml
@@ -21,6 +21,6 @@
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:gravity="center_vertical"
     android:checkMark="?android:attr/listChoiceIndicatorSingle"
-    android:paddingLeft="6dip"
-    android:paddingRight="6dip"
+    android:paddingStart="6dip"
+    android:paddingEnd="6dip"
 />
diff --git a/res/layout/bookmark_thumbnail.xml b/res/layout/bookmark_thumbnail.xml
index 64a0c9e..8b05b3b 100644
--- a/res/layout/bookmark_thumbnail.xml
+++ b/res/layout/bookmark_thumbnail.xml
@@ -18,8 +18,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:paddingLeft="@dimen/combo_horizontalSpacing"
-    android:paddingRight="@dimen/combo_horizontalSpacing"
+    android:paddingStart="@dimen/combo_horizontalSpacing"
+    android:paddingEnd="@dimen/combo_horizontalSpacing"
     android:layout_margin="@dimen/combo_bookmark_thumbnail_margin"
     android:background="@drawable/bookmark_thumb_selector"
     android:orientation="vertical"
@@ -39,8 +39,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
-        android:paddingLeft="8dip"
-        android:paddingRight="4dip"
+        android:paddingStart="8dip"
+        android:paddingEnd="4dip"
         android:paddingTop="2dip"
         android:paddingBottom="2dip"
         android:singleLine="true"
diff --git a/res/layout/bookmarks_drag_actionmode.xml b/res/layout/bookmarks_drag_actionmode.xml
index df64fb9..42cc8de 100644
--- a/res/layout/bookmarks_drag_actionmode.xml
+++ b/res/layout/bookmarks_drag_actionmode.xml
@@ -22,27 +22,27 @@
     android:divider="?android:attr/dividerVertical"
     android:dividerPadding="12dp"
     android:showDividers="middle"
-    android:gravity="right"
+    android:gravity="end"
     android:minHeight="?android:attr/actionBarSize">
     <ImageView
         android:id="@+id/open_context_menu_id"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:paddingLeft="16dip"
-        android:paddingRight="16dip"
+        android:paddingStart="16dip"
+        android:paddingEnd="16dip"
         android:src="@drawable/ic_deco_favicon_normal" />
     <ImageView
         android:id="@+id/new_window_context_menu_id"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:paddingLeft="16dip"
-        android:paddingRight="16dip"
+        android:paddingStart="16dip"
+        android:paddingEnd="16dip"
         android:src="@drawable/ic_action_add_tab" />
     <ImageView
         android:id="@+id/info"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:paddingLeft="16dip"
-        android:paddingRight="16dip"
+        android:paddingStart="16dip"
+        android:paddingEnd="16dip"
         android:src="@drawable/ic_deco_info_normal" />
 </LinearLayout>
diff --git a/res/layout/bookmarkthumbnailwidget.xml b/res/layout/bookmarkthumbnailwidget.xml
index 0bff98e..e9e377d 100644
--- a/res/layout/bookmarkthumbnailwidget.xml
+++ b/res/layout/bookmarkthumbnailwidget.xml
@@ -35,8 +35,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="4dip"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="4dip"
         android:layout_marginBottom="4dip"
         android:src="@mipmap/ic_launcher_browser"
         android:background="@drawable/bookmark_widget_thumb_selector"
diff --git a/res/layout/bookmarkthumbnailwidget_item.xml b/res/layout/bookmarkthumbnailwidget_item.xml
index 99df109..cc30557 100644
--- a/res/layout/bookmarkthumbnailwidget_item.xml
+++ b/res/layout/bookmarkthumbnailwidget_item.xml
@@ -32,8 +32,8 @@
         android:layout_height="wrap_content"
         android:layout_alignBottom="@id/thumb"
         android:background="@drawable/overlay_url_bookmark_widget_holo"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="2dip"
         android:layout_marginBottom="2dip">
         <ImageView
             android:id="@+id/favicon"
@@ -41,8 +41,8 @@
             android:layout_width="@dimen/favicon_size"
             android:layout_height="@dimen/favicon_size"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="4dip"
-            android:layout_marginRight="8dip"
+            android:layout_marginStart="4dip"
+            android:layout_marginEnd="8dip"
             android:layout_marginTop="4dip"
             android:layout_marginBottom="4dip"
             android:scaleType="centerInside" />
diff --git a/res/layout/bookmarkthumbnailwidget_item_folder.xml b/res/layout/bookmarkthumbnailwidget_item_folder.xml
index 8722da6..300890a 100644
--- a/res/layout/bookmarkthumbnailwidget_item_folder.xml
+++ b/res/layout/bookmarkthumbnailwidget_item_folder.xml
@@ -32,8 +32,8 @@
         android:layout_height="wrap_content"
         android:layout_alignBottom="@id/thumb"
         android:background="@drawable/overlay_url_bookmark_widget_holo"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="2dip"
         android:layout_marginBottom="2dip">
         <ImageView
             android:id="@+id/favicon"
@@ -41,8 +41,8 @@
             android:layout_width="@dimen/favicon_size"
             android:layout_height="@dimen/favicon_size"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="4dip"
-            android:layout_marginRight="8dip"
+            android:layout_marginStart="4dip"
+            android:layout_marginEnd="8dip"
             android:layout_marginTop="4dip"
             android:layout_marginBottom="4dip"
             android:scaleType="centerInside" />
diff --git a/res/layout/browser_add_bookmark_content.xml b/res/layout/browser_add_bookmark_content.xml
index 8dfe1b4..cfaa81a 100644
--- a/res/layout/browser_add_bookmark_content.xml
+++ b/res/layout/browser_add_bookmark_content.xml
@@ -19,8 +19,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        android:paddingLeft="5dip"
-        android:paddingRight="5dip"
+        android:paddingStart="5dip"
+        android:paddingEnd="5dip"
         android:orientation="horizontal"
         android:minHeight="?android:attr/listPreferredItemHeightSmall"
         >
@@ -44,14 +44,14 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:gravity="center_vertical"
             android:layout_gravity="center_vertical"
-            android:paddingRight="8dip" />
+            android:paddingEnd="8dip" />
     </LinearLayout>
     <LinearLayout android:id="@+id/title_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingLeft="5dip"
-        android:paddingRight="5dip"
+        android:paddingStart="5dip"
+        android:paddingEnd="5dip"
         android:minHeight="?android:attr/listPreferredItemHeightSmall"
         >
         <TextView android:id="@+id/fake_title"
@@ -60,7 +60,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
-            android:drawableLeft="@drawable/ic_action_bookmark_checked"
+            android:drawableStart="@drawable/ic_action_bookmark_checked"
             android:text="@string/bookmark_this_page"
             android:textAppearance="?android:attr/textAppearanceMedium" />
         <View android:id="@+id/remove_divider"
@@ -75,7 +75,7 @@
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
             android:text="@string/remove"
-            android:drawableLeft="@drawable/ic_action_trash_normal"
+            android:drawableStart="@drawable/ic_action_trash_normal"
             android:visibility="gone"
             android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>
@@ -93,8 +93,8 @@
                 android:stretchColumns="1"
                 android:shrinkColumns="1"
                 android:paddingTop="10dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" >
+                android:paddingStart="20dip"
+                android:paddingEnd="20dip" >
               <TableRow android:layout_marginBottom="10dip">
                 <TextView
                     android:id="@+id/titleText"
@@ -108,7 +108,7 @@
                     android:id="@+id/title"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:layout_marginLeft="20dip"
+                    android:layout_marginStart="20dip"
                     android:inputType="textCapSentences|textNoSuggestions"
                     android:ellipsize="end"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -129,7 +129,7 @@
                     android:id="@+id/address"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:layout_marginLeft="20dip"
+                    android:layout_marginStart="20dip"
                     android:hint="@string/http"
                     android:inputType="textUri"
                     android:ellipsize="end"
@@ -147,7 +147,7 @@
                     android:id="@+id/accounts"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:layout_marginLeft="20dip"
+                    android:layout_marginStart="20dip"
                     android:spinnerMode="dropdown"
                     />
               </TableRow>
@@ -163,7 +163,7 @@
                     android:id="@+id/folder"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
-                    android:layout_marginLeft="20dip"
+                    android:layout_marginStart="20dip"
                     android:spinnerMode="dropdown"
                     />
               </TableRow>
@@ -179,8 +179,8 @@
 
             <view class="com.android.browser.AddBookmarkPage$CustomListView"
                 android:id="@+id/list"
-                android:layout_marginLeft="16dip"
-                android:layout_marginRight="16dip"
+                android:layout_marginStart="16dip"
+                android:layout_marginEnd="16dip"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 />
@@ -189,7 +189,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
-                android:layout_marginLeft="16dip"
+                android:layout_marginStart="16dip"
                 android:layout_marginTop="16dip"
                 android:text="@string/no_subfolders"
                 android:textStyle="italic"
@@ -206,7 +206,7 @@
         <Button android:id="@+id/cancel"
             android:text="@string/do_not_save"
             android:layout_width="0dip"
-            android:layout_gravity="right"
+            android:layout_gravity="end"
             android:layout_weight="1"
             android:maxLines="2"
             android:layout_height="wrap_content"
@@ -214,7 +214,7 @@
         <Button android:id="@+id/OK"
             android:text="@string/save"
             android:layout_width="0dip"
-            android:layout_gravity="left"
+            android:layout_gravity="start"
             android:layout_weight="1"
             android:maxLines="2"
             android:layout_height="wrap_content"
diff --git a/res/layout/browser_subwindow.xml b/res/layout/browser_subwindow.xml
index 0e8051a..f117b05 100644
--- a/res/layout/browser_subwindow.xml
+++ b/res/layout/browser_subwindow.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,8 +24,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/NavigationBarBackground"
-        android:layout_gravity="right"
-        android:gravity="right" >
+        android:layout_gravity="end"
+        android:gravity="end" >
         <ImageButton
             android:id="@+id/subwindow_close"
             style="@style/NavButton"
diff --git a/res/layout/browser_tab_crash.xml b/res/layout/browser_tab_crash.xml
index d5ad343..846f7bf 100644
--- a/res/layout/browser_tab_crash.xml
+++ b/res/layout/browser_tab_crash.xml
@@ -54,8 +54,8 @@
     <TextView android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp"
         android:paddingTop="20dp"
         android:textSize="15dp"
         android:textColor="@android:color/black"
diff --git a/res/layout/download_settings.xml b/res/layout/download_settings.xml
index 47d8081..2797239 100644
--- a/res/layout/download_settings.xml
+++ b/res/layout/download_settings.xml
@@ -37,8 +37,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingLeft="5dip"
-        android:paddingRight="5dip"
+        android:paddingStart="5dip"
+        android:paddingEnd="5dip"
         android:minHeight="?android:attr/listPreferredItemHeightSmall"
         >
         <TextView android:id="@+id/download_settings_title"
@@ -65,8 +65,8 @@
                 android:id="@+id/download_table_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip"
+                android:paddingStart="20dip"
+                android:paddingEnd="20dip"
                 android:paddingTop="10dip"
                 android:shrinkColumns="1"
                 android:stretchColumns="1" >
@@ -140,7 +140,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:text="@string/download_filesize"
-                        android:paddingLeft="10dip"
+                        android:paddingStart="10dip"
                         android:textAppearance="?android:attr/textAppearanceMedium"
                         android:textSize="18sp" >
                     </TextView>
@@ -162,7 +162,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:paddingLeft="10dip"
+                        android:paddingStart="10dip"
                         android:text="@string/download_timeneeded"
                         android:textAppearance="?android:attr/textAppearanceMedium"
                         android:textSize="18sp" >
@@ -183,7 +183,7 @@
             style="?android:attr/buttonBarButtonStyle"
             android:layout_width="0dip"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
+            android:layout_gravity="end"
             android:layout_weight="1"
             android:maxLines="1"
             android:text="@string/download_cancel" />
@@ -193,7 +193,7 @@
             style="?android:attr/buttonBarButtonStyle"
             android:layout_width="0dip"
             android:layout_height="wrap_content"
-            android:layout_gravity="left"
+            android:layout_gravity="start"
             android:layout_weight="1"
             android:maxLines="1"
             android:text="@string/download_start" />
diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 54de3cf..23fbc21 100644
--- a/res/layout/folder_list_item.xml
+++ b/res/layout/folder_list_item.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,6 +32,6 @@
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:gravity="center_vertical"
-        android:paddingLeft="6dip"
+        android:paddingStart="6dip"
         android:minHeight="?android:attr/listPreferredItemHeight" />
 </LinearLayout>
diff --git a/res/layout/geolocation_permissions_prompt.xml b/res/layout/geolocation_permissions_prompt.xml
index b42b3f9..9a345d6 100755
--- a/res/layout/geolocation_permissions_prompt.xml
+++ b/res/layout/geolocation_permissions_prompt.xml
@@ -34,8 +34,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="4dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:paddingTop="16dp"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -43,8 +43,8 @@
         android:id="@+id/remember"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         android:text="@string/geolocation_permissions_prompt_remember"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -61,8 +61,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:paddingLeft="2dip"
-            android:paddingRight="2dip"
+            android:paddingStart="2dip"
+            android:paddingEnd="2dip"
             android:measureWithLargestChild="true"
             android:background="@null">
             <Button
diff --git a/res/layout/history_header.xml b/res/layout/history_header.xml
index f77a697..b1d17bd 100644
--- a/res/layout/history_header.xml
+++ b/res/layout/history_header.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,12 +14,12 @@
      limitations under the License.
 -->
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" 
-        android:layout_width="match_parent" 
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeight"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:paddingLeft="35dip"
+        android:paddingStart="35dip"
         android:gravity="center_vertical"
         android:background="?android:attr/activatedBackgroundIndicator"
         />
diff --git a/res/layout/history_item.xml b/res/layout/history_item.xml
index 031958f..cd236d5 100644
--- a/res/layout/history_item.xml
+++ b/res/layout/history_item.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@
         android:layout_width="32dip"
         android:layout_height="32dip"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="12dip"
+        android:layout_marginStart="12dip"
         android:background="@drawable/bookmark_list_favicon_bg"
         android:scaleType="fitXY"
         android:src="@drawable/ic_deco_favicon_normal" />
@@ -36,8 +36,8 @@
         android:layout_gravity="center_vertical"
         android:layout_weight="1"
         android:orientation="vertical"
-        android:paddingLeft="8dip"
-        android:paddingRight="8dip">
+        android:paddingStart="8dip"
+        android:paddingEnd="8dip">
 
         <TextView
             android:id="@+id/title"
@@ -66,7 +66,7 @@
         android:button="@drawable/ic_action_bookmark"
         android:focusable="false"
         android:paddingBottom="16dip"
-        android:paddingLeft="8dip"
-        android:paddingRight="8dip"
+        android:paddingStart="8dip"
+        android:paddingEnd="8dip"
         android:paddingTop="16dip" />
 </LinearLayout>
diff --git a/res/layout/http_authentication.xml b/res/layout/http_authentication.xml
index 856c45c..6be2f6f 100644
--- a/res/layout/http_authentication.xml
+++ b/res/layout/http_authentication.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,22 +20,22 @@
     android:orientation="vertical"
     >
 
-    <TextView 
+    <TextView
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:text="@string/username"
         android:layout_marginTop="12dip"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip" />
-            
+        android:layout_marginStart="20dip"
+        android:layout_marginEnd="20dip" />
+
     <EditText
         android:id="@+id/username_edit"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:scrollHorizontally="true"
         android:inputType="text"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip"
+        android:layout_marginStart="20dip"
+        android:layout_marginEnd="20dip"
         android:layout_marginBottom="12dip"
         android:singleLine="true"
         android:imeOptions="actionNext" />
@@ -44,17 +44,17 @@
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:text="@string/password"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip" />
-            
+        android:layout_marginStart="20dip"
+        android:layout_marginEnd="20dip" />
+
     <EditText
         android:id="@+id/password_edit"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:scrollHorizontally="true"
         android:inputType="textPassword"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip"
+        android:layout_marginStart="20dip"
+        android:layout_marginEnd="20dip"
         android:layout_marginBottom="12dip"
         android:singleLine="true"
         android:imeOptions="actionDone" />
diff --git a/res/layout/menu_item.xml b/res/layout/menu_item.xml
index ebd39ef..cdee2fd 100644
--- a/res/layout/menu_item.xml
+++ b/res/layout/menu_item.xml
@@ -9,9 +9,7 @@
     android:layout_width="match_parent"
     android:layout_height="?android:attr/listPreferredItemHeightSmall"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingRight="?android:attr/listPreferredItemPaddingEnd"
     android:background="?android:attr/listChoiceBackgroundIndicator">
     <TextView
         android:id="@+id/menu_item_text"
diff --git a/res/layout/my_navigation_add_page.xml b/res/layout/my_navigation_add_page.xml
index 493a916..43d3e5f 100755
--- a/res/layout/my_navigation_add_page.xml
+++ b/res/layout/my_navigation_add_page.xml
@@ -37,8 +37,8 @@
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeightSmall"
         android:orientation="horizontal"
-        android:paddingLeft="5dip"
-        android:paddingRight="5dip" >
+        android:paddingStart="5dip"
+        android:paddingEnd="5dip" >
 
         <TextView
             android:id="@+id/dialog_title"
@@ -61,8 +61,8 @@
             android:id="@+id/default_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="10dip"
-            android:paddingRight="10dip"
+            android:paddingStart="10dip"
+            android:paddingEnd="10dip"
             android:paddingTop="10dip"
             android:shrinkColumns="1"
             android:stretchColumns="1" >
@@ -73,7 +73,7 @@
                     android:id="@+id/titleText"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="left"
+                    android:gravity="start"
                     android:paddingTop="10dip"
                     android:text="@string/my_navigation_name"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -82,7 +82,7 @@
                     android:id="@+id/title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dip"
+                    android:layout_marginStart="10dip"
                     android:inputType="textCapSentences"
                     android:selectAllOnFocus="true"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -96,7 +96,7 @@
                     android:id="@+id/addressText"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="left"
+                    android:gravity="start"
                     android:text="@string/my_navigation_address"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -104,7 +104,7 @@
                     android:id="@+id/address"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dip"
+                    android:layout_marginStart="10dip"
                     android:hint="@string/http"
                     android:inputType="textUri"
                     android:selectAllOnFocus="true"
@@ -135,7 +135,7 @@
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"
-                android:layout_gravity="right"
+                android:layout_gravity="end"
                 android:layout_weight="1"
                 android:maxLines="2"
                 android:text="@string/do_not_save" />
@@ -145,7 +145,7 @@
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"
-                android:layout_gravity="left"
+                android:layout_gravity="start"
                 android:layout_weight="1"
                 android:maxLines="2"
                 android:text="@string/save" />
diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml
index a126732..c2f8f1a 100644
--- a/res/layout/nav_tab_view.xml
+++ b/res/layout/nav_tab_view.xml
@@ -28,7 +28,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/nav_tab_titleheight"
         android:layout_gravity="center_horizontal"
-        android:paddingLeft="8dip" >
+        android:paddingStart="8dip" >
         <TextView
             android:id="@+id/title"
             android:layout_width="0dip"
@@ -48,7 +48,7 @@
             android:layout_width="wrap_content"
             android:layout_gravity="center_vertical"
             android:contentDescription="@string/accessibility_button_closetab"
-            android:paddingRight="16dip"
+            android:paddingEnd="16dip"
             android:src="@drawable/ic_action_close" />
     </LinearLayout>
 
@@ -57,7 +57,7 @@
         android:id="@+id/tab_view"
         android:layout_width="@dimen/nav_tab_width"
         android:layout_height="@dimen/nav_tab_height"
-        android:paddingLeft="2dip"
-        android:paddingRight="2dip"
+        android:paddingStart="2dip"
+        android:paddingEnd="2dip"
         android:focusable="false" />
 </LinearLayout>
diff --git a/res/layout/new_folder_layout.xml b/res/layout/new_folder_layout.xml
index bd34087..3ffa791 100644
--- a/res/layout/new_folder_layout.xml
+++ b/res/layout/new_folder_layout.xml
@@ -43,7 +43,7 @@
         android:inputType="textCapSentences|textNoSuggestions"
         android:background="@null"
         android:gravity="center_vertical"
-        android:paddingLeft="6dip"
+        android:paddingStart="6dip"
         />
     <ImageView
         android:id="@+id/close"
diff --git a/res/layout/page_info.xml b/res/layout/page_info.xml
index 7feb24e..e3b117c 100644
--- a/res/layout/page_info.xml
+++ b/res/layout/page_info.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,45 +24,45 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical" >
-    
+
         <!-- Title: -->
         <TextView
             android:id="@+id/title"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:textStyle="bold"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:layout_marginTop="12dip"
             android:layout_marginBottom="12dip" />
-    
+
         <!-- Address: -->
         <TableLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-        
-            <TextView 
+
+            <TextView
                 android:id="@+id/address_header"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:text="@string/page_info_address"
-                android:gravity="left"
-                android:layout_marginLeft="20dip"
-                android:layout_marginRight="20dip"
+                android:gravity="start"
+                android:layout_marginStart="20dip"
+                android:layout_marginEnd="20dip"
                 android:layout_marginBottom="10dip" />
-            
+
             <TextView
                 android:id="@+id/address"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:gravity="left"
-                android:layout_marginLeft="20dip"
-                android:layout_marginRight="20dip"
+                android:gravity="start"
+                android:layout_marginStart="20dip"
+                android:layout_marginEnd="20dip"
                 android:layout_marginBottom="12dip" />
-            
+
         </TableLayout>
-        
+
     </LinearLayout>
 
 </ScrollView>
diff --git a/res/layout/preference_list_content.xml b/res/layout/preference_list_content.xml
index ad3d64e..1b2ba55 100644
--- a/res/layout/preference_list_content.xml
+++ b/res/layout/preference_list_content.xml
@@ -27,8 +27,8 @@
             android:orientation="vertical"
             android:layout_width="0px"
             android:layout_height="match_parent"
-            android:layout_marginRight="@dimen/preference_screen_side_margin_negative"
-            android:layout_marginLeft="@dimen/preference_screen_side_margin"
+            android:layout_marginEnd="@dimen/preference_screen_side_margin_negative"
+            android:layout_marginStart="@dimen/preference_screen_side_margin"
             android:layout_marginTop="32dp"
             android:layout_marginBottom="32dp"
             android:layout_weight="10">
@@ -54,8 +54,8 @@
                 android:layout_width="0px"
                 android:layout_height="match_parent"
                 android:layout_weight="20"
-                android:layout_marginLeft="@dimen/preference_screen_side_margin"
-                android:layout_marginRight="@dimen/preference_screen_side_margin"
+                android:layout_marginStart="@dimen/preference_screen_side_margin"
+                android:layout_marginEnd="@dimen/preference_screen_side_margin"
                 android:layout_marginTop="16dp"
                 android:layout_marginBottom="16dp"
                 android:background="?android:attr/detailsElementBackground"
@@ -69,16 +69,16 @@
                 android:layout_width="match_parent"
                 android:paddingTop="16dip"
                 android:paddingBottom="8dip"
-                android:gravity="center_vertical|left"
-                android:layout_marginLeft="48dip"
-                android:layout_marginRight="48dip"
+                android:gravity="center_vertical|start"
+                android:layout_marginStart="48dip"
+                android:layout_marginEnd="48dip"
                 />
 
             <ImageView
                     android:layout_width="match_parent"
                     android:layout_height="1dip"
-                    android:paddingLeft="32dip"
-                    android:paddingRight="32dip"
+                    android:paddingStart="32dip"
+                    android:paddingEnd="32dip"
                     android:src="#404040"
                 />
             <android.preference.PreferenceFrameLayout android:id="@+id/prefs"
diff --git a/res/layout/setup_autofill_dialog.xml b/res/layout/setup_autofill_dialog.xml
index 499c2a6..7f248fd 100644
--- a/res/layout/setup_autofill_dialog.xml
+++ b/res/layout/setup_autofill_dialog.xml
@@ -20,8 +20,8 @@
     android:orientation="vertical"
     android:paddingTop="9dip"
     android:paddingBottom="3dip"
-    android:paddingLeft="3dip"
-    android:paddingRight="1dip">
+    android:paddingStart="3dip"
+    android:paddingEnd="1dip">
 
     <TextView
         android:text="@string/autofill_setup_dialog_message"
@@ -33,7 +33,7 @@
     <CheckBox android:id="@+id/setup_autofill_dialog_disable_autofill"
         android:text="@string/disable_autofill"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:layout_gravity="left"
+        android:layout_gravity="start"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
diff --git a/res/layout/snapshot_item.xml b/res/layout/snapshot_item.xml
index 94a9898..0115356 100644
--- a/res/layout/snapshot_item.xml
+++ b/res/layout/snapshot_item.xml
@@ -32,36 +32,36 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@id/thumb"
-        android:layout_alignLeft="@id/thumb"
-        android:layout_alignRight="@id/thumb"
+        android:layout_alignStart="@id/thumb"
+        android:layout_alignEnd="@id/thumb"
         android:background="@drawable/overlay_url_bookmark_widget_holo"
         android:singleLine="true"
         android:ellipsize="end"
         android:textSize="14sp"
         android:typeface="sans"
         android:textColor="#AAAAAA"
-        android:paddingLeft="6dip"
-        android:paddingRight="2dip"
+        android:paddingStart="6dip"
+        android:paddingEnd="2dip"
         android:gravity="center_vertical" />
     <TextView android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/thumb"
-        android:layout_alignLeft="@+id/thumb"
-        android:layout_alignRight="@+id/thumb"
-        android:layout_marginTop="5dip"
-        android:paddingLeft="8dip"
+        android:layout_alignStart="@+id/thumb"
+        android:layout_alignEnd="@+id/thumb"
+        android:layout_marginTop="6dip"
+        android:paddingStart="8dip"
         android:gravity="center_vertical"
-        android:textColor="@color/black"
+        android:typeface="sans"
         android:textSize="12sp"
-        android:fontFamily="sans-serif-light"
+        android:textColor="#AAAAAA"
         android:lines="2" />
     <ImageView
         android:id="@+id/divider"
         android:src="?android:attr/dividerVertical"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/title"
+        android:layout_alignStart="@+id/title"
         android:layout_alignTop="@+id/title"
         android:layout_alignBottom="@+id/title"
         android:scaleType="fitXY" />
diff --git a/res/layout/ssl_success.xml b/res/layout/ssl_success.xml
index 16f7f58..fb14852 100644
--- a/res/layout/ssl_success.xml
+++ b/res/layout/ssl_success.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,25 +18,25 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal" >
-    
+
     <TableRow>
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:scaleType="center"
             android:src="@drawable/ic_dialog_browser_security_good"
-            android:layout_marginLeft="20dip"
+            android:layout_marginStart="20dip"
             android:layout_marginBottom="12dip" />
-            
+
         <TextView
             android:id="@+id/success"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:gravity="left"
+            android:gravity="start"
             android:layout_weight="1"
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:layout_marginLeft="10dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="10dip"
+            android:layout_marginEnd="20dip"
             android:layout_marginBottom="12dip" />
     </TableRow>
 
diff --git a/res/layout/ssl_warning.xml b/res/layout/ssl_warning.xml
index a54dfb8..9471943 100644
--- a/res/layout/ssl_warning.xml
+++ b/res/layout/ssl_warning.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,11 +19,11 @@
     android:id="@+id/warning"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:drawableLeft="@drawable/ic_dialog_browser_security_bad"
+    android:drawableStart="@drawable/ic_dialog_browser_security_bad"
     android:drawablePadding="6dip"
     android:textAppearance="?android:attr/textAppearanceSmall"
-    android:layout_marginLeft="12dip"
-    android:layout_marginRight="12dip"
+    android:layout_marginStart="12dip"
+    android:layout_marginEnd="12dip"
     android:minHeight="32dip"
     android:gravity="center_vertical"
     android:layout_marginBottom="4dip"
diff --git a/res/layout/suggestion_item.xml b/res/layout/suggestion_item.xml
index d0075f6..a8e9d1a 100644
--- a/res/layout/suggestion_item.xml
+++ b/res/layout/suggestion_item.xml
@@ -39,8 +39,8 @@
             android:layout_height="wrap_content"
             android:id="@+id/icon1"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/suggest_item_padding"
-            android:layout_marginRight="@dimen/suggest_item_padding" />
+            android:layout_marginStart="@dimen/suggest_item_padding"
+            android:layout_marginEnd="@dimen/suggest_item_padding" />
         <LinearLayout
             android:layout_width="0dip"
             android:layout_height="wrap_content"
@@ -75,7 +75,7 @@
         android:scaleType="center"
         android:src="@drawable/ic_action_querybuilder"
         android:background="?android:attr/selectableItemBackground"
-        android:paddingRight="@dimen/suggest_item_padding"
-        android:paddingLeft="@dimen/suggest_item_padding"
+        android:paddingEnd="@dimen/suggest_item_padding"
+        android:paddingStart="@dimen/suggest_item_padding"
          />
 </LinearLayout>
diff --git a/res/layout/website_settings.xml b/res/layout/swe_website_settings.xml
similarity index 100%
rename from res/layout/website_settings.xml
rename to res/layout/swe_website_settings.xml
diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index f248938..5dde66a 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -36,8 +36,8 @@
         android:id="@+id/favicon"
         android:layout_width="20dip"
         android:layout_height="20dip"
-        android:layout_marginLeft="8dip"
-        android:layout_marginRight="8dip" />
+        android:layout_marginStart="8dip"
+        android:layout_marginEnd="8dip" />
     <ImageView
         android:id="@+id/lock"
         android:layout_width="wrap_content"
@@ -48,8 +48,8 @@
         android:layout_height="match_parent"
         android:layout_width="0dip"
         android:layout_weight="1.0"
-        android:paddingLeft="8dip"
-        android:paddingRight="8dip"
+        android:paddingStart="8dip"
+        android:paddingEnd="8dip"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="@color/white"
         android:gravity="center_vertical"
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index c412e11..142b73b 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -32,7 +32,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="center"
-            android:layout_marginLeft="8dp"
+            android:layout_marginStart="8dp"
             android:src="@drawable/ic_deco_incognito_normal"
             android:visibility="gone" />
 
@@ -40,7 +40,7 @@
             android:id="@+id/location_button"
             style="@style/NavButton"
             android:layout_width="wrap_content"
-            android:paddingRight="2dp"
+            android:paddingEnd="2dp"
             android:visibility="gone" />
 
         <ImageView
@@ -48,8 +48,8 @@
             android:layout_width="44dp"
             android:layout_height="match_parent"
             android:src="@drawable/ic_action_search_normal"
-            android:paddingLeft="6dp"
-            android:paddingRight="6dp"
+            android:paddingStart="6dp"
+            android:paddingEnd="6dp"
             android:visibility="visible" />
 
         <FrameLayout
@@ -63,8 +63,8 @@
                 android:layout_width="32dip"
                 android:layout_height="32dip"
                 android:layout_gravity="center"
-                android:paddingLeft="6dip"
-                android:paddingRight="6dip"
+                android:paddingStart="6dip"
+                android:paddingEnd="6dip"
                 android:scaleType="fitCenter" />
 
             <ImageView
@@ -81,8 +81,8 @@
             android:layout_width="wrap_content"
             android:layout_gravity="center_vertical"
             android:contentDescription="@string/accessibility_button_stop"
-            android:paddingLeft="6dp"
-            android:paddingRight="6dp"
+            android:paddingStart="6dp"
+            android:paddingEnd="6dp"
             android:src="@drawable/ic_action_stop" />
 
         <com.android.browser.UrlInputView
@@ -100,8 +100,8 @@
             android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
             android:inputType="textUri"
             android:lines="1"
-            android:paddingLeft="4dp"
-            android:paddingRight="6dp"
+            android:paddingStart="4dp"
+            android:paddingEnd="6dp"
             android:scrollHorizontally="true"
             android:singleLine="true"
             android:fontFamily="sans-serif-condensed"
@@ -112,7 +112,7 @@
             style="@style/NavButton"
             android:layout_width="wrap_content"
             android:contentDescription="@string/accessibility_button_voice"
-            android:paddingRight="4dip"
+            android:paddingEnd="4dip"
             android:src="@drawable/ic_action_microphone_normal"
             android:visibility="gone" />
 
@@ -143,7 +143,7 @@
             android:layout_gravity="center"
             android:clickable="false"
             android:paddingBottom="3dp"
-            android:paddingRight="2dp"
+            android:paddingEnd="2dp"
             android:textColor="#333"
             android:textSize="13dp"
             android:textStyle="bold" />
diff --git a/res/layout/title_bar_snapshot.xml b/res/layout/title_bar_snapshot.xml
index 13a35ac..7417606 100644
--- a/res/layout/title_bar_snapshot.xml
+++ b/res/layout/title_bar_snapshot.xml
@@ -23,13 +23,13 @@
         android:src="@drawable/ic_suggest_history_normal"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:paddingLeft="8dip" />
+        android:paddingStart="8dip" />
     <ImageView
         android:id="@+id/favicon"
         android:layout_width="52dip"
         android:layout_height="match_parent"
-        android:paddingLeft="16dip"
-        android:paddingRight="16dip"
+        android:paddingStart="16dip"
+        android:paddingEnd="16dip"
         android:scaleType="fitCenter" />
     <FrameLayout
         android:id="@+id/toggle_container"
@@ -69,7 +69,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:paddingBottom="3dp"
-            android:paddingRight="2dp"
+            android:paddingEnd="2dp"
             android:clickable="false"
             android:text="0" >
         </TextView>
diff --git a/res/layout/website_settings_row.xml b/res/layout/website_settings_row.xml
index 3df63e2..19e998e 100644
--- a/res/layout/website_settings_row.xml
+++ b/res/layout/website_settings_row.xml
@@ -24,8 +24,8 @@
   <ImageView android:id="@+id/icon"
     android:layout_width="20dip"
     android:layout_height="20dip"
-    android:layout_marginLeft="18dip"
-    android:layout_marginRight="18dip"
+    android:layout_marginStart="18dip"
+    android:layout_marginEnd="18dip"
     android:layout_centerVertical="true"
     android:background="@drawable/bookmark_list_favicon_bg"
     android:padding="2dip" />
@@ -35,10 +35,10 @@
     android:layout_height="wrap_content"
     android:layout_alignParentTop="true"
     android:layout_alignParentBottom="true"
-    android:layout_alignParentRight="true"
+    android:layout_alignParentEnd="true"
     android:gravity="center"
     android:padding="0dip"
-    android:layout_marginRight="2dip">
+    android:layout_marginEnd="2dip">
 
     <ImageView android:id="@+id/location_icon"
       android:layout_width="32dip"
@@ -55,15 +55,15 @@
       android:layout_height="32dip"
       android:padding="2dip"
       android:layout_centerVertical="true"
-      android:layout_alignParentRight="true"
+      android:layout_alignParentEnd="true"
       android:visibility="gone" />
   </LinearLayout>
 
   <LinearLayout
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_toRightOf="@id/icon"
-    android:layout_toLeftOf="@id/features"
+    android:layout_toEndOf="@id/icon"
+    android:layout_toStartOf="@id/features"
     android:layout_centerVertical="true"
     android:layout_alignWithParentIfMissing="true"
     android:orientation="vertical">
diff --git a/res/layout/webview_preview.xml b/res/layout/webview_preview.xml
index b86de2b..57a904d 100644
--- a/res/layout/webview_preview.xml
+++ b/res/layout/webview_preview.xml
@@ -19,7 +19,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">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -38,8 +38,8 @@
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="8dip"
+        android:layout_marginStart="16dip"
+        android:layout_marginEnd="8dip"
         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:textColor="?android:attr/textColorSecondary"
             android:maxLines="4" />
@@ -66,7 +66,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_below="@android:id/summary"
-            android:layout_alignLeft="@android:id/title"
+            android:layout_alignStart="@android:id/title"
             android:minWidth="@dimen/preference_widget_width"
             android:gravity="center"
             android:orientation="vertical" />
@@ -76,8 +76,8 @@
             android:layout_width="match_parent"
             android:layout_height="180dp"
             android:layout_below="@android:id/summary"
-            android:layout_toRightOf="@android:id/widget_frame"
-            android:layout_alignParentRight="true"
+            android:layout_toEndOf="@android:id/widget_frame"
+            android:layout_alignParentEnd="true"
             android:textColor="@color/black"
             android:background="@color/white"/>
 
diff --git a/res/layout/widget_account_selection.xml b/res/layout/widget_account_selection.xml
index 5dcd210..8d0181f 100644
--- a/res/layout/widget_account_selection.xml
+++ b/res/layout/widget_account_selection.xml
@@ -24,8 +24,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:paddingLeft="16dip"
-        android:paddingRight="16dip"
+        android:paddingStart="16dip"
+        android:paddingEnd="16dip"
         android:fadingEdgeLength="16dip" />
     <LinearLayout
         android:layout_width="match_parent"
@@ -40,8 +40,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:paddingLeft="2dip"
-            android:paddingRight="2dip"
+            android:paddingStart="2dip"
+            android:paddingEnd="2dip"
             android:measureWithLargestChild="true"
             android:background="@null">
             <Button