From c37dd71260da3abfa6e813084dfe92309525cde3 Mon Sep 17 00:00:00 2001 From: Jason Chiu Date: Thu, 11 Mar 2021 14:33:08 +0800 Subject: [PATCH] Settings homepage redesign - Support new suggestion design - Search bar relayout - Move avatar icon to the top right corner Test: robotest Bug: 178068045 Change-Id: I07f1577488d6d1827ee07d55db6759f02d655d5f --- res/drawable/ic_homepage_search.xml | 2 +- res/layout/search_bar.xml | 14 +-- res/layout/settings_homepage_container.xml | 46 ++++----- res/values-night/colors.xml | 2 +- res/values/dimens.xml | 30 +++--- res/values/styles.xml | 36 +++---- .../settings/accounts/AvatarViewMixin.java | 22 ++--- .../homepage/SettingsHomepageActivity.java | 51 ++++++++-- .../accounts/AvatarViewMixinTest.java | 29 +----- .../SettingsHomepageActivityTest.java | 95 ++++++++++++++++++- 10 files changed, 193 insertions(+), 134 deletions(-) diff --git a/res/drawable/ic_homepage_search.xml b/res/drawable/ic_homepage_search.xml index 3895b6b2e85..3da1cc75a73 100644 --- a/res/drawable/ic_homepage_search.xml +++ b/res/drawable/ic_homepage_search.xml @@ -20,7 +20,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:tint="?android:attr/colorAccent"> + android:tint="?android:attr/textColorSecondary"> diff --git a/res/layout/search_bar.xml b/res/layout/search_bar.xml index 63f1c955b15..7cdf04dbd14 100644 --- a/res/layout/search_bar.xml +++ b/res/layout/search_bar.xml @@ -19,10 +19,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/search_bar_margin" - android:layout_marginStart="@dimen/search_bar_margin" - android:layout_marginEnd="@dimen/search_bar_margin" - android:layout_marginBottom="@dimen/search_bar_margin_bottom"> + android:layout_margin="@dimen/search_bar_margin"> @@ -43,16 +40,11 @@ style="@style/TextAppearance.SearchBar" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:paddingStart="-4dp" android:layout_gravity="start" android:text="@string/search_menu"/> - diff --git a/res/layout/settings_homepage_container.xml b/res/layout/settings_homepage_container.xml index d9bcb83dee0..4fd62fdfe29 100644 --- a/res/layout/settings_homepage_container.xml +++ b/res/layout/settings_homepage_container.xml @@ -65,34 +65,26 @@ android:orientation="vertical" app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed"> - + + + + - - - -