Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch DocumentsUI over to use AppCompat themes.

Browse Source 
Switches from Material to AppCompat themes in order to start using
Snackbar.

Also, factor the common bits out of DocumentsNonDialogTheme and
FilesTheme, and make the theme names clearer.

BUG=23518578

Change-Id: I94a00e910469c57315823ae9df33024f2c7360ee
This commit is contained in:
Ben Kwa
2015-08-24 10:15:56 -07:00
parent 7534466318
commit a747d2e223
4 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/DocumentsUI/Android.mk
View File

@@ -5,9 +5,25 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 \
android-support-v7-recyclerview \
guava
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
# The design lib requires that the client package use appcompat themes.
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat
# Supplies material design components, e.g. Snackbar.
LOCAL_STATIC_JAVA_LIBRARIES += android-support-design
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview
LOCAL_STATIC_JAVA_LIBRARIES += guava
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
# Not quite sure why it is necessary to explicitly pull in resources from the
# appcompat lib, but the demo code indicates it's necessary (see
# development/samples/Support7Demos/Android.mk)
LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res
LOCAL_RESOURCE_DIR += frameworks/support/design/res
# Again, required to pull in appcompat resources. See abovementioned demo code.
LOCAL_AAPT_FLAGS := --auto-add-overlay
LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat
LOCAL_AAPT_FLAGS += --extra-packages android.support.design
LOCAL_PACKAGE_NAME := DocumentsUI
LOCAL_CERTIFICATE := platform

3
packages/DocumentsUI/res/layout/fixed_layout.xml
View File

@@ -25,7 +25,8 @@
android:layout_height="?android:attr/actionBarSize"
android:background="?android:attr/colorPrimary"
android:elevation="8dp"
android:theme="?android:attr/actionBarTheme">
android:theme="?actionBarTheme"
android:popupTheme="?actionBarPopupTheme">
<Spinner
android:id="@+id/stack"

2
packages/DocumentsUI/res/values-sw720dp/styles.xml
View File

@@ -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="DocumentsBaseTheme" parent="@*android:style/Theme.Material.DayNight.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>

39
packages/DocumentsUI/res/values/styles.xml
View File

@@ -16,12 +16,12 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="DialogWhenReallyLarge" parent="@android:style/Theme.Material.DayNight.DarkActionBar" />
<style name="DocumentsBaseTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar" />
<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>
<style name="DocumentsTheme" parent="@style/DocumentsBaseTheme">
<item name="actionBarWidgetTheme">@null</item>
<item name="actionBarTheme">@*android:style/ThemeOverlay.Material.Dark.ActionBar</item>
<item name="actionBarPopupTheme">@*android:style/ThemeOverlay.Material.Light</item>
<item name="android:colorPrimaryDark">@*android:color/material_blue_grey_900</item>
<item name="android:colorPrimary">@*android:color/material_blue_grey_800</item>
@@ -37,14 +37,10 @@
<item name="android:alertDialogTheme">@android:style/Theme.Material.Light.Dialog.Alert</item>
</style>
<style name="DocumentsNonDialogTheme" parent="@android:style/Theme.Material.DayNight.DarkActionBar">
<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>
<item name="android:colorPrimaryDark">@*android:color/material_blue_grey_900</item>
<item name="android:colorPrimary">@*android:color/material_blue_grey_800</item>
<item name="android:colorAccent">@*android:color/material_deep_teal_500</item>
<style name="DocumentsBaseTheme.FullScreen" parent="@style/Theme.AppCompat.Light.DarkActionBar">
<item name="actionBarWidgetTheme">@null</item>
<item name="actionBarTheme">@*android:style/ThemeOverlay.Material.Dark.ActionBar</item>
<item name="actionBarPopupTheme">@*android:style/ThemeOverlay.Material.Light</item>
<item name="android:listDivider">@*android:drawable/list_divider_material</item>
@@ -55,6 +51,12 @@
<item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
</style>
<style name="DocumentsNonDialogTheme" parent="@style/DocumentsBaseTheme.FullScreen">
<item name="android:colorPrimaryDark">@*android:color/material_blue_grey_900</item>
<item name="android:colorPrimary">@*android:color/material_blue_grey_800</item>
<item name="android:colorAccent">@*android:color/material_deep_teal_500</item>
</style>
<style name="ActionModeStyle" parent="@android:style/Widget.Material.Light.ActionMode">
<item name="android:background">@color/material_grey_600</item>
</style>
@@ -63,21 +65,12 @@
<item name="android:colorAccent">@color/material_blue_700</item>
</style>
<style name="FilesTheme" parent="@android:style/Theme.Material.DayNight.DarkActionBar">
<item name="android:actionBarWidgetTheme">@null</item>
<style name="FilesTheme" parent="@style/DocumentsBaseTheme.FullScreen">
<item name="android:colorPrimaryDark">@color/status_bar_background</item>
<item name="android:colorPrimary">@color/material_blue_500</item>
<item name="android:colorAccent">@color/material_blue_700</item>
<item name="android:actionModeStyle">@style/ActionModeStyle</item>
<item name="android:listDivider">@*android:drawable/list_divider_material</item>
<item name="android:windowActionBar">false</item>
<item name="android:windowActionModeOverlay">true</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
<item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
</style>