From 4604734d5476afc1c4d7fea960be453002122ba2 Mon Sep 17 00:00:00 2001
From: Jason Chiu <chiujason@google.com>
Date: Wed, 26 Feb 2025 22:15:42 +0800
Subject: [PATCH] [Expressive design] Update homepage preference layout

Bug: 396944193
Test: visual
Flag: com.android.settingslib.widget.theme.flags.is_expressive_design_enabled
Change-Id: I2dd3d984a3181d2fc49e56a26cd57332ac00bb33
---
 res/layout/homepage_preference_expressive.xml | 86 +++++++++++++++++++
 res/values/dimens.xml                         |  5 +-
 res/values/menu_keys.xml                      |  0
 .../HomepagePreferenceLayoutHelper.java       |  5 +-
 4 files changed, 93 insertions(+), 3 deletions(-)
 create mode 100644 res/layout/homepage_preference_expressive.xml
 mode change 100755 => 100644 res/values/dimens.xml
 mode change 100755 => 100644 res/values/menu_keys.xml

diff --git a/res/layout/homepage_preference_expressive.xml b/res/layout/homepage_preference_expressive.xml
new file mode 100644
index 00000000000..6dabcd6bc71
--- /dev/null
+++ b/res/layout/homepage_preference_expressive.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2025 The Android Open Source Project
+
+  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.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:minHeight="72dp"
+    android:gravity="center_vertical"
+    android:background="?android:attr/selectableItemBackground"
+    android:clipToPadding="false"
+    android:baselineAligned="false">
+
+    <LinearLayout
+        android:id="@+id/icon_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minWidth="40dp"
+        android:minHeight="40dp"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:paddingStart="16dp">
+
+        <androidx.preference.internal.PreferenceImageView
+            android:id="@android:id/icon"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:scaleType="centerInside"/>
+
+    </LinearLayout>
+
+    <RelativeLayout
+        android:id="@+id/text_frame"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:paddingStart="@dimen/homepage_preference_text_padding_start_expressive"
+        android:paddingEnd="16dp">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start"
+            android:textAlignment="viewStart"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceListItem"
+            android:hyphenationFrequency="normalFast"
+            android:lineBreakWordStyle="phrase"
+            android:ellipsize="marquee"/>
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:layout_gravity="start"
+            android:textAlignment="viewStart"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
+            android:maxLines="4"
+            android:hyphenationFrequency="normalFast"
+            android:lineBreakWordStyle="phrase"
+            style="@style/PreferenceSummaryTextStyle"/>
+    </RelativeLayout>
+</LinearLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
old mode 100755
new mode 100644
index ddce9e6a9df..fb4d2d416d3
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -64,13 +64,13 @@
     <dimen name="actionbar_subsettings_contentInsetStart">72dp</dimen>
 
     <!-- Dashboard image tile size -->
-    <dimen name="dashboard_tile_image_size">36dp</dimen>
+    <dimen name="dashboard_tile_image_size">40dp</dimen>
 
     <!-- Dashboard foreground image size -->
     <dimen name="dashboard_tile_foreground_image_size">24dp</dimen>
 
     <!-- Dashboard foreground image inset (from background edge to foreground edge) -->
-    <dimen name="dashboard_tile_foreground_image_inset">6dp</dimen>
+    <dimen name="dashboard_tile_foreground_image_inset">8dp</dimen>
 
     <!-- Preference icon foreground image inset (from background edge to foreground edge) -->
     <dimen name="preference_icon_foreground_image_inset">12dp</dimen>
@@ -106,6 +106,7 @@
     <dimen name="homepage_preference_icon_padding_start_two_pane">8dp</dimen>
     <dimen name="homepage_preference_text_padding_start">16dp</dimen>
     <dimen name="homepage_preference_text_padding_start_two_pane">24dp</dimen>
+    <dimen name="homepage_preference_text_padding_start_expressive">12dp</dimen>
     <dimen name="homepage_app_bar_corner_radius">32dp</dimen>
     <dimen name="homepage_app_bar_padding_two_pane">6dp</dimen>
     <!-- bottom: search_bar_margin - homepage_app_bar_padding_two_pane -->
diff --git a/res/values/menu_keys.xml b/res/values/menu_keys.xml
old mode 100755
new mode 100644
diff --git a/src/com/android/settings/widget/HomepagePreferenceLayoutHelper.java b/src/com/android/settings/widget/HomepagePreferenceLayoutHelper.java
index 2251180e5f6..9f75c50e662 100644
--- a/src/com/android/settings/widget/HomepagePreferenceLayoutHelper.java
+++ b/src/com/android/settings/widget/HomepagePreferenceLayoutHelper.java
@@ -23,6 +23,7 @@ import androidx.preference.PreferenceViewHolder;
 
 import com.android.settings.R;
 import com.android.settings.flags.Flags;
+import com.android.settingslib.widget.SettingsThemeHelper;
 
 /** Helper for homepage preference to manage layout. */
 public class HomepagePreferenceLayoutHelper {
@@ -42,7 +43,9 @@ public class HomepagePreferenceLayoutHelper {
     public HomepagePreferenceLayoutHelper(Preference preference) {
         preference.setLayoutResource(
                 Flags.homepageRevamp()
-                        ? R.layout.homepage_preference_v2
+                        ? SettingsThemeHelper.isExpressiveTheme(preference.getContext())
+                                ? R.layout.homepage_preference_expressive
+                                : R.layout.homepage_preference_v2
                         : R.layout.homepage_preference);
     }