summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shamali Patwa <shamalip@google.com> 2025-03-24 05:47:26 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-24 05:47:26 -0700
commit173790f52db24424a054064f6b94d862a07914ce (patch)
tree6622b70dc6b66e93fa84811f5c60199f240eb9ac
parent69461b2d75293f34b4bb86361bf92c356b4cb6c6 (diff)
parent1065e89e6e76ce270475be84e564bdc866bccf26 (diff)
Merge "Update font weights for the text in widget list header's selected states" into main
-rw-r--r--res/layout/widgets_list_row_header.xml10
-rw-r--r--res/layout/widgets_list_row_header_two_pane.xml10
-rw-r--r--res/values/dimens.xml2
-rw-r--r--res/values/styles.xml30
-rw-r--r--src/com/android/launcher3/widget/picker/WidgetsListHeader.java8
5 files changed, 44 insertions, 16 deletions
diff --git a/res/layout/widgets_list_row_header.xml b/res/layout/widgets_list_row_header.xml
index 98f9dac57b..2a7d22cff3 100644
--- a/res/layout/widgets_list_row_header.xml
+++ b/res/layout/widgets_list_row_header.xml
@@ -45,25 +45,19 @@
android:id="@+id/app_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ style="@style/WidgetListHeader.Title"
android:layout_gravity="start|center_vertical"
android:ellipsize="end"
android:maxLines="1"
- android:textColor="?attr/widgetPickerHeaderAppTitleColor"
- android:textSize="@dimen/widget_picker_header_app_title_font_size"
- android:textFontWeight="@integer/widget_picker_header_app_title_font_weight"
- android:lineHeight="@dimen/widget_picker_header_app_title_line_height"
tools:text="App name" />
<TextView
android:id="@+id/app_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ style="@style/WidgetListHeader.SubTitle"
android:ellipsize="end"
android:maxLines="1"
- android:textColor="?attr/widgetPickerHeaderAppSubtitleColor"
- android:textSize="@dimen/widget_picker_header_app_subtitle_font_size"
- android:textFontWeight="@integer/widget_picker_header_app_subtitle_font_weight"
- android:lineHeight="@dimen/widget_picker_header_app_subtitle_line_height"
tools:text="m widgets, n shortcuts" />
</LinearLayout>
diff --git a/res/layout/widgets_list_row_header_two_pane.xml b/res/layout/widgets_list_row_header_two_pane.xml
index d4baf0aed3..4827ed4e69 100644
--- a/res/layout/widgets_list_row_header_two_pane.xml
+++ b/res/layout/widgets_list_row_header_two_pane.xml
@@ -47,13 +47,10 @@
android:id="@+id/app_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ style="@style/WidgetListHeader.Title"
android:layout_gravity="start|center_vertical"
android:ellipsize="end"
android:maxLines="1"
- android:textColor="?attr/widgetPickerHeaderAppTitleColor"
- android:textSize="@dimen/widget_picker_header_app_title_font_size"
- android:textFontWeight="@integer/widget_picker_header_app_title_font_weight"
- android:lineHeight="@dimen/widget_picker_header_app_title_line_height"
android:duplicateParentState="true"
tools:text="App name" />
@@ -61,12 +58,9 @@
android:id="@+id/app_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ style="@style/WidgetListHeader.SubTitle"
android:ellipsize="end"
android:maxLines="1"
- android:textColor="?attr/widgetPickerHeaderAppSubtitleColor"
- android:textSize="@dimen/widget_picker_header_app_subtitle_font_size"
- android:textFontWeight="@integer/widget_picker_header_app_subtitle_font_weight"
- android:lineHeight="@dimen/widget_picker_header_app_subtitle_line_height"
android:duplicateParentState="true"
tools:text="m widgets, n shortcuts" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4d0379d462..3f9c535ee6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -226,9 +226,11 @@
<dimen name="widget_picker_two_panels_left_right_margin">0dp</dimen>
<dimen name="widget_picker_header_app_title_font_size">16sp</dimen>
<integer name="widget_picker_header_app_title_font_weight">500</integer>
+ <integer name="widget_picker_header_selected_app_title_font_weight">600</integer>
<dimen name="widget_picker_header_app_title_line_height">24sp</dimen>
<dimen name="widget_picker_header_app_subtitle_font_size">14sp</dimen>
<integer name="widget_picker_header_app_subtitle_font_weight">400</integer>
+ <integer name="widget_picker_header_selected_app_subtitle_font_weight">600</integer>
<dimen name="widget_picker_header_app_subtitle_line_height">20sp</dimen>
<dimen name="widget_recommendations_table_vertical_padding">8dp</dimen>
<!-- Bottom margin for the search and recommended widgets container without work profile -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index cf6c56097a..3b21a42be0 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -291,6 +291,36 @@
@color/widget_cell_subtitle_color_dark</item>
</style>
+ <style name="WidgetListHeader.Title" parent="@android:style/TextAppearance.DeviceDefault" >
+ <!-- Title / Medium -->
+ <item name="android:textFontWeight">@integer/widget_picker_header_app_title_font_weight</item>
+ <item name="android:textSize">@dimen/widget_picker_header_app_title_font_size</item>
+ <item name="android:lineHeight">@dimen/widget_picker_header_app_title_line_height</item>
+ <item name="android:textColor">?attr/widgetPickerHeaderAppTitleColor</item>
+ </style>
+
+ <style name="WidgetListHeader.Title.Selected" parent="WidgetListHeader.Title">
+ <!-- Title / Medium / Emphasized -->
+ <item name="android:textFontWeight">
+ @integer/widget_picker_header_selected_app_title_font_weight
+ </item>
+ </style>
+
+ <style name="WidgetListHeader.SubTitle" parent="@android:style/TextAppearance.DeviceDefault" >
+ <!-- Title / Small -->
+ <item name="android:textFontWeight">@integer/widget_picker_header_app_subtitle_font_weight</item>
+ <item name="android:textSize">@dimen/widget_picker_header_app_subtitle_font_size</item>
+ <item name="android:lineHeight">@dimen/widget_picker_header_app_subtitle_line_height</item>
+ <item name="android:textColor">?attr/widgetPickerHeaderAppSubtitleColor</item>
+ </style>
+
+ <style name="WidgetListHeader.SubTitle.Selected" parent="WidgetListHeader.SubTitle">
+ <!-- Title / Small / Emphasized -->
+ <item name="android:textFontWeight">
+ @integer/widget_picker_header_selected_app_subtitle_font_weight
+ </item>
+ </style>
+
<style name="FastScrollerPopup" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle">
<item name="android:layout_width">wrap_content</item>
<item name="android:minWidth">@dimen/fastscroll_popup_width</item>
diff --git a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
index 2f123a3465..836675a1ee 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListHeader.java
@@ -131,6 +131,14 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
public void setExpanded(boolean isExpanded) {
this.mIsExpanded = isExpanded;
refreshDrawableState();
+ refreshTextAppearance(isExpanded);
+ }
+
+ private void refreshTextAppearance(boolean isExpanded) {
+ mTitle.setTextAppearance(isExpanded ? R.style.WidgetListHeader_Title_Selected
+ : R.style.WidgetListHeader_Title);
+ mSubtitle.setTextAppearance(isExpanded ? R.style.WidgetListHeader_SubTitle_Selected
+ : R.style.WidgetListHeader_SubTitle);
}
/** @return true if this header is expanded. */