summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res/layout
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-08-28 13:30:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-28 13:30:31 +0000
commitd7a94b354570976626f2eb1bc43ba2778c33dd4c (patch)
tree1f38ada0e94b0e71c61a1ce27fc2a1bc85ae0f37 /packages/SystemUI/res/layout
parent7b8b560e3fa7687e45994e64b51e0f7a0bc1ac9e (diff)
parent8f8ecd620c796834a1048ec98f0e8072f5ad926c (diff)
downloadframeworks_base-d7a94b354570976626f2eb1bc43ba2778c33dd4c.zip
frameworks_base-d7a94b354570976626f2eb1bc43ba2778c33dd4c.tar.gz
frameworks_base-d7a94b354570976626f2eb1bc43ba2778c33dd4c.tar.bz2
Merge "Zen: Remove alarm warnings, color the subhead instead." into lmp-dev
Diffstat (limited to 'packages/SystemUI/res/layout')
-rw-r--r--packages/SystemUI/res/layout/zen_mode_panel.xml10
1 files changed, 0 insertions, 10 deletions
diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml
index 3949d7d..14bf10e 100644
--- a/packages/SystemUI/res/layout/zen_mode_panel.xml
+++ b/packages/SystemUI/res/layout/zen_mode_panel.xml
@@ -88,14 +88,4 @@
android:orientation="vertical"
android:paddingBottom="@dimen/qs_panel_padding" />
- <TextView
- android:id="@+id/zen_alarm_warning"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/qs_panel_padding"
- android:paddingLeft="@dimen/qs_panel_padding"
- android:paddingRight="@dimen/qs_panel_padding"
- android:paddingTop="4dp"
- android:paddingBottom="4dp"
- android:textAppearance="@style/TextAppearance.QS.Subhead" />
</com.android.systemui.volume.ZenModePanel>