From 37af9df3adf1154a5c2fd1d05c7b190df429627c Mon Sep 17 00:00:00 2001
From: Elise Richards <erichards@mozilla.com>
Date: Fri, 17 Jul 2020 15:54:57 -0500
Subject: [PATCH] For #12532: Align Settings -> Site permissions -> Sub-pages
 to 72dp keyline (#12680)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Hakkı Kaan Çalışkan <caliskanhkaan@gmail.com>
---
 ...mponent_permissions_blocked_by_android.xml |  34 ++---
 ...e_permissions_exceptions_feature_phone.xml |  26 ++--
 ..._manage_site_permissions_feature_phone.xml | 127 +++++++++---------
 3 files changed, 96 insertions(+), 91 deletions(-)

diff --git a/app/src/main/res/layout/component_permissions_blocked_by_android.xml b/app/src/main/res/layout/component_permissions_blocked_by_android.xml
index 5d179c8bb..7ddd84db2 100644
--- a/app/src/main/res/layout/component_permissions_blocked_by_android.xml
+++ b/app/src/main/res/layout/component_permissions_blocked_by_android.xml
@@ -2,24 +2,24 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/permissions_blocked_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginTop="16dp"
-        android:paddingStart="@dimen/radio_button_preference_horizontal"
-        android:paddingEnd="@dimen/radio_button_preference_horizontal"
-        android:visibility="gone"
-        tools:visibility="visible">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/permissions_blocked_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:layout_marginTop="16dp"
+    android:paddingStart="@dimen/radio_button_preference_horizontal"
+    android:paddingEnd="@dimen/radio_button_preference_horizontal"
+    android:visibility="gone"
+    tools:visibility="visible">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceListItem"
+        android:layout_marginStart="@dimen/site_permissions_exceptions_item_height"
         android:text="@string/phone_feature_blocked_by_android"
         android:layout_marginBottom="16dp" />
 
@@ -27,21 +27,24 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceListItemSmall"
+        android:layout_marginStart="@dimen/site_permissions_exceptions_item_height"
         android:text="@string/phone_feature_blocked_intro"
-        android:layout_marginBottom="16dp"/>
+        android:layout_marginBottom="16dp" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceListItemSmall"
+        android:layout_marginStart="@dimen/site_permissions_exceptions_item_height"
         android:text="@string/phone_feature_blocked_step_settings"
-        android:layout_marginBottom="8dp"/>
+        android:layout_marginBottom="8dp" />
 
     <TextView
         android:id="@+id/blocked_by_android_permissions_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceListItemSmall"
+        android:layout_marginStart="@dimen/site_permissions_exceptions_item_height"
         tools:text="@string/phone_feature_blocked_step_permissions"
         android:layout_marginBottom="8dp" />
 
@@ -50,7 +53,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceListItemSmall"
-        tools:text="@string/phone_feature_blocked_step_feature"/>
+        android:layout_marginStart="@dimen/site_permissions_exceptions_item_height"
+        tools:text="@string/phone_feature_blocked_step_feature" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/settings_button"
diff --git a/app/src/main/res/layout/fragment_manage_site_permissions_exceptions_feature_phone.xml b/app/src/main/res/layout/fragment_manage_site_permissions_exceptions_feature_phone.xml
index d191337f3..51eea4b84 100644
--- a/app/src/main/res/layout/fragment_manage_site_permissions_exceptions_feature_phone.xml
+++ b/app/src/main/res/layout/fragment_manage_site_permissions_exceptions_feature_phone.xml
@@ -6,18 +6,18 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:layout_marginTop="@dimen/radio_button_preference_vertical">
 
-    <RadioGroup
+        <RadioGroup
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-        <RadioButton
+            <RadioButton
                 android:id="@+id/ask_to_allow_radio"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -26,13 +26,13 @@
                 android:background="?android:attr/selectableItemBackground"
                 android:button="@null"
                 app:drawableStartCompat="?android:attr/listChoiceIndicatorSingle"
-                android:drawablePadding="@dimen/radio_button_preference_drawable_padding"
+                android:drawablePadding="@dimen/preference_seek_bar_padding"
                 android:paddingTop="@dimen/radio_button_preference_vertical"
                 android:paddingStart="@dimen/radio_button_preference_horizontal"
                 android:paddingEnd="@dimen/radio_button_preference_horizontal"
-                android:paddingBottom="@dimen/radio_button_preference_vertical"/>
+                android:paddingBottom="@dimen/radio_button_preference_vertical" />
 
-        <RadioButton
+            <RadioButton
                 android:id="@+id/block_radio"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/radio_button_preference_height"
@@ -41,15 +41,15 @@
                 android:background="?android:attr/selectableItemBackground"
                 android:button="@null"
                 app:drawableStartCompat="?android:attr/listChoiceIndicatorSingle"
-                android:drawablePadding="@dimen/radio_button_preference_drawable_padding"
+                android:drawablePadding="@dimen/preference_seek_bar_padding"
                 android:paddingTop="@dimen/radio_button_preference_vertical"
                 android:paddingStart="@dimen/radio_button_preference_horizontal"
                 android:paddingEnd="@dimen/radio_button_preference_horizontal"
-                android:paddingBottom="@dimen/radio_button_preference_vertical"/>
-    </RadioGroup>
+                android:paddingBottom="@dimen/radio_button_preference_vertical" />
+        </RadioGroup>
 
-    <include layout="@layout/layout_clear_permission_button"/>
-    <include layout="@layout/component_permissions_blocked_by_android"/>
+    <include layout="@layout/layout_clear_permission_button" />
+    <include layout="@layout/component_permissions_blocked_by_android" />
 
-</LinearLayout>
+    </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_manage_site_permissions_feature_phone.xml b/app/src/main/res/layout/fragment_manage_site_permissions_feature_phone.xml
index a4b9979ac..862a5ad6a 100644
--- a/app/src/main/res/layout/fragment_manage_site_permissions_feature_phone.xml
+++ b/app/src/main/res/layout/fragment_manage_site_permissions_feature_phone.xml
@@ -7,76 +7,77 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
-<LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:layout_marginTop="@dimen/radio_button_preference_vertical">
 
-    <RadioGroup
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginTop="@dimen/radio_button_preference_vertical">
 
-        <RadioButton
-            android:id="@+id/ask_to_allow_radio"
+        <RadioGroup
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?android:attr/selectableItemBackground"
-            android:button="@null"
-            android:drawablePadding="@dimen/radio_button_preference_drawable_padding"
-            android:paddingStart="@dimen/radio_button_preference_horizontal"
-            android:paddingTop="@dimen/radio_button_preference_vertical"
-            android:paddingEnd="@dimen/radio_button_preference_horizontal"
-            android:paddingBottom="@dimen/radio_button_preference_vertical"
-            android:textAppearance="?android:attr/textAppearanceListItem"
-            app:drawableStartCompat="?android:attr/listChoiceIndicatorSingle"
-            tools:text="@string/preference_option_phone_feature_ask_to_allow" />
+            android:layout_height="wrap_content">
 
-        <RadioButton
-            android:id="@+id/block_radio"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?android:attr/selectableItemBackground"
-            android:button="@null"
-            android:drawablePadding="@dimen/radio_button_preference_drawable_padding"
-            android:paddingStart="@dimen/radio_button_preference_horizontal"
-            android:paddingTop="@dimen/radio_button_preference_vertical"
-            android:paddingEnd="@dimen/radio_button_preference_horizontal"
-            android:paddingBottom="@dimen/radio_button_preference_vertical"
-            android:textAppearance="?android:attr/textAppearanceListItem"
-            app:drawableStartCompat="?android:attr/listChoiceIndicatorSingle"
-            tools:text="@string/preference_option_phone_feature_blocked" />
+            <RadioButton
+                android:id="@+id/ask_to_allow_radio"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?android:attr/selectableItemBackground"
+                android:button="@null"
+                android:drawablePadding="@dimen/preference_seek_bar_padding"
+                android:paddingStart="@dimen/radio_button_preference_horizontal"
+                android:paddingTop="@dimen/radio_button_preference_vertical"
+                android:paddingEnd="@dimen/radio_button_preference_horizontal"
+                android:paddingBottom="@dimen/radio_button_preference_vertical"
+                android:textAppearance="?android:attr/textAppearanceListItem"
+                app:drawableStartCompat="?android:attr/listChoiceIndicatorSingle"
+                tools:text="@string/preference_option_phone_feature_ask_to_allow" />
 
-        <RadioButton
-            android:id="@+id/third_radio"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?android:attr/selectableItemBackground"
-            android:button="@null"
-            android:drawablePadding="@dimen/radio_button_preference_drawable_padding"
-            android:paddingStart="@dimen/radio_button_preference_horizontal"
-            android:paddingTop="@dimen/radio_button_preference_vertical"
-            android:paddingEnd="@dimen/radio_button_preference_horizontal"
-            android:paddingBottom="@dimen/radio_button_preference_vertical"
-            android:textAppearance="?android:attr/textAppearanceListItem"
-            app:drawableStartCompat="?android:attr/listChoiceIndicatorSingle" />
+            <RadioButton
+                android:id="@+id/block_radio"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?android:attr/selectableItemBackground"
+                android:button="@null"
+                android:drawablePadding="@dimen/preference_seek_bar_padding"
+                android:paddingStart="@dimen/radio_button_preference_horizontal"
+                android:paddingTop="@dimen/radio_button_preference_vertical"
+                android:paddingEnd="@dimen/radio_button_preference_horizontal"
+                android:paddingBottom="@dimen/radio_button_preference_vertical"
+                android:textAppearance="?android:attr/textAppearanceListItem"
+                app:drawableStartCompat="?android:attr/listChoiceIndicatorSingle"
+                tools:text="@string/preference_option_phone_feature_blocked" />
 
-        <RadioButton
-            android:id="@+id/fourth_radio"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?android:attr/selectableItemBackground"
-            android:button="@null"
-            android:drawablePadding="@dimen/radio_button_preference_drawable_padding"
-            android:paddingStart="@dimen/radio_button_preference_horizontal"
-            android:paddingTop="@dimen/radio_button_preference_vertical"
-            android:paddingEnd="@dimen/radio_button_preference_horizontal"
-            android:paddingBottom="@dimen/radio_button_preference_vertical"
-            android:textAppearance="?android:attr/textAppearanceListItem"
-            app:drawableStartCompat="?android:attr/listChoiceIndicatorSingle" />
-    </RadioGroup>
+            <RadioButton
+                android:id="@+id/third_radio"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?android:attr/selectableItemBackground"
+                android:button="@null"
+                android:drawablePadding="@dimen/preference_seek_bar_padding"
+                android:paddingStart="@dimen/radio_button_preference_horizontal"
+                android:paddingTop="@dimen/radio_button_preference_vertical"
+                android:paddingEnd="@dimen/radio_button_preference_horizontal"
+                android:paddingBottom="@dimen/radio_button_preference_vertical"
+                android:textAppearance="?android:attr/textAppearanceListItem"
+                app:drawableStartCompat="?android:attr/listChoiceIndicatorSingle" />
 
-    <include layout="@layout/component_permissions_blocked_by_android"/>
+            <RadioButton
+                android:id="@+id/fourth_radio"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?android:attr/selectableItemBackground"
+                android:button="@null"
+                android:drawablePadding="@dimen/preference_seek_bar_padding"
+                android:paddingStart="@dimen/radio_button_preference_horizontal"
+                android:paddingTop="@dimen/radio_button_preference_vertical"
+                android:paddingEnd="@dimen/radio_button_preference_horizontal"
+                android:paddingBottom="@dimen/radio_button_preference_vertical"
+                android:textAppearance="?android:attr/textAppearanceListItem"
+                app:drawableStartCompat="?android:attr/listChoiceIndicatorSingle" />
+        </RadioGroup>
 
-</LinearLayout>
+        <include layout="@layout/component_permissions_blocked_by_android"/>
+
+    </LinearLayout>
 </ScrollView>
\ No newline at end of file