summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-05-20 22:54:37 -0700
committerAlan Viverette <alanv@google.com>2014-05-20 22:54:37 -0700
commit0a2242b18f4002b740d46ef3470ef47db17308f4 (patch)
tree5676d0c82c900a2153a0f0ff84f3d61ddd32aae0 /core/res
parent193909da71a342519ad640d157c122a38b6d1a3e (diff)
downloadframeworks_base-0a2242b18f4002b740d46ef3470ef47db17308f4.zip
frameworks_base-0a2242b18f4002b740d46ef3470ef47db17308f4.tar.gz
frameworks_base-0a2242b18f4002b740d46ef3470ef47db17308f4.tar.bz2
Quantum popup nine-patch with baked-in shadow
Also updates background color for Quantum dark so that the shadow is visible against the background. BUG: 15120387 Change-Id: I19bf176491b5f2b82f9a38afe9593cb6e5592623
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/drawable-hdpi/popup_background_qntm_mult.9.pngbin0 -> 1331 bytes
-rw-r--r--core/res/res/drawable-mdpi/popup_background_qntm_mult.9.pngbin0 -> 961 bytes
-rw-r--r--core/res/res/drawable-xhdpi/popup_background_qntm_mult.9.pngbin0 -> 2448 bytes
-rw-r--r--core/res/res/drawable-xxhdpi/popup_background_qntm_mult.9.pngbin0 -> 3652 bytes
-rw-r--r--core/res/res/drawable/popup_background_quantum.xml13
-rw-r--r--core/res/res/values/colors_quantum.xml6
6 files changed, 7 insertions, 12 deletions
diff --git a/core/res/res/drawable-hdpi/popup_background_qntm_mult.9.png b/core/res/res/drawable-hdpi/popup_background_qntm_mult.9.png
new file mode 100644
index 0000000..385734e
--- /dev/null
+++ b/core/res/res/drawable-hdpi/popup_background_qntm_mult.9.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/popup_background_qntm_mult.9.png b/core/res/res/drawable-mdpi/popup_background_qntm_mult.9.png
new file mode 100644
index 0000000..e920499
--- /dev/null
+++ b/core/res/res/drawable-mdpi/popup_background_qntm_mult.9.png
Binary files differ
diff --git a/core/res/res/drawable-xhdpi/popup_background_qntm_mult.9.png b/core/res/res/drawable-xhdpi/popup_background_qntm_mult.9.png
new file mode 100644
index 0000000..a081ceb
--- /dev/null
+++ b/core/res/res/drawable-xhdpi/popup_background_qntm_mult.9.png
Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/popup_background_qntm_mult.9.png b/core/res/res/drawable-xxhdpi/popup_background_qntm_mult.9.png
new file mode 100644
index 0000000..fb7d715
--- /dev/null
+++ b/core/res/res/drawable-xxhdpi/popup_background_qntm_mult.9.png
Binary files differ
diff --git a/core/res/res/drawable/popup_background_quantum.xml b/core/res/res/drawable/popup_background_quantum.xml
index 7e5b003..a4d0291 100644
--- a/core/res/res/drawable/popup_background_quantum.xml
+++ b/core/res/res/drawable/popup_background_quantum.xml
@@ -14,12 +14,7 @@
limitations under the License.
-->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle">
-
- <corners
- android:radius="2dp" />
- <solid
- android:color="?attr/colorBackground" />
-
-</shape>
+<nine-patch xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/popup_background_qntm_mult"
+ android:tint="?attr/colorBackground"
+ android:tintMode="multiply" />
diff --git a/core/res/res/values/colors_quantum.xml b/core/res/res/values/colors_quantum.xml
index 7171450..556463e 100644
--- a/core/res/res/values/colors_quantum.xml
+++ b/core/res/res/values/colors_quantum.xml
@@ -16,11 +16,11 @@
<!-- Colors specific to Quantum themes. -->
<resources>
- <color name="background_quantum_dark">@color/black</color>
+ <color name="background_quantum_dark">#ff303030</color>
<color name="background_quantum_light">@color/white</color>
- <color name="bright_foreground_quantum_dark">@color/background_quantum_light</color>
- <color name="bright_foreground_quantum_light">@color/background_quantum_dark</color>
+ <color name="bright_foreground_quantum_dark">@color/white</color>
+ <color name="bright_foreground_quantum_light">@color/black</color>
<!-- TODO: This is 50% alpha black -->
<color name="bright_foreground_disabled_quantum_dark">#80000000</color>
<!-- TODO: This is 50% alpha white -->