diff options
| author | Alan Viverette <alanv@google.com> | 2014-05-21 17:23:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-21 17:23:55 +0000 |
| commit | 8f2d99b9ee02bf48c7605f6b7a3291dac5f42479 (patch) | |
| tree | 015bc1d541c885fa8013d28f6ec407a4a923bc0b /core/res | |
| parent | b01cb2c0c2eedf4ed6055eab15c7991c4321044f (diff) | |
| parent | 0a2242b18f4002b740d46ef3470ef47db17308f4 (diff) | |
| download | frameworks_base-8f2d99b9ee02bf48c7605f6b7a3291dac5f42479.zip frameworks_base-8f2d99b9ee02bf48c7605f6b7a3291dac5f42479.tar.gz frameworks_base-8f2d99b9ee02bf48c7605f6b7a3291dac5f42479.tar.bz2 | |
Merge "Quantum popup nine-patch with baked-in shadow"
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/drawable-hdpi/popup_background_qntm_mult.9.png | bin | 0 -> 1331 bytes | |||
| -rw-r--r-- | core/res/res/drawable-mdpi/popup_background_qntm_mult.9.png | bin | 0 -> 961 bytes | |||
| -rw-r--r-- | core/res/res/drawable-xhdpi/popup_background_qntm_mult.9.png | bin | 0 -> 2448 bytes | |||
| -rw-r--r-- | core/res/res/drawable-xxhdpi/popup_background_qntm_mult.9.png | bin | 0 -> 3652 bytes | |||
| -rw-r--r-- | core/res/res/drawable/popup_background_quantum.xml | 13 | ||||
| -rw-r--r-- | core/res/res/values/colors_quantum.xml | 6 |
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 Binary files differnew file mode 100644 index 0000000..385734e --- /dev/null +++ b/core/res/res/drawable-hdpi/popup_background_qntm_mult.9.png 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 Binary files differnew file mode 100644 index 0000000..e920499 --- /dev/null +++ b/core/res/res/drawable-mdpi/popup_background_qntm_mult.9.png 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 Binary files differnew file mode 100644 index 0000000..a081ceb --- /dev/null +++ b/core/res/res/drawable-xhdpi/popup_background_qntm_mult.9.png 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 Binary files differnew file mode 100644 index 0000000..fb7d715 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/popup_background_qntm_mult.9.png 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 --> |
