diff options
author | Jeff Sharkey <jsharkey@android.com> | 2014-08-05 10:14:45 -0700 |
---|---|---|
committer | Jeff Sharkey <jsharkey@google.com> | 2014-08-05 17:16:44 +0000 |
commit | f75eb0dd604304aacfd16fac818b08a7a0f03f36 (patch) | |
tree | b24dba1bb4c477f010c2189cfb56c1208e5775f5 /packages/DocumentsUI | |
parent | 96caa682792c54b5678f8d263a9bf445d623350b (diff) | |
download | frameworks_base-f75eb0dd604304aacfd16fac818b08a7a0f03f36.zip frameworks_base-f75eb0dd604304aacfd16fac818b08a7a0f03f36.tar.gz frameworks_base-f75eb0dd604304aacfd16fac818b08a7a0f03f36.tar.bz2 |
DocumentsUI is only dialog when really large.
Bug: 16780860
Change-Id: Ib20ef9771855beba5b31d19887c1c9c1b8e8e5ed
Diffstat (limited to 'packages/DocumentsUI')
-rw-r--r-- | packages/DocumentsUI/res/layout/fragment_directory.xml | 2 | ||||
-rw-r--r-- | packages/DocumentsUI/res/values-sw720dp/styles.xml | 21 | ||||
-rw-r--r-- | packages/DocumentsUI/res/values/styles.xml | 16 |
3 files changed, 25 insertions, 14 deletions
diff --git a/packages/DocumentsUI/res/layout/fragment_directory.xml b/packages/DocumentsUI/res/layout/fragment_directory.xml index ffbd3f0..c8c707e 100644 --- a/packages/DocumentsUI/res/layout/fragment_directory.xml +++ b/packages/DocumentsUI/res/layout/fragment_directory.xml @@ -26,7 +26,7 @@ android:gravity="center" android:text="@string/empty" android:visibility="gone" - style="@style/TextAppearance.Medium" /> + style="@android:style/TextAppearance.Material.Subhead" /> <ListView android:id="@+id/list" diff --git a/packages/DocumentsUI/res/values-sw720dp/styles.xml b/packages/DocumentsUI/res/values-sw720dp/styles.xml new file mode 100644 index 0000000..9968bb8 --- /dev/null +++ b/packages/DocumentsUI/res/values-sw720dp/styles.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + + <style name="DialogWhenReallyLarge" parent="@*android:style/Theme.DeviceDefault.Light.Dialog.FixedSize" /> + +</resources> diff --git a/packages/DocumentsUI/res/values/styles.xml b/packages/DocumentsUI/res/values/styles.xml index 4bd6991..573081c 100644 --- a/packages/DocumentsUI/res/values/styles.xml +++ b/packages/DocumentsUI/res/values/styles.xml @@ -16,7 +16,9 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="DocumentsTheme" parent="@android:style/Theme.DeviceDefault.Light.DialogWhenLarge"> + <style name="DialogWhenReallyLarge" parent="@android:style/Theme.DeviceDefault.Light" /> + + <style name="DocumentsTheme" parent="@style/DialogWhenReallyLarge"> <item name="android:actionBarWidgetTheme">@null</item> <item name="android:actionBarTheme">@*android:style/ThemeOverlay.Material.Dark.ActionBar</item> <item name="android:actionBarPopupTheme">@*android:style/ThemeOverlay.Material.Light</item> @@ -38,16 +40,4 @@ <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item> </style> - <style name="TextAppearance" /> - - <style name="TextAppearance.Medium"> - <item name="android:textAppearance">?android:attr/textAppearanceMedium</item> - <item name="android:textColor">?android:attr/textColorSecondary</item> - </style> - - <style name="TextAppearance.Small"> - <item name="android:textAppearance">?android:attr/textAppearanceSmall</item> - <item name="android:textColor">?android:attr/textColorTertiary</item> - </style> - </resources> |