DO NOT MERGE Remove androidx.car_car dependency
BUG: 128357463
Test: Manual
Change-Id: I47535fd7b2b8f0aedf6339d35d0339d20a4e10f1
diff --git a/Android.mk b/Android.mk
index 5f790a2..3ed332f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -36,8 +36,6 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
android-common jsr305
-LOCAL_STATIC_ANDROID_LIBRARIES += androidx.car_car
-
# Include all the resources regardless of system supported locales
LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 48309f2..d6ee796 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -11,4 +11,5 @@
<color name="transparent_black">#00000000</color>
<color name="ime_hwr_background">#e6172026</color>
<color name="ime_hwr_stroke">#ff1de9b6</color>
+ <color name="popup_background">@*android:color/car_teal_700</color>
</resources>
diff --git a/src/com/android/inputmethod/latin/car/KeyboardView.java b/src/com/android/inputmethod/latin/car/KeyboardView.java
index b237bae..0c796d7 100644
--- a/src/com/android/inputmethod/latin/car/KeyboardView.java
+++ b/src/com/android/inputmethod/latin/car/KeyboardView.java
@@ -382,7 +382,7 @@
mSwipeThreshold = (int) (500 * getResources().getDisplayMetrics().density);
mDisambiguateSwipe = true;
- int color = getResources().getColor(R.color.car_dark_blue_grey_700);
+ int color = getResources().getColor(R.color.ime_background_letters);
mPopupScrimColor = Color.argb(
SCRIM_ALPHA, Color.red(color), Color.green(color), Color.blue(color));
mBackgroundColor = Color.TRANSPARENT;
@@ -1457,7 +1457,7 @@
public void setPopupKeyboardView(KeyboardView popupKeyboardView) {
mPopupKeyboardView = popupKeyboardView;
- mPopupKeyboardView.mBackgroundColor = getResources().getColor(R.color.car_teal_700);
+ mPopupKeyboardView.mBackgroundColor = getResources().getColor(R.color.popup_background);
}
private void resetMultiTap() {
