summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2014-07-24 15:46:35 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2014-07-24 15:46:35 -0700
commite20e169bbe634540de18391f268d2933bc24670a (patch)
tree74a93031e79248ec8856044017e2c3471cf8ce78 /AndroidManifest.xml
parente3ff4d8e92a19473c622c1d46b30c63bf2d001d0 (diff)
downloadpackages_apps_Settings-e20e169bbe634540de18391f268d2933bc24670a.tar.gz
packages_apps_Settings-e20e169bbe634540de18391f268d2933bc24670a.tar.bz2
packages_apps_Settings-e20e169bbe634540de18391f268d2933bc24670a.zip
More fixes for QuickLaunchSettings
- use DialogWhenLarge on tabletUI - update layouts for following Material theme Change-Id: If7aa153168eae9d2e72c50e4ae38bcd2fa6bb4bd
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml7
1 files changed, 5 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0783c654e..fa95e9d79 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1149,7 +1149,8 @@
</activity>
<activity android:name="Settings$QuickLaunchSettingsActivity"
- android:label="@string/quick_launch_title">
+ android:label="@string/quick_launch_title"
+ android:theme="@style/Theme.SubSettingsDialogWhenLarge">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.QUICK_LAUNCH_SETTINGS" />
@@ -1163,7 +1164,9 @@
android:value="true" />
</activity>
- <activity android:name=".quicklaunch.BookmarkPicker" android:label="@string/quick_launch_title">
+ <activity android:name=".quicklaunch.BookmarkPicker"
+ android:label="@string/quick_launch_title"
+ android:theme="@style/Theme.SubSettingsDialogWhenLarge">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.VOICE_LAUNCH" />