Merge changes Ib8665f2f,I88014da4 into android-8.1
* changes:
vendor: Poor Man themes: add zen introduction color
vendor: poor man themes: make Gboard dialog themable
diff --git a/config/packages.mk b/config/packages.mk
index d12102f..ab932d2 100644
--- a/config/packages.mk
+++ b/config/packages.mk
@@ -57,7 +57,7 @@
SmokedGreenTheme \
Bl4ckAndYell0Theme \
OmniTheme \
- GboardDarkTheme
+ GboardOmniTheme
PRODUCT_PACKAGES += \
Launcher3Dark
diff --git a/google/themes/Bl4ckAndYell0/res/values/colors.xml b/google/themes/Bl4ckAndYell0/res/values/colors.xml
index 2dd075d..c9b5c8b 100644
--- a/google/themes/Bl4ckAndYell0/res/values/colors.xml
+++ b/google/themes/Bl4ckAndYell0/res/values/colors.xml
@@ -50,6 +50,7 @@
<!-- qs -->
<color name="material_grey_900">@*android:color/omni_color1</color> <!-- find a better way to do this -->
+ <color name="zen_introduction">@*android:color/omni_color1</color>
<!-- Dialogs -->
<color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
diff --git a/google/themes/DarknessMeister/res/values/colors.xml b/google/themes/DarknessMeister/res/values/colors.xml
index b47b1af..8a29312 100644
--- a/google/themes/DarknessMeister/res/values/colors.xml
+++ b/google/themes/DarknessMeister/res/values/colors.xml
@@ -50,6 +50,7 @@
<!-- qs -->
<color name="material_grey_900">@*android:color/omni_color1</color> <!-- find a better way to do this -->
+ <color name="zen_introduction">@*android:color/omni_color1</color>
<!-- Dialogs -->
<color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
diff --git a/google/themes/GboardDarkTheme/res/values-v21/colors.xml b/google/themes/GboardDarkTheme/res/values-v21/colors.xml
deleted file mode 100644
index 51b56ec..0000000
--- a/google/themes/GboardDarkTheme/res/values-v21/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <color name="language_picker_text_color">@android:color/white</color>
-
-</resources>
diff --git a/google/themes/GboardDarkTheme/Android.mk b/google/themes/GboardOmniTheme/Android.mk
similarity index 83%
rename from google/themes/GboardDarkTheme/Android.mk
rename to google/themes/GboardOmniTheme/Android.mk
index 3c7783e..13c94ee 100644
--- a/google/themes/GboardDarkTheme/Android.mk
+++ b/google/themes/GboardOmniTheme/Android.mk
@@ -3,7 +3,7 @@
LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := GBoardDarkTheme
+LOCAL_PACKAGE_NAME := GboardOmniTheme
LOCAL_SDK_VERSION := current
LOCAL_CERTIFICATE := platform
LOCAL_PRIVILEGED_MODULE := false
diff --git a/google/themes/GboardDarkTheme/AndroidManifest.xml b/google/themes/GboardOmniTheme/AndroidManifest.xml
similarity index 87%
rename from google/themes/GboardDarkTheme/AndroidManifest.xml
rename to google/themes/GboardOmniTheme/AndroidManifest.xml
index b139d81..3c59f97 100644
--- a/google/themes/GboardDarkTheme/AndroidManifest.xml
+++ b/google/themes/GboardOmniTheme/AndroidManifest.xml
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.gboard.theme.dark"
+ package="com.android.gboard.theme.omni"
android:versionCode="1"
android:versionName="1.0">
<overlay android:targetPackage="com.google.android.inputmethod.latin" android:priority="1"/>
diff --git a/google/themes/GboardOmniTheme/res/values-v21/colors.xml b/google/themes/GboardOmniTheme/res/values-v21/colors.xml
new file mode 100644
index 0000000..4f7d4cb
--- /dev/null
+++ b/google/themes/GboardOmniTheme/res/values-v21/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+ <color name="language_picker_text_color">@*android:color/omni_text1</color>
+
+</resources>
diff --git a/google/themes/GboardDarkTheme/res/values/colors.xml b/google/themes/GboardOmniTheme/res/values/colors.xml
similarity index 76%
rename from google/themes/GboardDarkTheme/res/values/colors.xml
rename to google/themes/GboardOmniTheme/res/values/colors.xml
index 8ffde03..6a3fa4f 100644
--- a/google/themes/GboardDarkTheme/res/values/colors.xml
+++ b/google/themes/GboardOmniTheme/res/values/colors.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="language_picker_radio_button_tint">@*android:color/accent_device_default_light</color>
+ <color name="language_picker_radio_button_tint">@*android:color/omni_color5</color>
</resources>
diff --git a/google/themes/GboardDarkTheme/res/values/strings.xml b/google/themes/GboardOmniTheme/res/values/strings.xml
similarity index 100%
rename from google/themes/GboardDarkTheme/res/values/strings.xml
rename to google/themes/GboardOmniTheme/res/values/strings.xml
diff --git a/google/themes/OmniTheme/res/values/colors.xml b/google/themes/OmniTheme/res/values/colors.xml
index 1d3e301..3104838 100644
--- a/google/themes/OmniTheme/res/values/colors.xml
+++ b/google/themes/OmniTheme/res/values/colors.xml
@@ -50,6 +50,7 @@
<!-- qs -->
<color name="material_grey_900">@*android:color/omni_color1</color> <!-- find a better way to do this -->
+ <color name="zen_introduction">@*android:color/omni_color1</color>
<!-- Dialogs -->
<color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
diff --git a/google/themes/SluttyPink/res/values/colors.xml b/google/themes/SluttyPink/res/values/colors.xml
index c127af6..c45f7a7 100644
--- a/google/themes/SluttyPink/res/values/colors.xml
+++ b/google/themes/SluttyPink/res/values/colors.xml
@@ -50,6 +50,7 @@
<!-- qs -->
<color name="material_grey_900">@*android:color/omni_color1</color> <!-- find a better way to do this -->
+ <color name="zen_introduction">@*android:color/omni_color1</color>
<!-- Dialogs -->
<color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->
diff --git a/google/themes/SmokedGreen/res/values/colors.xml b/google/themes/SmokedGreen/res/values/colors.xml
index a091c44..6706efa 100644
--- a/google/themes/SmokedGreen/res/values/colors.xml
+++ b/google/themes/SmokedGreen/res/values/colors.xml
@@ -50,6 +50,7 @@
<!-- qs -->
<color name="material_grey_900">@*android:color/omni_color1</color> <!-- find a better way to do this -->
+ <color name="zen_introduction">@*android:color/omni_color1</color>
<!-- Dialogs -->
<color name="background_floating_material_dark">@*android:color/omni_color7</color> <!-- dialogs like sime settins -->