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

Merge "Update DocumentUI styles to match mocks."

Browse Source
This commit is contained in:
Ben Kwa
2015-10-30 15:13:15 +00:00
committed by Android (Google) Code Review
parent 6ccc46ad83 a7e9eb04e2
commit c11f46f416
6 changed files with 18 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/DocumentsUI/AndroidManifest.xml
View File

@@ -40,7 +40,7 @@
<activity
android:name=".ManageRootActivity"
android:theme="@style/DocumentsNonDialogTheme"
android:theme="@style/DocumentsFullScreenTheme"
android:icon="@drawable/ic_doc_text">
<intent-filter>
<action android:name="android.provider.action.MANAGE_ROOT" />
@@ -63,7 +63,7 @@
<activity
android:name=".FilesActivity"
android:theme="@style/FilesTheme"
android:theme="@style/DocumentsFullScreenTheme"
android:icon="@drawable/ic_files_app"
android:label="@string/files_label"
android:documentLaunchMode="intoExisting">

4
packages/DocumentsUI/res/color/item_doc_grid_overlay.xml
View File

@@ -15,10 +15,6 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_focused="true"
android:color="@color/platform_blue_a200"
android:alpha="0.1" />
<item
android:state_activated="true"
android:color="?android:attr/colorAccent"

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="DocumentsBaseTheme" parent="@style/Theme.AppCompat.Dialog">
<style name="DocumentsBaseTheme" parent="@style/Theme.AppCompat.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>

22
packages/DocumentsUI/res/values/colors.xml
View File

@@ -15,23 +15,15 @@
-->
<resources>
<color name="material_grey_50">#fffafafa</color>
<color name="material_grey_300">#ffeeeeee</color>
<color name="material_grey_600">#ff757575</color>
<color name="material_grey_800">#ff424242</color>
<color name="material_grey_400">#ffbdbdbd</color>
<color name="primary_dark">@*android:color/material_blue_grey_900</color>
<color name="primary">@*android:color/material_blue_grey_800</color>
<color name="accent">@*android:color/material_deep_teal_500</color>
<color name="platform_blue_100">#ffd0d9ff</color>
<color name="platform_blue_500">#ff5677fc</color>
<color name="platform_blue_700">#ff455ede</color>
<color name="platform_blue_a100">#ffa6baff</color>
<color name="platform_blue_a200">#ffff5177</color>
<color name="primary_dark">@*android:color/primary_dark_material_dark</color>
<color name="primary">@*android:color/material_blue_grey_900</color>
<color name="accent">@*android:color/accent_material_light</color>
<color name="action_mode">@color/material_grey_400</color>
<color name="directory_background">@color/material_grey_300</color>
<color name="item_doc_grid_background">#FFFFFFFF</color>
<color name="directory_background">@*android:color/material_grey_300</color>
<color name="item_doc_grid_background">@android:color/white</color>
<color name="item_doc_grid_protect_background">#88000000</color>
<color name="band_select_background">#88ffffff</color>
<color name="band_select_border">#44000000</color>

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

@@ -28,7 +28,7 @@
<item name="android:colorPrimaryDark">@color/primary_dark</item>
<item name="android:colorPrimary">@color/primary</item>
<item name="android:colorAccent">@color/accent</item>
<item name="colorActionMode">@color/material_grey_800</item>
<item name="colorActionMode">@color/action_mode</item>
<item name="android:listDivider">@*android:drawable/list_divider_material</item>
@@ -37,14 +37,17 @@
<item name="android:windowNoTitle">true</item>
<item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
<item name="android:alertDialogTheme">@android:style/Theme.Material.Light.Dialog.Alert</item>
</style>
<style name="DocumentsBaseTheme.FullScreen" parent="@style/Theme.AppCompat.Light.DarkActionBar">
<style name="DocumentsFullScreenTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
<item name="actionBarWidgetTheme">@null</item>
<item name="actionBarTheme">@style/ActionBarTheme</item>
<item name="actionBarPopupTheme">@style/ActionBarPopupTheme</item>
<item name="colorActionMode">@color/material_grey_800</item>
<item name="android:colorPrimaryDark">@color/primary_dark</item>
<item name="android:colorPrimary">@color/primary</item>
<item name="android:colorAccent">@color/accent</item>
<item name="colorActionMode">@color/action_mode</item>
<item name="android:listDivider">@*android:drawable/list_divider_material</item>
@@ -55,38 +58,6 @@
<item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
</style>
<style name="DocumentsNonDialogTheme" parent="@style/DocumentsBaseTheme.FullScreen">
<item name="android:colorPrimaryDark">@color/primary_dark</item>
<item name="android:colorPrimary">@color/primary</item>
<item name="android:colorAccent">@color/accent</item>
<item name="android:actionModeStyle">@style/ActionModeStyle</item>
<item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
</style>
<style name="ActionModeStyle" parent="@android:style/Widget.Material.Light.ActionMode">
<item name="android:background">@color/material_grey_600</item>
</style>
<style name="AlertDialogTheme" parent="@android:style/Theme.Material.Light.Dialog.Alert">
<item name="android:colorAccent">@color/platform_blue_700</item>
</style>
<style name="FilesTheme" parent="@style/DocumentsBaseTheme.FullScreen">
<item name="android:colorPrimaryDark">@color/platform_blue_700</item>
<item name="android:colorPrimary">@color/platform_blue_500</item>
<item name="android:colorAccent">@color/platform_blue_700</item>
<item name="colorControlActivated">@color/platform_blue_a100</item>
<item name="android:actionModeStyle">@style/FilesActionModeStyle</item>
<item name="colorActionMode">@color/platform_blue_700</item>
<item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
</style>
<style name="FilesActionModeStyle" parent="@android:style/Widget.Material.Light.ActionMode">
<item name="android:background">@color/platform_blue_100</item>
</style>
<style name="TrimmedHorizontalProgressBar" parent="android:Widget.Material.ProgressBar.Horizontal">
<item name="android:indeterminateDrawable">@drawable/progress_indeterminate_horizontal_material_trimmed</item>
<item name="android:minHeight">3dp</item>

2
packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
View File

@@ -86,7 +86,7 @@ public class DocumentsActivity extends BaseActivity {
mShowAsDialog = res.getBoolean(R.bool.show_as_dialog);
if (!mShowAsDialog) {
setTheme(R.style.DocumentsNonDialogTheme);
setTheme(R.style.DocumentsFullScreenTheme);
}
if (mShowAsDialog) {