changes to use the system fonts and upto 2.6.5
diff --git a/config/common.mk b/config/common.mk
index d343e8f..6c87205 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -33,28 +33,6 @@
PRODUCT_COPY_FILES += \
vendor/slim/proprietary/supersu/su:system/xbin/su
-#LOCAL SLIM CHANGES - START
-#Bring in fonts files
-PRODUCT_COPY_FILES += \
-vendor/slim/prebuilt/common/fonts/Roboto-Italic.ttf:system/sfont/Roboto-Italic.ttf \
-vendor/slim/prebuilt/common/fonts/Roboto-Regular.ttf:system/sfont/Roboto-Regular.ttf \
-vendor/slim/prebuilt/common/fonts/DroidSansArmenian.ttf:system/sfont/DroidSansArmenian.ttf \
-vendor/slim/prebuilt/common/fonts/Roboto-BoldItalic.ttf:system/sfont/Roboto-BoldItalic.ttf \
-vendor/slim/prebuilt/common/fonts/AndroidClock_Solid.ttf:system/sfont/AndroidClock_Solid.ttf \
-vendor/slim/prebuilt/common/fonts/DroidSansGeorgian.ttf:system/sfont/DroidSansGeorgian.ttf \
-vendor/slim/prebuilt/common/fonts/DroidSerif-Bold.ttf:system/sfont/DroidSerif-Bold.ttf \
-vendor/slim/prebuilt/common/fonts/DroidSerif-Italic.ttf:system/sfont/DroidSerif-Italic.ttf \
-vendor/slim/prebuilt/common/fonts/DroidSerif-BoldItalic.ttf:system/sfont/DroidSerif-BoldItalic.ttf \
-vendor/slim/prebuilt/common/fonts/DroidSansThai.ttf:system/sfont/DroidSansThai.ttf \
-vendor/slim/prebuilt/common/fonts/Roboto-Bold.ttf:system/sfont/Roboto-Bold.ttf \
-vendor/slim/prebuilt/common/fonts/Clockopia.ttf:system/sfont/Clockopia.ttf \
-vendor/slim/prebuilt/common/fonts/DroidSansHebrew-Regular.ttf:system/sfont/DroidSansHebrew-Regular.ttf \
-vendor/slim/prebuilt/common/fonts/DroidSansMono.ttf:system/sfont/DroidSansMono.ttf \
-vendor/slim/prebuilt/common/fonts/DroidSansHebrew-Bold.ttf:system/sfont/DroidSansHebrew-Bold.ttf \
-vendor/slim/prebuilt/common/fonts/AndroidClock.ttf:system/sfont/AndroidClock.ttf \
-vendor/slim/prebuilt/common/fonts/DroidSansFallback.ttf:system/sfont/DroidSansFallback.ttf \
-vendor/slim/prebuilt/common/fonts/DroidSerif-Regular.ttf:system/sfont/DroidSerif-Regular.ttf \
-vendor/slim/prebuilt/common/fonts/AndroidClock_Highlight.ttf:system/sfont/AndroidClock_Highlight.ttf
# Bring in media files
PRODUCT_COPY_FILES += \
@@ -170,10 +148,10 @@
# T-Mobile theme engine
include vendor/slim/config/themes_common.mk
-
+PRODUCT_VERSION_WEEK = 1
PRODUCT_VERSION_MAJOR = 2
PRODUCT_VERSION_MINOR = 6
-PRODUCT_VERSION_MAINTENANCE = 3
+PRODUCT_VERSION_MAINTENANCE = 4
PRODUCT_BUILD_PROP_OVERRIDES += BUILD_DISPLAY_ID=JRO03L
@@ -181,28 +159,28 @@
updateme.filter=$(PRODUCT_RELEASE_NAME) \
updateme.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)
-ifdef SLIM_WEEKLY
+ifdef SLIM_NIGHTLY
PRODUCT_PROPERTY_OVERRIDES += \
- ro.slim.version=Slim-$(PRODUCT_VERSION_MAJOR)-WEEKLY-$(shell date +%m%d%Y)
+ ro.slim.version=Slim-WEEK-$(PRODUCT_VERSION_WEEK)-NIGHTLY-$(shell date +%m%d%Y)
else
ifdef SLIM_RELEASE
PRODUCT_PROPERTY_OVERRIDES += \
- ro.slim.version=Slim-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)
+ ro.slim.version=Slim-WEEK-$(PRODUCT_VERSION_WEEK)-OFFICIAL
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.slim.version=Slim-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)
+ ro.slim.version=Slim-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-UNOFFICIAL
endif
endif
-ifdef SLIM_WEEKLY
+ifdef SLIM_NIGHTLY
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=Slim-$(PRODUCT_VERSION_MAJOR)-WEEKLY-$(shell date +%m%d%Y)-$(PRODUCT_RELEASE_NAME)
+ ro.modversion=Slim-$(PRODUCT_RELEASE_NAME)-WEEK-$(PRODUCT_VERSION_WEEK)-NIGHTLY-$(shell date +%m%d%Y)
else
ifdef SLIM_RELEASE
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=Slim-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)
+ ro.modversion=Slim-$(PRODUCT_RELEASE_NAME)-WEEK-$(PRODUCT_VERSION_WEEK)-OFFICIAL
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=Slim-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)
+ ro.modversion=Slim-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)-UNOFFICIAL
endif
endif
diff --git a/prebuilt/common/font/AndroidClock.ttf b/prebuilt/common/font/AndroidClock.ttf
new file mode 100644
index 0000000..3fa6d88
--- /dev/null
+++ b/prebuilt/common/font/AndroidClock.ttf
Binary files differ
diff --git a/prebuilt/common/font/AndroidClock_Highlight.ttf b/prebuilt/common/font/AndroidClock_Highlight.ttf
new file mode 100644
index 0000000..3fa6d88
--- /dev/null
+++ b/prebuilt/common/font/AndroidClock_Highlight.ttf
Binary files differ
diff --git a/prebuilt/common/font/AndroidClock_Solid.ttf b/prebuilt/common/font/AndroidClock_Solid.ttf
new file mode 100644
index 0000000..3fa6d88
--- /dev/null
+++ b/prebuilt/common/font/AndroidClock_Solid.ttf
Binary files differ
diff --git a/prebuilt/common/font/Clockopia.ttf b/prebuilt/common/font/Clockopia.ttf
new file mode 100644
index 0000000..123ea4f
--- /dev/null
+++ b/prebuilt/common/font/Clockopia.ttf
Binary files differ
diff --git a/prebuilt/common/font/DroidSansArmenian.ttf b/prebuilt/common/font/DroidSansArmenian.ttf
new file mode 100644
index 0000000..6fafa54
--- /dev/null
+++ b/prebuilt/common/font/DroidSansArmenian.ttf
Binary files differ
diff --git a/prebuilt/common/font/DroidSansFallback.ttf b/prebuilt/common/font/DroidSansFallback.ttf
new file mode 100644
index 0000000..27cff47
--- /dev/null
+++ b/prebuilt/common/font/DroidSansFallback.ttf
Binary files differ
diff --git a/prebuilt/common/font/DroidSansGeorgian.ttf b/prebuilt/common/font/DroidSansGeorgian.ttf
new file mode 100644
index 0000000..3a2e9fb
--- /dev/null
+++ b/prebuilt/common/font/DroidSansGeorgian.ttf
Binary files differ
diff --git a/prebuilt/common/font/DroidSansHebrew-Bold.ttf b/prebuilt/common/font/DroidSansHebrew-Bold.ttf
new file mode 100644
index 0000000..c1acb38
--- /dev/null
+++ b/prebuilt/common/font/DroidSansHebrew-Bold.ttf
Binary files differ
diff --git a/prebuilt/common/font/DroidSansHebrew-Regular.ttf b/prebuilt/common/font/DroidSansHebrew-Regular.ttf
new file mode 100644
index 0000000..af6a58d
--- /dev/null
+++ b/prebuilt/common/font/DroidSansHebrew-Regular.ttf
Binary files differ
diff --git a/prebuilt/common/font/DroidSansMono.ttf b/prebuilt/common/font/DroidSansMono.ttf
new file mode 100644
index 0000000..a007071
--- /dev/null
+++ b/prebuilt/common/font/DroidSansMono.ttf
Binary files differ
diff --git a/prebuilt/common/font/DroidSansThai.ttf b/prebuilt/common/font/DroidSansThai.ttf
new file mode 100644
index 0000000..c078be0
--- /dev/null
+++ b/prebuilt/common/font/DroidSansThai.ttf
Binary files differ
diff --git a/prebuilt/common/font/DroidSerif-Bold.ttf b/prebuilt/common/font/DroidSerif-Bold.ttf
new file mode 100644
index 0000000..838d255
--- /dev/null
+++ b/prebuilt/common/font/DroidSerif-Bold.ttf
Binary files differ
diff --git a/prebuilt/common/font/DroidSerif-BoldItalic.ttf b/prebuilt/common/font/DroidSerif-BoldItalic.ttf
new file mode 100644
index 0000000..0b1601f
--- /dev/null
+++ b/prebuilt/common/font/DroidSerif-BoldItalic.ttf
Binary files differ
diff --git a/prebuilt/common/font/DroidSerif-Italic.ttf b/prebuilt/common/font/DroidSerif-Italic.ttf
new file mode 100644
index 0000000..2972809
--- /dev/null
+++ b/prebuilt/common/font/DroidSerif-Italic.ttf
Binary files differ
diff --git a/prebuilt/common/font/DroidSerif-Regular.ttf b/prebuilt/common/font/DroidSerif-Regular.ttf
new file mode 100644
index 0000000..5b4fe81
--- /dev/null
+++ b/prebuilt/common/font/DroidSerif-Regular.ttf
Binary files differ
diff --git a/prebuilt/common/font/Roboto-Bold.ttf b/prebuilt/common/font/Roboto-Bold.ttf
new file mode 100644
index 0000000..40ecd14
--- /dev/null
+++ b/prebuilt/common/font/Roboto-Bold.ttf
Binary files differ
diff --git a/prebuilt/common/font/Roboto-BoldItalic.ttf b/prebuilt/common/font/Roboto-BoldItalic.ttf
new file mode 100644
index 0000000..d9067c5
--- /dev/null
+++ b/prebuilt/common/font/Roboto-BoldItalic.ttf
Binary files differ
diff --git a/prebuilt/common/font/Roboto-Italic.ttf b/prebuilt/common/font/Roboto-Italic.ttf
new file mode 100644
index 0000000..88e4a5b
--- /dev/null
+++ b/prebuilt/common/font/Roboto-Italic.ttf
Binary files differ
diff --git a/prebuilt/common/font/Roboto-Regular.ttf b/prebuilt/common/font/Roboto-Regular.ttf
new file mode 100644
index 0000000..f592adf
--- /dev/null
+++ b/prebuilt/common/font/Roboto-Regular.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/AndroidEmoji.ttf b/prebuilt/common/fonts/AndroidEmoji.ttf
new file mode 100644
index 0000000..4c017d5
--- /dev/null
+++ b/prebuilt/common/fonts/AndroidEmoji.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/AnjaliNewLipi-light.ttf b/prebuilt/common/fonts/AnjaliNewLipi-light.ttf
new file mode 100644
index 0000000..04bb5e1
--- /dev/null
+++ b/prebuilt/common/fonts/AnjaliNewLipi-light.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/DroidNaskh-Regular-SystemUI.ttf b/prebuilt/common/fonts/DroidNaskh-Regular-SystemUI.ttf
new file mode 100644
index 0000000..2f495cf
--- /dev/null
+++ b/prebuilt/common/fonts/DroidNaskh-Regular-SystemUI.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/DroidNaskh-Regular.ttf b/prebuilt/common/fonts/DroidNaskh-Regular.ttf
new file mode 100644
index 0000000..da9a45f
--- /dev/null
+++ b/prebuilt/common/fonts/DroidNaskh-Regular.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/DroidSansDevanagari-Regular.ttf b/prebuilt/common/fonts/DroidSansDevanagari-Regular.ttf
new file mode 100644
index 0000000..a25e0e3
--- /dev/null
+++ b/prebuilt/common/fonts/DroidSansDevanagari-Regular.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/DroidSansEthiopic-Regular.ttf b/prebuilt/common/fonts/DroidSansEthiopic-Regular.ttf
new file mode 100644
index 0000000..0adcbbe
--- /dev/null
+++ b/prebuilt/common/fonts/DroidSansEthiopic-Regular.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/DroidSansFallback.ttf b/prebuilt/common/fonts/DroidSansFallback.ttf
index 27cff47..0cacabe 100644
--- a/prebuilt/common/fonts/DroidSansFallback.ttf
+++ b/prebuilt/common/fonts/DroidSansFallback.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/DroidSansTamil-Bold.ttf b/prebuilt/common/fonts/DroidSansTamil-Bold.ttf
new file mode 100644
index 0000000..8ad0085
--- /dev/null
+++ b/prebuilt/common/fonts/DroidSansTamil-Bold.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/DroidSansTamil-Regular.ttf b/prebuilt/common/fonts/DroidSansTamil-Regular.ttf
new file mode 100644
index 0000000..4b8f536
--- /dev/null
+++ b/prebuilt/common/fonts/DroidSansTamil-Regular.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/Lohit-Bengali.ttf b/prebuilt/common/fonts/Lohit-Bengali.ttf
new file mode 100644
index 0000000..7fbd6a0
--- /dev/null
+++ b/prebuilt/common/fonts/Lohit-Bengali.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/Lohit-Kannada.ttf b/prebuilt/common/fonts/Lohit-Kannada.ttf
new file mode 100644
index 0000000..e857b0f
--- /dev/null
+++ b/prebuilt/common/fonts/Lohit-Kannada.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/Lohit-Telugu.ttf b/prebuilt/common/fonts/Lohit-Telugu.ttf
new file mode 100644
index 0000000..748a59e
--- /dev/null
+++ b/prebuilt/common/fonts/Lohit-Telugu.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/Roboto-Bold.ttf b/prebuilt/common/fonts/Roboto-Bold.ttf
index 40ecd14..f9af089 100644
--- a/prebuilt/common/fonts/Roboto-Bold.ttf
+++ b/prebuilt/common/fonts/Roboto-Bold.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/Roboto-BoldItalic.ttf b/prebuilt/common/fonts/Roboto-BoldItalic.ttf
index d9067c5..217bf26 100644
--- a/prebuilt/common/fonts/Roboto-BoldItalic.ttf
+++ b/prebuilt/common/fonts/Roboto-BoldItalic.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/Roboto-Italic.ttf b/prebuilt/common/fonts/Roboto-Italic.ttf
index 88e4a5b..9332545 100644
--- a/prebuilt/common/fonts/Roboto-Italic.ttf
+++ b/prebuilt/common/fonts/Roboto-Italic.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/Roboto-Light.ttf b/prebuilt/common/fonts/Roboto-Light.ttf
new file mode 100644
index 0000000..63d9052
--- /dev/null
+++ b/prebuilt/common/fonts/Roboto-Light.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/Roboto-LightItalic.ttf b/prebuilt/common/fonts/Roboto-LightItalic.ttf
new file mode 100644
index 0000000..4feca85
--- /dev/null
+++ b/prebuilt/common/fonts/Roboto-LightItalic.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/Roboto-Regular.ttf b/prebuilt/common/fonts/Roboto-Regular.ttf
index f592adf..0f0b2c2 100644
--- a/prebuilt/common/fonts/Roboto-Regular.ttf
+++ b/prebuilt/common/fonts/Roboto-Regular.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/RobotoCondensed-Bold.ttf b/prebuilt/common/fonts/RobotoCondensed-Bold.ttf
new file mode 100644
index 0000000..1f1f633
--- /dev/null
+++ b/prebuilt/common/fonts/RobotoCondensed-Bold.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/RobotoCondensed-BoldItalic.ttf b/prebuilt/common/fonts/RobotoCondensed-BoldItalic.ttf
new file mode 100644
index 0000000..63bf520
--- /dev/null
+++ b/prebuilt/common/fonts/RobotoCondensed-BoldItalic.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/RobotoCondensed-Italic.ttf b/prebuilt/common/fonts/RobotoCondensed-Italic.ttf
new file mode 100644
index 0000000..d183066
--- /dev/null
+++ b/prebuilt/common/fonts/RobotoCondensed-Italic.ttf
Binary files differ
diff --git a/prebuilt/common/fonts/RobotoCondensed-Regular.ttf b/prebuilt/common/fonts/RobotoCondensed-Regular.ttf
new file mode 100644
index 0000000..19e7f40
--- /dev/null
+++ b/prebuilt/common/fonts/RobotoCondensed-Regular.ttf
Binary files differ
diff --git a/tools/squisher b/tools/squisher
index a616e57..b04b0d9 100755
--- a/tools/squisher
+++ b/tools/squisher
@@ -43,6 +43,7 @@
DELETE_MEDIA="*.qmg"
DELETE_APKS="Home.apk LiveWallpapers.apk VoiceDialer.apk SoundRecorder.apk VisualizationWallpapers.apk "
DELETE_GALLERY="Gallery2.apk"
+DELETE_FONTS="MTLmr3m.ttf"
REPACK=$OUT/repack.d
printf "Sanitizing environment..."
@@ -101,14 +102,17 @@
# No need for media/video
rm -rf $REPACK/ota/system/media/video
+# Delete Unnecessary Fonts
+( cd $REPACK/ota/system/fonts; echo $DELETE_FONTS | xargs rm -f; )
+
# Delete compiled fonts
-rm -rf $REPACK/ota/system/fonts
+#rm -rf $REPACK/ota/system/fonts
#make dir for fonts again
-mkdir $REPACK/ota/system/fonts
+#mkdir $REPACK/ota/system/fonts
# Add precompiled fonts
-mv -f $REPACK/ota/system/sfont/*.ttf $REPACK/ota/system/fonts/
+#mv -f $REPACK/ota/system/sfont/*.ttf $REPACK/ota/system/fonts/
# Add OTA app
#mkdir $REPACK/ota/data/app