diff --git a/charger/Android.mk b/charger/Android.mk index d16abbbc..b287cbea 100644 --- a/charger/Android.mk +++ b/charger/Android.mk @@ -65,6 +65,24 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/res/images/charger include $(BUILD_PREBUILT) +include $(CLEAR_VARS) +LOCAL_MODULE := cipher_charger_font +LOCAL_MODULE_STEM := percent_font.png +LOCAL_SRC_FILES := $(cipher_charger_density)/percent_font.png +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/res/images/charger +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := cipher_charger_font_vendor +LOCAL_MODULE_STEM := percent_font.png +LOCAL_SRC_FILES := $(cipher_charger_density)/percent_font.png +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/res/images/charger +include $(BUILD_PREBUILT) + include $(CLEAR_VARS) LOCAL_MODULE := cipher_charger_animation LOCAL_MODULE_STEM := animation.txt @@ -72,7 +90,7 @@ LOCAL_SRC_FILES := animation.txt LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/res/values/charger -LOCAL_REQUIRED_MODULES := cipher_charger_battery_scale cipher_charger_battery_fail +LOCAL_REQUIRED_MODULES := cipher_charger_battery_scale cipher_charger_battery_fail cipher_charger_font include $(BUILD_PREBUILT) include $(CLEAR_VARS) @@ -82,5 +100,5 @@ LOCAL_SRC_FILES := animation.txt LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/res/values/charger -LOCAL_REQUIRED_MODULES := cipher_charger_battery_scale_vendor cipher_charger_battery_fail_vendor +LOCAL_REQUIRED_MODULES := cipher_charger_battery_scale_vendor cipher_charger_battery_fail_vendor cipher_charger_font_vendor include $(BUILD_PREBUILT) diff --git a/charger/animation.txt b/charger/animation.txt index f7951f9a..62d2bc26 100644 --- a/charger/animation.txt +++ b/charger/animation.txt @@ -1,6 +1,11 @@ # animation: num_cycles, first_frame_repeats, animation_file animation: 7 1 charger/battery_scale +# percent_display: text_percent_pos_x, text_percent_pos_y, color_r, color_g, color_b, color_a, font_file +percent_display: c c 255 255 255 255 charger/percent_font + +fail: charger/battery_fail + # frame: disp_time min_level max_level frame: 500 0 4 frame: 500 0 9 @@ -23,4 +28,4 @@ frame: 500 80 89 frame: 500 85 94 frame: 500 90 99 frame: 500 95 99 -frame: 1000 100 100 \ No newline at end of file +frame: 1000 100 100 diff --git a/charger/hdpi/battery_fail.png b/charger/hdpi/battery_fail.png index 572d8eff..cade1574 100644 Binary files a/charger/hdpi/battery_fail.png and b/charger/hdpi/battery_fail.png differ diff --git a/charger/hdpi/battery_scale.png b/charger/hdpi/battery_scale.png index 92cd5b6e..3d89e66b 100644 Binary files a/charger/hdpi/battery_scale.png and b/charger/hdpi/battery_scale.png differ diff --git a/charger/hdpi/percent_font.png b/charger/hdpi/percent_font.png new file mode 100644 index 00000000..312a1f71 Binary files /dev/null and b/charger/hdpi/percent_font.png differ diff --git a/charger/images/battery_fail.svg b/charger/images/battery_fail.svg deleted file mode 100644 index f80b074f..00000000 --- a/charger/images/battery_fail.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/charger/mdpi/battery_fail.png b/charger/mdpi/battery_fail.png index 2b5d91cb..575f3aec 100644 Binary files a/charger/mdpi/battery_fail.png and b/charger/mdpi/battery_fail.png differ diff --git a/charger/mdpi/battery_scale.png b/charger/mdpi/battery_scale.png index 5683aa41..3d38a2c8 100644 Binary files a/charger/mdpi/battery_scale.png and b/charger/mdpi/battery_scale.png differ diff --git a/charger/mdpi/percent_font.png b/charger/mdpi/percent_font.png new file mode 100644 index 00000000..3043a889 Binary files /dev/null and b/charger/mdpi/percent_font.png differ diff --git a/charger/regenerate.sh b/charger/regenerate.sh index ac8bfaee..9e0cef45 100755 --- a/charger/regenerate.sh +++ b/charger/regenerate.sh @@ -9,8 +9,8 @@ for DENSITY in mdpi:160 hdpi:240 xhdpi:320 xxhdpi:480 xxxhdpi:640; do DPI=$(echo $DENSITY | cut -f1 -d ':') WIDTH=$(echo $DENSITY | cut -f2 -d ':') - rm -rf $DPI - mkdir $DPI + rm $DPI/battery_fail.png + rm $DPI/battery_scale.png for SVG in svg/*.svg; do PNG="$DPI/$(basename $SVG | cut -f1 -d '.').png" diff --git a/charger/svg/battery_fail.svg b/charger/svg/battery_fail.svg index f80b074f..23491405 100644 --- a/charger/svg/battery_fail.svg +++ b/charger/svg/battery_fail.svg @@ -1,5 +1,5 @@ - - + + diff --git a/charger/svg/battery_scale_00.svg b/charger/svg/battery_scale_00.svg index 4bf3798c..27af6dcf 100644 --- a/charger/svg/battery_scale_00.svg +++ b/charger/svg/battery_scale_00.svg @@ -1,5 +1,6 @@ + - + diff --git a/charger/svg/battery_scale_01.svg b/charger/svg/battery_scale_01.svg index c5fbec4f..9d2b5426 100644 --- a/charger/svg/battery_scale_01.svg +++ b/charger/svg/battery_scale_01.svg @@ -1,6 +1,7 @@ - + + - + diff --git a/charger/svg/battery_scale_02.svg b/charger/svg/battery_scale_02.svg index b533904b..7376b077 100644 --- a/charger/svg/battery_scale_02.svg +++ b/charger/svg/battery_scale_02.svg @@ -1,6 +1,7 @@ - + + - + diff --git a/charger/svg/battery_scale_03.svg b/charger/svg/battery_scale_03.svg index c147769e..2bcb70a8 100644 --- a/charger/svg/battery_scale_03.svg +++ b/charger/svg/battery_scale_03.svg @@ -1,6 +1,7 @@ - + + - + diff --git a/charger/svg/battery_scale_04.svg b/charger/svg/battery_scale_04.svg index 1bb0a693..8711f398 100644 --- a/charger/svg/battery_scale_04.svg +++ b/charger/svg/battery_scale_04.svg @@ -1,6 +1,7 @@ - + + - + diff --git a/charger/svg/battery_scale_05.svg b/charger/svg/battery_scale_05.svg index 929ed577..79620606 100644 --- a/charger/svg/battery_scale_05.svg +++ b/charger/svg/battery_scale_05.svg @@ -1,6 +1,7 @@ - + + - + diff --git a/charger/svg/battery_scale_06.svg b/charger/svg/battery_scale_06.svg index d13aea2d..cd0114e3 100644 --- a/charger/svg/battery_scale_06.svg +++ b/charger/svg/battery_scale_06.svg @@ -1,6 +1,7 @@ - + + - + diff --git a/charger/svg/battery_scale_07.svg b/charger/svg/battery_scale_07.svg index 6860f5d2..6862ff91 100644 --- a/charger/svg/battery_scale_07.svg +++ b/charger/svg/battery_scale_07.svg @@ -1,6 +1,7 @@ - + + - + diff --git a/charger/svg/battery_scale_08.svg b/charger/svg/battery_scale_08.svg index 346360fc..d3e200e8 100644 --- a/charger/svg/battery_scale_08.svg +++ b/charger/svg/battery_scale_08.svg @@ -1,6 +1,7 @@ - + + - + diff --git a/charger/svg/battery_scale_09.svg b/charger/svg/battery_scale_09.svg index 645ebb15..b2f74730 100644 --- a/charger/svg/battery_scale_09.svg +++ b/charger/svg/battery_scale_09.svg @@ -1,6 +1,7 @@ - + + - + diff --git a/charger/svg/battery_scale_10.svg b/charger/svg/battery_scale_10.svg index 9a27608a..ba788836 100644 --- a/charger/svg/battery_scale_10.svg +++ b/charger/svg/battery_scale_10.svg @@ -1,6 +1,7 @@ - + + - + diff --git a/charger/svg/battery_scale_11.svg b/charger/svg/battery_scale_11.svg index ccf1485a..c7d18b73 100644 --- a/charger/svg/battery_scale_11.svg +++ b/charger/svg/battery_scale_11.svg @@ -1,6 +1,7 @@ - + + - + diff --git a/charger/svg/battery_scale_12.svg b/charger/svg/battery_scale_12.svg index 5946ab3f..1981b743 100644 --- a/charger/svg/battery_scale_12.svg +++ b/charger/svg/battery_scale_12.svg @@ -1,6 +1,7 @@ - + + - + diff --git a/charger/svg/battery_scale_13.svg b/charger/svg/battery_scale_13.svg index fa64d390..e7489b21 100644 --- a/charger/svg/battery_scale_13.svg +++ b/charger/svg/battery_scale_13.svg @@ -1,6 +1,7 @@ - + + - + diff --git a/charger/svg/battery_scale_14.svg b/charger/svg/battery_scale_14.svg index 1ae78346..c4f002f0 100644 --- a/charger/svg/battery_scale_14.svg +++ b/charger/svg/battery_scale_14.svg @@ -1,6 +1,7 @@ - + + - + diff --git a/charger/svg/battery_scale_15.svg b/charger/svg/battery_scale_15.svg index 2ad0cda4..469ac8c5 100644 --- a/charger/svg/battery_scale_15.svg +++ b/charger/svg/battery_scale_15.svg @@ -1,6 +1,7 @@ - + + - + diff --git a/charger/svg/battery_scale_16.svg b/charger/svg/battery_scale_16.svg index 38130aa5..b983016e 100644 --- a/charger/svg/battery_scale_16.svg +++ b/charger/svg/battery_scale_16.svg @@ -1,6 +1,7 @@ - + + - + diff --git a/charger/svg/battery_scale_17.svg b/charger/svg/battery_scale_17.svg index c09c488f..c9bf11d0 100644 --- a/charger/svg/battery_scale_17.svg +++ b/charger/svg/battery_scale_17.svg @@ -1,6 +1,7 @@ - + + - + diff --git a/charger/svg/battery_scale_18.svg b/charger/svg/battery_scale_18.svg index 09507d59..6ea6c80b 100644 --- a/charger/svg/battery_scale_18.svg +++ b/charger/svg/battery_scale_18.svg @@ -1,6 +1,7 @@ - + + - + diff --git a/charger/svg/battery_scale_19.svg b/charger/svg/battery_scale_19.svg index fd66a719..84597c3e 100644 --- a/charger/svg/battery_scale_19.svg +++ b/charger/svg/battery_scale_19.svg @@ -1,6 +1,7 @@ - + + - + diff --git a/charger/svg/battery_scale_20.svg b/charger/svg/battery_scale_20.svg index 5fda9a14..69fe8e76 100644 --- a/charger/svg/battery_scale_20.svg +++ b/charger/svg/battery_scale_20.svg @@ -1,6 +1,6 @@ - + - + diff --git a/charger/svg/battery_scale_21.svg b/charger/svg/battery_scale_21.svg index b540507b..5421dbed 100644 --- a/charger/svg/battery_scale_21.svg +++ b/charger/svg/battery_scale_21.svg @@ -1,6 +1,5 @@ - + - diff --git a/charger/xhdpi/battery_fail.png b/charger/xhdpi/battery_fail.png index 94c87791..47c593f2 100644 Binary files a/charger/xhdpi/battery_fail.png and b/charger/xhdpi/battery_fail.png differ diff --git a/charger/xhdpi/battery_scale.png b/charger/xhdpi/battery_scale.png index 6eded503..61d14822 100644 Binary files a/charger/xhdpi/battery_scale.png and b/charger/xhdpi/battery_scale.png differ diff --git a/charger/xhdpi/percent_font.png b/charger/xhdpi/percent_font.png new file mode 100644 index 00000000..b3b7a324 Binary files /dev/null and b/charger/xhdpi/percent_font.png differ diff --git a/charger/xxhdpi/battery_fail.png b/charger/xxhdpi/battery_fail.png index 4fd90b6c..f722faa1 100644 Binary files a/charger/xxhdpi/battery_fail.png and b/charger/xxhdpi/battery_fail.png differ diff --git a/charger/xxhdpi/battery_scale.png b/charger/xxhdpi/battery_scale.png index ab82b38c..dab39728 100644 Binary files a/charger/xxhdpi/battery_scale.png and b/charger/xxhdpi/battery_scale.png differ diff --git a/charger/xxhdpi/percent_font.png b/charger/xxhdpi/percent_font.png new file mode 100644 index 00000000..69284aea Binary files /dev/null and b/charger/xxhdpi/percent_font.png differ diff --git a/charger/xxxhdpi/battery_fail.png b/charger/xxxhdpi/battery_fail.png index f637dce7..3bee3859 100644 Binary files a/charger/xxxhdpi/battery_fail.png and b/charger/xxxhdpi/battery_fail.png differ diff --git a/charger/xxxhdpi/battery_scale.png b/charger/xxxhdpi/battery_scale.png index 52819b0b..8484a2f2 100644 Binary files a/charger/xxxhdpi/battery_scale.png and b/charger/xxxhdpi/battery_scale.png differ diff --git a/charger/xxxhdpi/percent_font.png b/charger/xxxhdpi/percent_font.png new file mode 100644 index 00000000..35e1af89 Binary files /dev/null and b/charger/xxxhdpi/percent_font.png differ diff --git a/config/common_mobile.mk b/config/common_mobile.mk index 92b216d4..db70ace1 100644 --- a/config/common_mobile.mk +++ b/config/common_mobile.mk @@ -56,7 +56,7 @@ PRODUCT_PACKAGES += \ ifneq ($(CIPHER_CHARGER),false) PRODUCT_PACKAGES += \ - cipher_charger_animation + cipher_charger_animation \ cipher_charger_animation_vendor endif