Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4514b9f authored by Tsung-Mao Fang's avatar Tsung-Mao Fang
Browse files

Fine tune background color for dual pane in homepage 

Follow the spec and change the background color.

Test: See the screen
Bug: 223329504
Change-Id: Ibcbf0e898ae949e1354f5af810a2347eba42b508
parent 4440e7a0

color-check-baseline.xml

+54 −6
Original line number Diff line number Diff line
@@ -3245,6 +3245,22 @@ 
            column="13"/>

    </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="            android:color=&quot;@color/homepage_network_background&quot; />"

        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/drawable/ic_homepage_data_usage.xml"

            line="24"

            column="13"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"
@@ -3453,6 +3469,22 @@ 
            column="13"/>

    </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="            android:color=&quot;@color/homepage_network_background&quot; />"

        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/drawable/ic_homepage_vpn.xml"

            line="24"

            column="13"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"
@@ -3469,6 +3501,22 @@ 
            column="13"/>

    </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="            android:color=&quot;@color/homepage_network_background&quot; />"

        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/drawable/ic_homepage_wifi_tethering.xml"

            line="24"

            column="13"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"
@@ -4521,7 +4569,7 @@ 
        errorLine2="                                                                                                                                                                         ~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values-en-rXC/strings.xml"

            line="3108"

            line="3144"

            column="170"/>

    </issue>
@@ -4537,7 +4585,7 @@ 
        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values-en-rAU/strings.xml"

            line="3112"

            line="3158"

            column="64"/>

    </issue>
@@ -4553,7 +4601,7 @@ 
        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values-en-rCA/strings.xml"

            line="3112"

            line="3158"

            column="64"/>

    </issue>
@@ -4569,7 +4617,7 @@ 
        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values-en-rGB/strings.xml"

            line="3112"

            line="3158"

            column="64"/>

    </issue>
@@ -4585,7 +4633,7 @@ 
        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values-en-rIN/strings.xml"

            line="3112"

            line="3158"

            column="64"/>

    </issue>
@@ -4601,7 +4649,7 @@ 
        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values/strings.xml"

            line="7103"

            line="7139"

            column="36"/>

    </issue>

res/color-night/settings_two_pane_background_color.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2022 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.

-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:color="@android:color/system_neutral1_500" android:lStar="5" />

</selector>
 
 No newline at end of file

res/color/settings_two_pane_background_color.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2022 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.

-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:color="@android:color/system_neutral1_500" android:lStar="87" />

</selector>
 
 No newline at end of file

res/layout/settings_homepage_app_bar_two_pane_layout.xml

+2 −3
Original line number Diff line number Diff line
@@ -17,11 +17,10 @@ 


<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:background="?androidprv:attr/colorSurface"

    android:orientation="vertical">

    android:orientation="vertical"

    android:background="@color/settings_two_pane_background_color">



    <FrameLayout

        android:id="@+id/two_pane_suggestion_content"

src/com/android/settings/homepage/SettingsHomepageActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements 


        final Window window = getWindow();

        final int color = mIsTwoPane

                ? Utils.getColorAttrDefaultColor(this, com.android.internal.R.attr.colorSurface)

                ? getColor(R.color.settings_two_pane_background_color)

                : Utils.getColorAttrDefaultColor(this, android.R.attr.colorBackground);



        window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);