From 5fc74c7f8fa2af2db4baab8b772d44af7cd7f6fd Mon Sep 17 00:00:00 2001 From: Stevie Kideckel Date: Fri, 14 May 2021 12:37:44 +0000 Subject: [PATCH 1/9] Add start to widget app name layout gravity This fixes the alignment issue in RTL. Seems like the default is start if layout_gravity isn't set, but if you set layout_gravity to center_vertical, you need to explicitly set start or it will go to the left. Bug: 188147009 Test: validated locally and in AS layout preview Change-Id: Ic4b4d7e6dfe03e1e6dd3ead5c3821e77261b4bb5 --- res/layout/widgets_list_row_header.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/layout/widgets_list_row_header.xml b/res/layout/widgets_list_row_header.xml index f20af87906..a0a04564b0 100644 --- a/res/layout/widgets_list_row_header.xml +++ b/res/layout/widgets_list_row_header.xml @@ -48,7 +48,7 @@ android:id="@+id/app_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" + android:layout_gravity="start|center_vertical" android:textColor="?android:attr/textColorPrimary" android:textSize="16sp" tools:text="App name" /> From 2ecf12625662df9eafebf8ad75298f693f098c2a Mon Sep 17 00:00:00 2001 From: vadimt Date: Fri, 14 May 2021 16:12:56 -0700 Subject: [PATCH 2/9] Removing @Stability flavors for unbundled. They can be accidentally used. Test: presubmit. Bug: 187761685 Change-Id: I0cf859a51fb708ed51ba2f9506ab76af42ee3d5c --- .../android/quickstep/DigitalWellBeingToastTest.java | 3 --- .../android/launcher3/util/rule/TestStabilityRule.java | 10 ---------- 2 files changed, 13 deletions(-) diff --git a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java b/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java index 2a7da7eca8..3e84a76695 100644 --- a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java +++ b/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java @@ -3,8 +3,6 @@ package com.android.quickstep; import static androidx.test.InstrumentationRegistry.getInstrumentation; import static com.android.launcher3.LauncherState.OVERVIEW; -import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT; -import static com.android.launcher3.util.rule.TestStabilityRule.UNBUNDLED_POSTSUBMIT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -18,7 +16,6 @@ import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; import com.android.launcher3.Launcher; -import com.android.launcher3.util.rule.TestStabilityRule; import com.android.quickstep.views.DigitalWellBeingToast; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.TaskView; diff --git a/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java b/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java index 61f5e05aa5..0e27b61b84 100644 --- a/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java +++ b/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java @@ -53,8 +53,6 @@ public class TestStabilityRule implements TestRule { + ")$"); public static final int LOCAL = 0x1; - public static final int UNBUNDLED_PRESUBMIT = 0x2; - public static final int UNBUNDLED_POSTSUBMIT = 0x4; public static final int PLATFORM_PRESUBMIT = 0x8; public static final int PLATFORM_POSTSUBMIT = 0x10; @@ -136,14 +134,6 @@ public class TestStabilityRule implements TestRule { platformBuildMatcher.group("postsubmit") != null)) { Log.d(TAG, "LOCAL RUN"); sRunFlavor = LOCAL; - } else if (launcherBuildMatcher.group("presubmit") != null - && platformBuildMatcher.group("postsubmit") != null) { - Log.d(TAG, "UNBUNDLED PRESUBMIT"); - sRunFlavor = UNBUNDLED_PRESUBMIT; - } else if (launcherBuildMatcher.group("postsubmit") != null - && platformBuildMatcher.group("postsubmit") != null) { - Log.d(TAG, "UNBUNDLED POSTSUBMIT"); - sRunFlavor = UNBUNDLED_POSTSUBMIT; } else if (launcherBuildMatcher.group("platform") != null && platformBuildMatcher.group("presubmit") != null) { Log.d(TAG, "PLATFORM PRESUBMIT"); From 05d3e86401567ddadadd387eca3b89da8f091d7a Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Fri, 14 May 2021 00:00:19 -0700 Subject: [PATCH 3/9] Fix searchbox font and other specs Bug: 187654557 Test: manual, see attached image on the bug Change-Id: I570df1bcc926258ca406810ea10b3d1fdd3cd2ec --- res/color/all_apps_tab_bg.xml | 19 +++++++++++++++++++ res/color/all_apps_tab_text.xml | 2 +- res/drawable/all_apps_tabs_background.xml | 2 +- res/values/dimens.xml | 6 +++--- res/values/styles.xml | 6 +++--- .../allapps/AllAppsContainerView.java | 4 +--- .../PersonalWorkSlidingTabStrip.java | 3 +-- 7 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 res/color/all_apps_tab_bg.xml diff --git a/res/color/all_apps_tab_bg.xml b/res/color/all_apps_tab_bg.xml new file mode 100644 index 0000000000..e59e8d2198 --- /dev/null +++ b/res/color/all_apps_tab_bg.xml @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/res/color/all_apps_tab_text.xml b/res/color/all_apps_tab_text.xml index 4ddb277163..2db0fb5d74 100644 --- a/res/color/all_apps_tab_text.xml +++ b/res/color/all_apps_tab_text.xml @@ -14,6 +14,6 @@ limitations under the License. --> - + \ No newline at end of file diff --git a/res/drawable/all_apps_tabs_background.xml b/res/drawable/all_apps_tabs_background.xml index ca2beec244..377b653781 100644 --- a/res/drawable/all_apps_tabs_background.xml +++ b/res/drawable/all_apps_tabs_background.xml @@ -16,6 +16,6 @@ - + \ No newline at end of file diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 26587d8a72..fd1a29c117 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -91,14 +91,14 @@ 144dp 700dp 475dp - 50dp - 48dp + 36dp + 18dp 48dp 2dp 36dp 16dp 20dp - 12dp + 32dp 1dp 8dp diff --git a/res/values/styles.xml b/res/values/styles.xml index fa41b1aaa2..7078febfee 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -213,8 +213,7 @@ .54 - -