Privacy Guide: Apply standard Clank preference margins

- Change margins applied in the When on / Things to consider struct. - Adjust the done step so that it is not affected by these changes. (cherry picked from commit 1213122) Screenshots: https://crbug.com/1238896#c102 Bug: 1449246, 1238896 Change-Id: I61b1a96e704b2e9ed3dcf945d29525ff5f44b5b6 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4523347 Reviewed-by: Martin Šrámek <msramek@chromium.org> Commit-Queue: Rubin Deliallisi <rubindl@chromium.org> Cr-Original-Commit-Position: refs/heads/main@{#1149751} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4568020 Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Auto-Submit: Rubin Deliallisi <rubindl@chromium.org> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Cr-Commit-Position: refs/branch-heads/5790@{#128} Cr-Branched-From: 1d71a33-refs/heads/main@{#1148114}
chromium · May 30, 2023 · 709eb76 · 709eb76
1 parent c308e5c
commit 709eb76
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 24 deletions.
diff --git a/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_done.xml b/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_done.xml
@@ -31,26 +31,29 @@ found in the LICENSE file.
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/privacy_guide_done_title"
+            android:layout_marginBottom="@dimen/done_step_header_marginBottom"
             style="@style/TextAppearance.Headline.Primary" />
 
         <TextView
-            android:layout_marginBottom="8dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/done_step_description_marginBottom"
             android:text="@string/privacy_guide_done_description"
             style="@style/TextAppearance.TextLarge.Secondary" />
 
-        <org.chromium.chrome.browser.privacy_guide.PrivacyGuideExplanationHeading
+        <TextView
             android:id="@+id/ps_heading"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:titleText="@string/privacy_guide_privacy_sandbox_heading" />
+            android:layout_marginBottom="@dimen/done_step_header_marginBottom"
+            android:text="@string/privacy_guide_privacy_sandbox_heading"
+            style="@style/TextAppearance.TextMediumThick.Accent1" />
 
         <LinearLayout
             android:id="@+id/ps_explanation"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/done_step_explanation_marginBottom"
+            android:layout_marginBottom="@dimen/done_step_description_marginBottom"
             android:orientation="horizontal">
 
             <TextView
@@ -74,17 +77,18 @@ found in the LICENSE file.
                 app:tint="@color/default_icon_color_tint_list" />
         </LinearLayout>
 
-        <org.chromium.chrome.browser.privacy_guide.PrivacyGuideExplanationHeading
+        <TextView
             android:id="@+id/waa_heading"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:titleText="@string/privacy_guide_web_app_activity_heading" />
+            android:layout_marginBottom="@dimen/done_step_header_marginBottom"
+            android:text="@string/privacy_guide_web_app_activity_heading"
+            style="@style/TextAppearance.TextMediumThick.Accent1" />
 
         <LinearLayout
             android:id="@+id/waa_explanation"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/done_step_explanation_marginBottom"
             android:orientation="horizontal">
 
             <TextView

diff --git a/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_explanation_heading.xml b/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_explanation_heading.xml
@@ -14,7 +14,7 @@ found in the LICENSE file.
 
     <TextView
         android:id="@+id/title"
-        android:layout_marginVertical="8dp"
+        android:layout_marginVertical="@dimen/explanation_marginVertical"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         style="@style/TextAppearance.TextMediumThick.Accent1" />

diff --git a/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_explanation_item.xml b/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_explanation_item.xml
@@ -15,7 +15,7 @@ found in the LICENSE file.
     <TextView
         android:id="@+id/summary"
         android:drawablePadding="16dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginVertical="@dimen/explanation_marginVertical"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         style="@style/TextAppearance.TextMedium.Secondary" />

diff --git a/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_history_sync_step.xml b/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_history_sync_step.xml
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2021 The Chromium Authors
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 -->
 
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/history_sync_view"
     android:layout_width="match_parent"
@@ -61,7 +59,6 @@ found in the LICENSE file.
             <org.chromium.chrome.browser.privacy_guide.PrivacyGuideExplanationItem
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/last_explanation_item_extra_marginBottom"
                 app:iconImage="@drawable/ic_dns_24dp"
                 app:summaryText="@string/privacy_guide_history_sync_item_two" />
 

diff --git a/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_msbb_step.xml b/chrome/browser/privacy_guide/android/java/res/layout/privacy_guide_msbb_step.xml
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright 2021 The Chromium Authors
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 -->
 
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/msbb_view"
     android:layout_width="match_parent"
@@ -39,7 +37,7 @@ found in the LICENSE file.
             android:text="@string/url_keyed_anonymized_data_title"
             android:textAppearance="@style/TextAppearance.TextLarge.Primary"
             android:foreground="?attr/selectableItemBackground"
-            android:background="@null"/>
+            android:background="@null" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -61,7 +59,6 @@ found in the LICENSE file.
             <org.chromium.chrome.browser.privacy_guide.PrivacyGuideExplanationItem
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/last_explanation_item_extra_marginBottom"
                 app:iconImage="@drawable/ic_lightbulb_24dp"
                 app:summaryText="@string/privacy_guide_msbb_item_two" />
 

diff --git a/...e/browser/privacy_guide/android/java/res/layout/privacy_guide_sb_enhanced_explanation.xml b/...e/browser/privacy_guide/android/java/res/layout/privacy_guide_sb_enhanced_explanation.xml
@@ -51,7 +51,6 @@ found in the LICENSE file.
         <org.chromium.chrome.browser.privacy_guide.PrivacyGuideExplanationItem
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/last_explanation_item_extra_marginBottom"
             app:iconImage="@drawable/ic_vpn_key_grey"
             app:iconTint="@macro/default_icon_color"
             app:summaryText="@string/privacy_guide_sb_enhanced_item_four" />

diff --git a/...e/browser/privacy_guide/android/java/res/layout/privacy_guide_sb_standard_explanation.xml b/...e/browser/privacy_guide/android/java/res/layout/privacy_guide_sb_standard_explanation.xml
@@ -39,7 +39,6 @@ found in the LICENSE file.
         <org.chromium.chrome.browser.privacy_guide.PrivacyGuideExplanationItem
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/last_explanation_item_extra_marginBottom"
             app:iconImage="@drawable/ic_bar_chart_24dp"
             app:summaryText="@string/privacy_guide_sb_standard_item_two" />
 

diff --git a/chrome/browser/privacy_guide/android/java/res/values/dimens.xml b/chrome/browser/privacy_guide/android/java/res/values/dimens.xml
@@ -7,13 +7,14 @@ found in the LICENSE file.
 
 <resources>
   <dimen name="all_content_marginHorizontal">16dp</dimen>
+  <dimen name="explanation_marginVertical">16dp</dimen>
   <dimen name="bottom_bar_marginVertical">8dp</dimen>
-  <dimen name="done_step_explanation_marginBottom">8dp</dimen>
+  <dimen name="done_step_description_marginBottom">16dp</dimen>
+  <dimen name="done_step_header_marginBottom">4dp</dimen>
   <dimen name="done_step_illustration_marginHorizontal">16dp</dimen>
   <dimen name="done_step_link_button_padding">12dp</dimen>
   <dimen name="done_step_link_button_size">48dp</dimen>
   <dimen name="illustration_maxHeight">150dp</dimen>
-  <dimen name="last_explanation_item_extra_marginBottom">8dp</dimen>
   <dimen name="standard_illustration_marginHorizontal">32dp</dimen>
   <dimen name="welcome_done_step_illustration_marginVertical">32dp</dimen>
 </resources>