Merge "omni: fix using omni charger sound" into android-9.0
diff --git a/charger/Android.mk b/charger/Android.mk
index adf9f16..fb9eeff 100644
--- a/charger/Android.mk
+++ b/charger/Android.mk
@@ -8,6 +8,21 @@
charger_density := 480dpi
endif
+include $(CLEAR_VARS)
+LOCAL_MODULE := font_charger.png
+LOCAL_SRC_FILES := fonts/$(charger_density)/font_charger.png
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)/res/images
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := animation.txt
+LOCAL_SRC_FILES := anim/animation.txt
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)/res/values/charger
+include $(BUILD_PREBUILT)
define _add-charger-image
include $$(CLEAR_VARS)
diff --git a/charger/anim/animation.txt b/charger/anim/animation.txt
new file mode 100644
index 0000000..7d9e0d7
--- /dev/null
+++ b/charger/anim/animation.txt
@@ -0,0 +1,11 @@
+# Full charger animation
+animation: 6 1 charger/battery_scale
+fail: charger/battery_fail
+#clock_display: c 20 255 255 255 255 font_charger
+percent_display: c c 255 255 255 255 font_charger
+frame: 750 0 19
+frame: 750 0 39
+frame: 750 0 59
+frame: 750 0 79
+frame: 750 80 95
+frame: 750 0 100
diff --git a/charger/fonts/480dpi b/charger/fonts/480dpi
new file mode 120000
index 0000000..51ef60f
--- /dev/null
+++ b/charger/fonts/480dpi
@@ -0,0 +1 @@
+hdpi
\ No newline at end of file
diff --git a/charger/fonts/560dpi b/charger/fonts/560dpi
new file mode 120000
index 0000000..17ef829
--- /dev/null
+++ b/charger/fonts/560dpi
@@ -0,0 +1 @@
+xxhdpi
\ No newline at end of file
diff --git a/charger/fonts/640dpi b/charger/fonts/640dpi
new file mode 120000
index 0000000..af2d1fe
--- /dev/null
+++ b/charger/fonts/640dpi
@@ -0,0 +1 @@
+xxxhdpi
\ No newline at end of file
diff --git a/charger/fonts/hdpi/font_charger.png b/charger/fonts/hdpi/font_charger.png
new file mode 100644
index 0000000..ddf9bc7
--- /dev/null
+++ b/charger/fonts/hdpi/font_charger.png
Binary files differ
diff --git a/charger/fonts/ldpi/font_charger.png b/charger/fonts/ldpi/font_charger.png
new file mode 100644
index 0000000..72fa8cb
--- /dev/null
+++ b/charger/fonts/ldpi/font_charger.png
Binary files differ
diff --git a/charger/fonts/mdpi/font_charger.png b/charger/fonts/mdpi/font_charger.png
new file mode 100644
index 0000000..d727fa1
--- /dev/null
+++ b/charger/fonts/mdpi/font_charger.png
Binary files differ
diff --git a/charger/fonts/xhdpi/font_charger.png b/charger/fonts/xhdpi/font_charger.png
new file mode 100644
index 0000000..9c16b77
--- /dev/null
+++ b/charger/fonts/xhdpi/font_charger.png
Binary files differ
diff --git a/charger/fonts/xxhdpi/font_charger.png b/charger/fonts/xxhdpi/font_charger.png
new file mode 100644
index 0000000..5d122b7
--- /dev/null
+++ b/charger/fonts/xxhdpi/font_charger.png
Binary files differ
diff --git a/charger/fonts/xxxhdpi/font_charger.png b/charger/fonts/xxxhdpi/font_charger.png
new file mode 100644
index 0000000..60dacec
--- /dev/null
+++ b/charger/fonts/xxxhdpi/font_charger.png
Binary files differ
diff --git a/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml b/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml
index bb1ed31..968a81e 100644
--- a/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml
@@ -27,7 +27,6 @@
<!-- make sure you enable this only if your device supports deep slepp
with active proximity sensor event listener -->
<bool name="config_proxiSensorWakupCheck">true</bool>
- <bool name="config_showNavigationBar">true</bool>
<bool name="config_haveHigherAspectRatioScreen">true</bool>
<string name="config_mainBuiltInDisplayCutout">M 0,0 L -183, 0 A 24.0, 24.0, 0, 0, 1, -159.0, 22.0 A 64.0, 64.0, 0, 0, 0, -95.0, 80.0 L 95.0, 80.0 A 64.0, 64.0, 0, 0, 0, 159.0, 22.0 A 24.0, 24.0, 0, 0, 1, 183.0, 0 Z</string>
@@ -35,9 +34,7 @@
black in software (to avoid aliasing or emulate a cutout that is not physically existent).
-->
<bool name="config_fillMainBuiltInDisplayCutout">true</bool>
- <bool name="config_intrusiveNotificationLed">true</bool>
- <bool name="config_intrusiveBatteryLed">true</bool>
- <bool name="config_FastChargingLedSupported">true</bool>
- <color name="config_defaultNotificationColor">#00ff00</color>
+ <bool name="config_intrusiveNotificationLed">false</bool>
+ <bool name="config_intrusiveBatteryLed">false</bool>
</resources>
diff --git a/utils/emulator/packages.mk b/utils/emulator/packages.mk
index 4221c5f..8f3fe7b 100644
--- a/utils/emulator/packages.mk
+++ b/utils/emulator/packages.mk
@@ -63,3 +63,7 @@
PRODUCT_PACKAGES += \
DocumentsUITheme
+
+# Telephony extension
+PRODUCT_PACKAGES += telephony-ext
+PRODUCT_BOOT_JARS += telephony-ext
