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

Commit cbd64a7e authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Zen introduction text updates" into oc-dr1-dev 

am: 60bf540e

Change-Id: I3d094ed410060fd2ccb223a16020493f8893d88f
parents 68a0dafc 60bf540e

packages/SystemUI/res/layout/volume_zen_footer.xml

+2 −3
Original line number Diff line number Diff line
@@ -51,8 +51,7 @@ 
            android:clickable="true"

            android:contentDescription="@string/accessibility_desc_close"

            android:scaleType="center"

            android:src="@drawable/ic_close"

            android:tint="@android:color/white" />

            android:src="@drawable/ic_close_white" />



        <TextView

            android:id="@+id/zen_introduction_message"

packages/SystemUI/res/layout/zen_mode_panel.xml

+1 −2
Original line number Diff line number Diff line
@@ -59,8 +59,7 @@ 
                android:clickable="true"

                android:contentDescription="@string/accessibility_desc_close"

                android:scaleType="center"

                android:src="@drawable/ic_close"

                android:tint="@android:color/white" />

                android:src="@drawable/ic_close_white" />



            <TextView

                android:id="@+id/zen_introduction_message"

packages/SystemUI/res/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -146,4 +146,6 @@ 


    <color name="instant_apps_color">#ff4d5a64</color>



    <color name="zen_introduction">#ffffffff</color>



</resources>

packages/SystemUI/res/values/styles.xml

+2 −1
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ 


    <style name="TextAppearance.QS.Introduction">

        <item name="android:textSize">14sp</item>

        <item name="android:textColor">@color/zen_introduction</item>

    </style>



    <style name="TextAppearance.QS.Warning">
@@ -236,7 +237,7 @@ 
    </style>



    <style name="TextAppearance.QS.DetailButton.White">

        <item name="android:textColor">@color/qs_detail_button_white</item>

        <item name="android:textColor">@color/zen_introduction</item>

    </style>



    <style name="TextAppearance.QS.DetailEmpty">

packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java

+3 −1
Original line number Diff line number Diff line
@@ -111,7 +111,9 @@ public class ZenFooter extends LinearLayout { 
        if (mZen == zen) return;

        mZen = zen;

        update();

        post(() -> {

            updateIntroduction();

        });

    }



    private void setConfig(ZenModeConfig config) {