summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res/layout
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2014-09-10 15:00:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-10 15:00:31 +0000
commit0875a782ad6688407050592dd32169d7a8f0716a (patch)
treef944f8a68413a481d7761d88eb9f50091e88fb83 /packages/SystemUI/res/layout
parentc8e4fa41f22cc23937a8660992ee60502ed6e13f (diff)
parente2f4771a0105ad6a94ff759353ca00c3a5fba72a (diff)
downloadframeworks_base-0875a782ad6688407050592dd32169d7a8f0716a.zip
frameworks_base-0875a782ad6688407050592dd32169d7a8f0716a.tar.gz
frameworks_base-0875a782ad6688407050592dd32169d7a8f0716a.tar.bz2
Merge "Update zen mode and qs strings on locale change" into lmp-dev
Diffstat (limited to 'packages/SystemUI/res/layout')
-rw-r--r--packages/SystemUI/res/layout/qs_detail.xml4
1 files changed, 1 insertions, 3 deletions
diff --git a/packages/SystemUI/res/layout/qs_detail.xml b/packages/SystemUI/res/layout/qs_detail.xml
index 5cdf819..2eb99ba 100644
--- a/packages/SystemUI/res/layout/qs_detail.xml
+++ b/packages/SystemUI/res/layout/qs_detail.xml
@@ -40,7 +40,6 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:minWidth="132dp"
- android:text="@string/quick_settings_more_settings"
android:textAppearance="@style/TextAppearance.QS.DetailButton"
android:focusable="true" />
@@ -50,9 +49,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="88dp"
- android:text="@string/quick_settings_done"
android:textAppearance="@style/TextAppearance.QS.DetailButton"
android:focusable="true"/>
</LinearLayout>
-</LinearLayout> \ No newline at end of file
+</LinearLayout>