Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-25 17:31:18 +00:00
committed by Android (Google) Code Review
parent 9ffa87552b d518135425
commit 60bf540e20
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/res/layout/volume_zen_footer.xml
View File

@@ -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"
@@ -128,4 +127,4 @@
android:textColor="?android:attr/colorAccent"
android:textAppearance="@style/TextAppearance.QS.DetailButton" />
</com.android.systemui.volume.ZenFooter>
</com.android.systemui.volume.ZenFooter>

3
packages/SystemUI/res/layout/zen_mode_panel.xml
View File

@@ -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"

2
packages/SystemUI/res/values/colors.xml
View File

@@ -146,4 +146,6 @@
<color name="instant_apps_color">#ff4d5a64</color>
<color name="zen_introduction">#ffffffff</color>
</resources>

3
packages/SystemUI/res/values/styles.xml
View File

@@ -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">

4
packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java
View File

@@ -111,7 +111,9 @@ public class ZenFooter extends LinearLayout {
if (mZen == zen) return;
mZen = zen;
update();
updateIntroduction();
post(() -> {
updateIntroduction();
});
}
private void setConfig(ZenModeConfig config) {