summaryrefslogtreecommitdiffstats
path: root/res/drawable
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-05-13 13:06:11 -0700
committerSunny Goyal <sunnygoyal@google.com>2015-05-14 11:14:09 -0700
commit5a92b2356f1c5f79207c4e9bd47d7b0b5bcf6f78 (patch)
tree1409c3e82e1a167373d666b3b567006780b82bd4 /res/drawable
parentdb1360dbbbc8e94a13be52debdb5395b1be5a32f (diff)
downloadandroid_packages_apps_Trebuchet-5a92b2356f1c5f79207c4e9bd47d7b0b5bcf6f78.tar.gz
android_packages_apps_Trebuchet-5a92b2356f1c5f79207c4e9bd47d7b0b5bcf6f78.tar.bz2
android_packages_apps_Trebuchet-5a92b2356f1c5f79207c4e9bd47d7b0b5bcf6f78.zip
Reodering some drawables
> quantum_panel_shape is xml rectangle with no margin > quantum_panel_bitmap is 9-patch drawable with inbuild shadow and margin > quantum_panel uses xml-shape for lollipop and 9-patch image for lower devices. It includes margin. For shadow, use elevation on lollipop > All drawables have _dark variant > Using #f5f5f5 for panel background, instead of #ffffff Change-Id: Ia7c6cea6d514ee3774fcf5fef6139650bdd53208
Diffstat (limited to 'res/drawable')
-rw-r--r--res/drawable/apps_list_search_bg.xml2
-rw-r--r--res/drawable/apps_search_bg.xml2
-rw-r--r--res/drawable/quantum_panel.xml18
-rw-r--r--res/drawable/quantum_panel_dark.xml18
-rw-r--r--res/drawable/quantum_panel_shape.xml (renamed from res/drawable/apps_list_bg.xml)2
-rw-r--r--res/drawable/quantum_panel_shape_dark.xml (renamed from res/drawable/apps_reveal_bg.xml)5
6 files changed, 42 insertions, 5 deletions
diff --git a/res/drawable/apps_list_search_bg.xml b/res/drawable/apps_list_search_bg.xml
index 63c4d5591..9bb6d81b2 100644
--- a/res/drawable/apps_list_search_bg.xml
+++ b/res/drawable/apps_list_search_bg.xml
@@ -16,7 +16,7 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
- <solid android:color="#ffffff" />
+ <solid android:color="@color/quantum_panel_bg_color" />
<corners
android:bottomLeftRadius="2dp"
android:bottomRightRadius="2dp" />
diff --git a/res/drawable/apps_search_bg.xml b/res/drawable/apps_search_bg.xml
index 405e8447c..57eb5825e 100644
--- a/res/drawable/apps_search_bg.xml
+++ b/res/drawable/apps_search_bg.xml
@@ -16,7 +16,7 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
- <solid android:color="#ffffff" />
+ <solid android:color="@color/quantum_panel_bg_color" />
<corners
android:topLeftRadius="2dp"
android:topRightRadius="2dp" />
diff --git a/res/drawable/quantum_panel.xml b/res/drawable/quantum_panel.xml
new file mode 100644
index 000000000..1f4fb711b
--- /dev/null
+++ b/res/drawable/quantum_panel.xml
@@ -0,0 +1,18 @@
+<?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.
+-->
+<nine-patch xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/quantum_panel_bitmap" />
diff --git a/res/drawable/quantum_panel_dark.xml b/res/drawable/quantum_panel_dark.xml
new file mode 100644
index 000000000..6642e78ac
--- /dev/null
+++ b/res/drawable/quantum_panel_dark.xml
@@ -0,0 +1,18 @@
+<?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.
+-->
+<nine-patch xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/quantum_panel_dark_bitmap" />
diff --git a/res/drawable/apps_list_bg.xml b/res/drawable/quantum_panel_shape.xml
index 0e56684b5..108361576 100644
--- a/res/drawable/apps_list_bg.xml
+++ b/res/drawable/quantum_panel_shape.xml
@@ -16,7 +16,7 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
- <solid android:color="#ffffff" />
+ <solid android:color="@color/quantum_panel_bg_color" />
<corners
android:radius="2dp" />
</shape> \ No newline at end of file
diff --git a/res/drawable/apps_reveal_bg.xml b/res/drawable/quantum_panel_shape_dark.xml
index 07505a596..c3821c416 100644
--- a/res/drawable/apps_reveal_bg.xml
+++ b/res/drawable/quantum_panel_shape_dark.xml
@@ -16,6 +16,7 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
- <solid android:color="#ffffff" />
- <corners android:radius="2dp" />
+ <solid android:color="@color/quantum_panel_bg_color_dark" />
+ <corners
+ android:radius="2dp" />
</shape> \ No newline at end of file