Merge "Quantum popup nine-patch with baked-in shadow"

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" />

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 -->