Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916 Change-Id: I1aaac6f95b1821c08a59cabda22f84f69bfb3051 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 02:19:39 +00:00
parent 9f55b55639 22d3116188
commit ae04daac19
8 changed files with 185 additions and 33 deletions
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -1581,6 +1581,22 @@
            column="5"/>
    </issue>

+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;switch_bar_state_disabled_color&quot;>#1FE3E3E3&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-night/colors.xml"
+            line="76"
+            column="5"/>
+    </issue>
+
    <issue
        id="HardCodedColor"
        severity="Error"
@@ -2957,6 +2973,22 @@
            column="5"/>
    </issue>

+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;switch_bar_state_disabled_color&quot;>#1F1F1F1F&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="219"
+            column="5"/>
+    </issue>
+
    <issue
        id="HardCodedColor"
        severity="Error"
@@ -6253,6 +6285,38 @@
            column="63"/>
    </issue>

+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            &lt;solid android:color=&quot;@color/switch_bar_state_disabled_color&quot;/>"
+        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/switch_bar_bg_disabled.xml"
+            line="22"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            &lt;solid android:color=&quot;@color/switch_bar_state_disabled_color&quot;/>"
+        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/switch_bar_bg_disabled.xml"
+            line="22"
+            column="20"/>
+    </issue>
+
    <issue
        id="HardCodedColor"
        severity="Error"
--- a/res/drawable/switch_bar_bg_disabled.xml
+++ b/res/drawable/switch_bar_bg_disabled.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2023 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.
+  -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/switch_bar_state_disabled_color"/>
+            <corners android:radius="@dimen/settingslib_switch_bar_radius"/>
+        </shape>
+    </item>
+</ripple>
--- a/res/layout/flash_notification_preview_preference.xml
+++ b/res/layout/flash_notification_preview_preference.xml
@@ -24,6 +24,7 @@
    android:background="@android:color/transparent">

    <FrameLayout
+        android:id="@+id/frame"
        android:layout_height="wrap_content"
        android:layout_width="match_parent"
        android:paddingStart="@dimen/settingslib_switchbar_padding_left"
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -71,5 +71,8 @@
    <!-- Flash notifications colors -->
    <!-- Screen flash notification color selected stroke in color selection dialog -->
    <color name="screen_flash_color_button_outer_circle_stroke_color">#FFFFFF</color>
+
+    <!-- Switch bar disabled state color-->
+    <color name="switch_bar_state_disabled_color">#1FE3E3E3</color>
 </resources>

--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -214,4 +214,7 @@
    <color name="screen_flash_preset_opacity_color_10">#4DFF017E</color> <!-- 30% Rose -->
    <color name="screen_flash_preset_opacity_color_11">#4DFF00FE</color> <!-- 30% Magenta -->
    <color name="screen_flash_preset_opacity_color_12">#667F00FF</color> <!-- 40% Violet -->
+
+    <!-- Switch bar disabled state color-->
+    <color name="switch_bar_state_disabled_color">#1F1F1F1F</color>
 </resources>
--- a/src/com/android/settings/accessibility/FlashNotificationsPreviewPreference.java
+++ b/src/com/android/settings/accessibility/FlashNotificationsPreviewPreference.java
@@ -17,16 +17,26 @@
 package com.android.settings.accessibility;

 import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;

+import androidx.annotation.ColorInt;
 import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;

 import com.android.settings.R;
+import com.android.settingslib.Utils;

 /**
 * Preference for Flash notifications preview.
 */
 public class FlashNotificationsPreviewPreference extends Preference {
+    private Drawable mBackgroundEnabled;
+    private Drawable mBackgroundDisabled;
+    @ColorInt
+    private int mTextColorDisabled;

    public FlashNotificationsPreviewPreference(Context context) {
        super(context);
@@ -52,5 +62,32 @@ public class FlashNotificationsPreviewPreference extends Preference {

    private void init() {
        setLayoutResource(R.layout.flash_notification_preview_preference);
+        mBackgroundEnabled = getContext().getDrawable(R.drawable.settingslib_switch_bar_bg_on);
+        mBackgroundDisabled = getContext().getDrawable(R.drawable.switch_bar_bg_disabled);
+        mTextColorDisabled = Utils.getColorAttrDefaultColor(getContext(),
+                android.R.attr.textColorPrimary);
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+
+        final boolean enabled = isEnabled();
+        final View frame = holder.findViewById(R.id.frame);
+        if (frame != null) {
+            frame.setBackground(enabled ? mBackgroundEnabled : mBackgroundDisabled);
+        }
+        final TextView title = (TextView) holder.findViewById(android.R.id.title);
+        if (title != null) {
+            @ColorInt final int textColorEnabled = title.getCurrentTextColor();
+            title.setAlpha(enabled ? 1f : 0.38f);
+            title.setTextColor(enabled ? textColorEnabled : mTextColorDisabled);
+        }
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        notifyChanged();
    }
 }
--- a/src/com/android/settings/accessibility/FlashNotificationsPreviewPreferenceController.java
+++ b/src/com/android/settings/accessibility/FlashNotificationsPreviewPreferenceController.java
@@ -55,7 +55,7 @@ public class FlashNotificationsPreviewPreferenceController extends
            new Handler(Looper.getMainLooper())) {
        @Override
        public void onChange(boolean selfChange, @Nullable Uri uri) {
-            onSettingChanged();
+            updateState(mPreference);
        }
    };

@@ -73,7 +73,7 @@ public class FlashNotificationsPreviewPreferenceController extends
    public void displayPreference(PreferenceScreen screen) {
        super.displayPreference(screen);
        mPreference = screen.findPreference(getPreferenceKey());
-        onSettingChanged();
+        updateState(mPreference);
    }

    @Override
@@ -103,10 +103,13 @@ public class FlashNotificationsPreviewPreferenceController extends
        }
    }

-    private void onSettingChanged() {
-        if (mPreference == null) return;
-
-        mPreference.setEnabled(FlashNotificationsUtil.getFlashNotificationsState(mContext)
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        if (preference == null) {
+            return;
+        }
+        preference.setEnabled(FlashNotificationsUtil.getFlashNotificationsState(mContext)
                != FlashNotificationsUtil.State.OFF);
    }
 }
--- a/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreviewPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreviewPreferenceTest.java
@@ -19,20 +19,26 @@ package com.android.settings.accessibility;
 import static com.google.common.truth.Truth.assertThat;

 import android.content.Context;
-import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;

+import androidx.annotation.ColorInt;
+import androidx.preference.PreferenceViewHolder;
 import androidx.test.core.app.ApplicationProvider;

 import com.android.settings.R;
+import com.android.settingslib.Utils;

+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
-import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.Shadows;

@RunWith(RobolectricTestRunner.class)
 public class FlashNotificationsPreviewPreferenceTest {
@@ -41,37 +47,46 @@ public class FlashNotificationsPreviewPreferenceTest {
    public MockitoRule mMockitoRule = MockitoJUnit.rule();
    @Spy
    private final Context mContext = ApplicationProvider.getApplicationContext();
-    private final AttributeSet mAttributeSet = Robolectric.buildAttributeSet().build();
+    private FlashNotificationsPreviewPreference mFlashNotificationsPreviewPreference;
+    private PreferenceViewHolder mPreferenceViewHolder;

-    @Test
-    public void constructor_assertLayoutResource_P00() {
-        FlashNotificationsPreviewPreference preference = new FlashNotificationsPreviewPreference(
-                mContext);
-        assertThat(preference.getLayoutResource())
-                .isEqualTo(R.layout.flash_notification_preview_preference);
+    @Before
+    public void setUp() {
+        mPreferenceViewHolder = PreferenceViewHolder.createInstanceForTests(
+                LayoutInflater.from(mContext).inflate(
+                        R.layout.flash_notification_preview_preference, null));
+        mFlashNotificationsPreviewPreference = new FlashNotificationsPreviewPreference(mContext);
    }

    @Test
-    public void constructor_assertLayoutResource_P01() {
-        FlashNotificationsPreviewPreference preference = new FlashNotificationsPreviewPreference(
-                mContext, mAttributeSet);
-        assertThat(preference.getLayoutResource())
-                .isEqualTo(R.layout.flash_notification_preview_preference);
+    public void setEnabled_true_verifyEnabledUi() {
+        @ColorInt final int textColorEnabled = ((TextView) mPreferenceViewHolder.findViewById(
+                android.R.id.title)).getCurrentTextColor();
+
+        mFlashNotificationsPreviewPreference.setEnabled(true);
+        mFlashNotificationsPreviewPreference.onBindViewHolder(mPreferenceViewHolder);
+
+        final View frame = mPreferenceViewHolder.findViewById(R.id.frame);
+        final int backgroundResId = Shadows.shadowOf(frame.getBackground()).getCreatedFromResId();
+        assertThat(backgroundResId).isEqualTo(R.drawable.settingslib_switch_bar_bg_on);
+        final TextView title = (TextView) mPreferenceViewHolder.findViewById(android.R.id.title);
+        assertThat(title.getAlpha()).isEqualTo(1f);
+        assertThat(title.getCurrentTextColor()).isEqualTo(textColorEnabled);
    }

    @Test
-    public void constructor_assertLayoutResource_P02() {
-        FlashNotificationsPreviewPreference preference = new FlashNotificationsPreviewPreference(
-                mContext, mAttributeSet, 0);
-        assertThat(preference.getLayoutResource())
-                .isEqualTo(R.layout.flash_notification_preview_preference);
-    }
+    public void setEnabled_false_verifyDisabledUi() {
+        @ColorInt final int textColorDisabled = Utils.getColorAttrDefaultColor(mContext,
+                android.R.attr.textColorPrimary);

-    @Test
-    public void constructor_assertLayoutResource_P03() {
-        FlashNotificationsPreviewPreference preference = new FlashNotificationsPreviewPreference(
-                mContext, mAttributeSet, 0, 0);
-        assertThat(preference.getLayoutResource())
-                .isEqualTo(R.layout.flash_notification_preview_preference);
+        mFlashNotificationsPreviewPreference.setEnabled(false);
+        mFlashNotificationsPreviewPreference.onBindViewHolder(mPreferenceViewHolder);
+
+        final View frame = mPreferenceViewHolder.findViewById(R.id.frame);
+        final int backgroundResId = Shadows.shadowOf(frame.getBackground()).getCreatedFromResId();
+        assertThat(backgroundResId).isEqualTo(R.drawable.switch_bar_bg_disabled);
+        final TextView title = (TextView) mPreferenceViewHolder.findViewById(android.R.id.title);
+        assertThat(title.getAlpha()).isEqualTo(0.38f);
+        assertThat(title.getCurrentTextColor()).isEqualTo(textColorDisabled);
    }
-}
+}