diff options
| author | Alan Viverette <alanv@google.com> | 2015-06-18 22:31:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-18 22:31:41 +0000 |
| commit | afc21d72d87390ed0b175c007248c32c5813d1ff (patch) | |
| tree | f2b7e000d8a8a01933b2b96d59a6669653e32387 /packages/DocumentsUI | |
| parent | fcff4c382dd0efe37f3e603820bf4a7077b65dba (diff) | |
| parent | f1da9a1401fe1304bee8a550a0141c79ecc3c0b3 (diff) | |
| download | frameworks_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/DocumentsUI')
| -rw-r--r-- | packages/DocumentsUI/res/values-sw720dp/styles.xml | 2 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/values/styles.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/DocumentsUI/res/values-sw720dp/styles.xml b/packages/DocumentsUI/res/values-sw720dp/styles.xml index 0b03a94..d7c031e 100644 --- a/packages/DocumentsUI/res/values-sw720dp/styles.xml +++ b/packages/DocumentsUI/res/values-sw720dp/styles.xml @@ -16,7 +16,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="DialogWhenReallyLarge" parent="@*android:style/Theme.Material.DayNight.Dialog"> + <style name="DialogWhenReallyLarge" parent="@*android:style/Theme.DeviceDefault.Light.Dialog"> <!-- We do not specify width of window here because the max size of floating window specified by windowFixedWidthis is limited. --> <item name="*android:windowFixedHeightMajor">80%</item> diff --git a/packages/DocumentsUI/res/values/styles.xml b/packages/DocumentsUI/res/values/styles.xml index 6d741aa..8c4b777 100644 --- a/packages/DocumentsUI/res/values/styles.xml +++ b/packages/DocumentsUI/res/values/styles.xml @@ -16,7 +16,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="DialogWhenReallyLarge" parent="@android:style/Theme.Material.DayNight.DarkActionBar" /> + <style name="DialogWhenReallyLarge" parent="@android:style/Theme.DeviceDefault.Light.DarkActionBar" /> <style name="DocumentsTheme" parent="@style/DialogWhenReallyLarge"> <item name="android:actionBarWidgetTheme">@null</item> |