summaryrefslogtreecommitdiffstats
path: root/packages/VpnDialogs
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-06-18 22:31:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-18 22:31:41 +0000
commitafc21d72d87390ed0b175c007248c32c5813d1ff (patch)
treef2b7e000d8a8a01933b2b96d59a6669653e32387 /packages/VpnDialogs
parentfcff4c382dd0efe37f3e603820bf4a7077b65dba (diff)
parentf1da9a1401fe1304bee8a550a0141c79ecc3c0b3 (diff)
downloadframeworks_base-afc21d72d87390ed0b175c007248c32c5813d1ff.zip
frameworks_base-afc21d72d87390ed0b175c007248c32c5813d1ff.tar.gz
frameworks_base-afc21d72d87390ed0b175c007248c32c5813d1ff.tar.bz2
am f1da9a14: Merge "DO NOT MERGE: Remove DayNight theme" into mnc-dev
* commit 'f1da9a1401fe1304bee8a550a0141c79ecc3c0b3': DO NOT MERGE: Remove DayNight theme
Diffstat (limited to 'packages/VpnDialogs')
-rw-r--r--packages/VpnDialogs/AndroidManifest.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/VpnDialogs/AndroidManifest.xml b/packages/VpnDialogs/AndroidManifest.xml
index 32e1e6d..375c5d8 100644
--- a/packages/VpnDialogs/AndroidManifest.xml
+++ b/packages/VpnDialogs/AndroidManifest.xml
@@ -24,7 +24,7 @@
<application android:label="VpnDialogs"
android:allowBackup="false" >
<activity android:name=".ConfirmDialog"
- android:theme="@*android:style/Theme.Material.DayNight.Dialog.Alert">
+ android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.DEFAULT"/>
@@ -32,7 +32,7 @@
</activity>
<activity android:name=".ManageDialog"
- android:theme="@*android:style/Theme.Material.DayNight.Dialog.Alert"
+ android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"
android:noHistory="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>