diff options
Diffstat (limited to 'res/drawable')
-rw-r--r-- | res/drawable/all_apps_divider.xml | 2 | ||||
-rw-r--r-- | res/drawable/all_apps_search_hint.xml | 2 | ||||
-rw-r--r-- | res/drawable/bg_pill_focused.xml | 5 | ||||
-rw-r--r-- | res/drawable/deep_shortcuts_drag_handle.xml | 5 | ||||
-rw-r--r-- | res/drawable/ic_setting.xml | 2 | ||||
-rw-r--r-- | res/drawable/ic_wallpaper.xml | 2 | ||||
-rw-r--r-- | res/drawable/ic_widget.xml | 2 | ||||
-rw-r--r-- | res/drawable/quantum_panel.xml | 22 | ||||
-rw-r--r-- | res/drawable/quantum_panel_shape.xml | 22 |
9 files changed, 10 insertions, 54 deletions
diff --git a/res/drawable/all_apps_divider.xml b/res/drawable/all_apps_divider.xml index 3fe529556..4bd274dd4 100644 --- a/res/drawable/all_apps_divider.xml +++ b/res/drawable/all_apps_divider.xml @@ -15,6 +15,6 @@ --> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <solid android:color="@color/all_apps_divider_color" /> + <solid android:color="?android:attr/colorControlHighlight" /> <size android:height="1dp" /> </shape>
\ No newline at end of file diff --git a/res/drawable/all_apps_search_hint.xml b/res/drawable/all_apps_search_hint.xml index 36a0f0373..b2ff7a428 100644 --- a/res/drawable/all_apps_search_hint.xml +++ b/res/drawable/all_apps_search_hint.xml @@ -15,6 +15,6 @@ limitations under the License. --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="#00FFFFFF" android:state_focused="true" /> + <item android:color="@android:color/transparent" android:state_focused="true" /> <item android:color="?android:attr/colorAccent"/> </selector>
\ No newline at end of file diff --git a/res/drawable/bg_pill_focused.xml b/res/drawable/bg_pill_focused.xml index 37afad037..54075d92c 100644 --- a/res/drawable/bg_pill_focused.xml +++ b/res/drawable/bg_pill_focused.xml @@ -16,9 +16,8 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_focused="true"> - <shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <stroke android:color="#616161" android:width="2dp"/> + <shape android:shape="rectangle"> + <stroke android:color="?android:attr/colorControlActivated" android:width="2dp" /> <corners android:radius="@dimen/bg_pill_radius" /> </shape> </item> diff --git a/res/drawable/deep_shortcuts_drag_handle.xml b/res/drawable/deep_shortcuts_drag_handle.xml index 99d2b07a5..82e844d2d 100644 --- a/res/drawable/deep_shortcuts_drag_handle.xml +++ b/res/drawable/deep_shortcuts_drag_handle.xml @@ -18,9 +18,10 @@ android:width="@dimen/deep_shortcut_drag_handle_size" android:height="@dimen/deep_shortcut_drag_handle_size" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/textColorHint" > <path android:pathData="M20 9H4v2h16V9zM4 15h16v-2H4v2z" - android:fillColor="#4D000000"/> + android:fillColor="@android:color/white" /> </vector>
\ No newline at end of file diff --git a/res/drawable/ic_setting.xml b/res/drawable/ic_setting.xml index 8a50c0c78..e89c158c8 100644 --- a/res/drawable/ic_setting.xml +++ b/res/drawable/ic_setting.xml @@ -19,6 +19,6 @@ Copyright (C) 2016 The Android Open Source Project android:viewportWidth="48.0" android:viewportHeight="48.0"> <path - android:fillColor="#FFFFFFFF" + android:fillColor="@color/workspace_icon_text_color" android:pathData="M38.86 25.95c.08-.64 .14-1.29 .14-1.95s-.06-1.31-.14-1.95l4.23-3.31c.38-.3 .49-.84 .24-1.28l-4-6.93c-.25-.43-.77-.61-1.22-.43l-4.98 2.01c-1.03-.79-2.16-1.46-3.38-1.97L29 4.84c-.09-.47-.5-.84-1-.84h-8c-.5 0-.91 .37-.99 .84l-.75 5.3c-1.22 .51-2.35 1.17-3.38 1.97L9.9 10.1c-.45-.17-.97 0-1.22 .43l-4 6.93c-.25 .43-.14 .97 .24 1.28l4.22 3.31C9.06 22.69 9 23.34 9 24s.06 1.31 .14 1.95l-4.22 3.31c-.38 .3-.49 .84-.24 1.28l4 6.93c.25 .43 .77 .61 1.22 .43l4.98-2.01c1.03 .79 2.16 1.46 3.38 1.97l.75 5.3c.08 .47 .49 .84 .99 .84h8c.5 0 .91-.37 .99-.84l.75-5.3c1.22-.51 2.35-1.17 3.38-1.97l4.98 2.01c.45 .17 .97 0 1.22-.43l4-6.93c.25-.43 .14-.97-.24-1.28l-4.22-3.31zM24 31c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7 7-3.13 7-7 7z"/> </vector> diff --git a/res/drawable/ic_wallpaper.xml b/res/drawable/ic_wallpaper.xml index 7af4b2afc..b7fcfbf55 100644 --- a/res/drawable/ic_wallpaper.xml +++ b/res/drawable/ic_wallpaper.xml @@ -19,6 +19,6 @@ Copyright (C) 2016 The Android Open Source Project android:viewportWidth="48.0" android:viewportHeight="48.0"> <path - android:fillColor="#FFFFFFFF" + android:fillColor="@color/workspace_icon_text_color" android:pathData="M8 8h14V4H8C5.79 4 4 5.79 4 8v14h4V8zm12 18l-8 10h24l-6-8-4.06 5.42L20 26zm14-9c0-1.66-1.34-3-3-3s-3 1.34-3 3 1.34 3 3 3 3-1.34 3-3zm6-13H26v4h14v14h4V8c0-2.21-1.79-4-4-4zm0 36H26v4h14c2.21 0 4-1.79 4-4V26h-4v14zM8 26H4v14c0 2.21 1.79 4 4 4h14v-4H8V26z"/> </vector> diff --git a/res/drawable/ic_widget.xml b/res/drawable/ic_widget.xml index 3e7bd7b51..97706e36d 100644 --- a/res/drawable/ic_widget.xml +++ b/res/drawable/ic_widget.xml @@ -19,6 +19,6 @@ Copyright (C) 2016 The Android Open Source Project android:viewportWidth="48.0" android:viewportHeight="48.0"> <path - android:fillColor="#FFFFFFFF" + android:fillColor="@color/workspace_icon_text_color" android:pathData="M26 26v16h16V26H26zM6 42h16V26H6v16zM6 6v16h16V6H6zm27.31-2.63L22 14.69 33.31 26l11.31-11.31L33.31 3.37z"/> </vector> diff --git a/res/drawable/quantum_panel.xml b/res/drawable/quantum_panel.xml deleted file mode 100644 index fda100370..000000000 --- a/res/drawable/quantum_panel.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2015 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. ---> -<inset xmlns:android="http://schemas.android.com/apk/res/android" - android:drawable="@drawable/quantum_panel_shape" - android:insetBottom="@dimen/quantum_panel_outer_padding" - android:insetLeft="@dimen/quantum_panel_outer_padding" - android:insetRight="@dimen/quantum_panel_outer_padding" - android:insetTop="@dimen/quantum_panel_outer_padding" /> diff --git a/res/drawable/quantum_panel_shape.xml b/res/drawable/quantum_panel_shape.xml deleted file mode 100644 index 108361576..000000000 --- a/res/drawable/quantum_panel_shape.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2015 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. ---> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <solid android:color="@color/quantum_panel_bg_color" /> - <corners - android:radius="2dp" /> -</shape>
\ No newline at end of file |