diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-08-29 15:38:27 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2014-08-29 15:40:19 -0700 |
| commit | cbce47001e15be85b084c36a64c20039a0c4a667 (patch) | |
| tree | afc55b02a68a909194bc3dda03b785dc9f3160ec /packages/DocumentsUI/res/drawable | |
| parent | 73a821780334bc7972bca28d848cbce70cc3f825 (diff) | |
| download | frameworks_base-cbce47001e15be85b084c36a64c20039a0c4a667.zip frameworks_base-cbce47001e15be85b084c36a64c20039a0c4a667.tar.gz frameworks_base-cbce47001e15be85b084c36a64c20039a0c4a667.tar.bz2 | |
Final pass at Material DocumentsUI.
Now with treatment for disabled and selected grid items. Inverts
text and icons in selected drawer items. Follows upstream color
changes to accent color. Disables some verbose logging.
Bug: 15836082, 17281688
Change-Id: I97a1c055a2f1a537388a8f5669147618e9698870
Diffstat (limited to 'packages/DocumentsUI/res/drawable')
| -rw-r--r-- | packages/DocumentsUI/res/drawable/item_doc_grid_overlay.xml | 22 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/drawable/item_doc_grid_overlay_icon.xml (renamed from packages/DocumentsUI/res/drawable/grid_protect_background.xml) | 11 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/drawable/item_doc_list_background.xml (renamed from packages/DocumentsUI/res/drawable/item_activated_overlay.xml) | 8 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/drawable/item_root_background.xml (renamed from packages/DocumentsUI/res/drawable/item_activated.xml) | 0 |
4 files changed, 28 insertions, 13 deletions
diff --git a/packages/DocumentsUI/res/drawable/item_doc_grid_overlay.xml b/packages/DocumentsUI/res/drawable/item_doc_grid_overlay.xml new file mode 100644 index 0000000..3fbd25e --- /dev/null +++ b/packages/DocumentsUI/res/drawable/item_doc_grid_overlay.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2013 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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_focused="true" android:state_activated="true" android:drawable="@color/item_doc_grid_overlay_activated" /> + <item android:state_focused="false" android:state_activated="true" android:drawable="@color/item_doc_grid_overlay_activated" /> + <item android:state_enabled="false" android:drawable="@color/item_doc_grid_overlay_disabled" /> + <item android:drawable="@android:color/transparent" /> +</selector> diff --git a/packages/DocumentsUI/res/drawable/grid_protect_background.xml b/packages/DocumentsUI/res/drawable/item_doc_grid_overlay_icon.xml index 2e7aadd..d40de1e 100644 --- a/packages/DocumentsUI/res/drawable/grid_protect_background.xml +++ b/packages/DocumentsUI/res/drawable/item_doc_grid_overlay_icon.xml @@ -14,11 +14,8 @@ limitations under the License. --> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false"> - <color android:color="#88000000" /> - </item> - <item> - <color android:color="#88252525" /> - </item> +<selector xmlns:android="http://schemas.android.com/apk/res/android" android:constantSize="true"> + <item android:state_focused="true" android:state_activated="true" android:drawable="@drawable/ic_grid_selection_check" /> + <item android:state_focused="false" android:state_activated="true" android:drawable="@drawable/ic_grid_selection_check" /> + <item android:drawable="@android:color/transparent" /> </selector> diff --git a/packages/DocumentsUI/res/drawable/item_activated_overlay.xml b/packages/DocumentsUI/res/drawable/item_doc_list_background.xml index 83e4d7e..b879542 100644 --- a/packages/DocumentsUI/res/drawable/item_activated_overlay.xml +++ b/packages/DocumentsUI/res/drawable/item_doc_list_background.xml @@ -15,11 +15,7 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_focused="true" android:state_activated="true"> - <color android:color="@color/accent_color_overlay" /> - </item> - <item android:state_focused="false" android:state_activated="true"> - <color android:color="@color/accent_color_overlay" /> - </item> + <item android:state_focused="true" android:state_activated="true" android:drawable="@color/item_doc_list_background_activated" /> + <item android:state_focused="false" android:state_activated="true" android:drawable="@color/item_doc_list_background_activated" /> <item android:drawable="@android:color/transparent" /> </selector> diff --git a/packages/DocumentsUI/res/drawable/item_activated.xml b/packages/DocumentsUI/res/drawable/item_root_background.xml index 1b3f44a..1b3f44a 100644 --- a/packages/DocumentsUI/res/drawable/item_activated.xml +++ b/packages/DocumentsUI/res/drawable/item_root_background.xml |
