Merge "LDPI Makeover" into gingerbread
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-iw/main.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-iw/main.dict
new file mode 100644
index 0000000..d572836
--- /dev/null
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw-iw/main.dict
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08.jpg
index 5b9aa91..7f7cacd 100644
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08.jpg
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08_small.jpg
index 43e9c87..bfadb00 100644
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08_small.jpg
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_cm_nexus_08_small.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation.jpg
index 3f221a0..da07bc0 100644
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation.jpg
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation.jpg
Binary files differ
diff --git a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation_small.jpg b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation_small.jpg
index 9b08f72..30d2e1a 100644
--- a/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation_small.jpg
+++ b/overlay/ldpi/packages/apps/CMWallpapers/res/drawable-mdpi/wallpaper_jai_cmceation_small.jpg
Binary files differ
diff --git a/prebuilt/common/bin/compcache b/prebuilt/common/bin/compcache
index 388e388..36540c2 100755
--- a/prebuilt/common/bin/compcache
+++ b/prebuilt/common/bin/compcache
@@ -4,17 +4,28 @@
# shade@chemlab.org (cyanogen)
#
-DEV=/dev/block/zram0
-SYSFS_PATH=/sys/block/zram0
-MODULE=zram
+isramzswap="$(ls -1 /system/lib/modules/2.6.*/kernel/drivers/staging/ramzswap/ramzswap.ko 2>/dev/null)"
+
+if [ -n "$isramzswap" ] ; then
+ MODULE=ramzswap
+ DEV=/dev/block/ramzswap0
+else
+ DEV=/dev/block/zram0
+ MODULE=zram
+ SYSFS_PATH=/sys/block/zram0
+fi
case "$1" in
start)
echo 3 > /proc/sys/vm/drop_caches
echo 30 > /proc/sys/vm/swappiness
modprobe $MODULE
- echo "$2" > $SYSFS_PATH/disksize
- mkswap $DEV >/dev/null
+ if [ $MODULE = ramzswap ]; then
+ rzscontrol $DEV --disksize_kb=$2 --init
+ else
+ echo "$((2 * 1024))" > $SYSFS_PATH/disksize
+ mkswap $DEV >/dev/null
+ fi
swapon $DEV
;;
@@ -23,10 +34,14 @@
rmmod $MODULE >/dev/null 2>&1
;;
stats)
- cd $SYSFS_PATH && for i in * ; do
- echo -n "$i:"
- cat $i
- done
+ if [ $MODULE = ramzswap ]; then
+ rzscontrol $DEV --stats
+ else
+ cd $SYSFS_PATH && for i in * ; do
+ echo -n "$i:"
+ cat $i
+ done
+ fi
;;
*)
echo "Usage: $0 {start <size>|stop|stats}"
diff --git a/prebuilt/common/bin/handle_compcache b/prebuilt/common/bin/handle_compcache
index 00b97d6..44ab0b7 100755
--- a/prebuilt/common/bin/handle_compcache
+++ b/prebuilt/common/bin/handle_compcache
@@ -21,7 +21,7 @@
if [ $PROP != 0 ]
then
- CCSIZE=$(($(($MEMTOTAL * $PROP)) / 100 * 1024))
+ CCSIZE=$(($(($MEMTOTAL * $PROP)) / 100))
`dirname $0`/compcache start $CCSIZE
else
`dirname $0`/compcache stop
diff --git a/products/cyanogen_click.mk b/products/cyanogen_click.mk
index 43fba4b..a8dc7ac 100644
--- a/products/cyanogen_click.mk
+++ b/products/cyanogen_click.mk
@@ -39,9 +39,9 @@
else
ifdef CYANOGEN_RELEASE
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.0.0-RC4-click
+ ro.modversion=CyanogenMod-7.0.0-RC4.1-click
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-RC4-click-KANG
+ ro.modversion=CyanogenMod-RC4.1-click-KANG
endif
endif
diff --git a/products/cyanogen_hero.mk b/products/cyanogen_hero.mk
index 6113e58..c32e9ea 100644
--- a/products/cyanogen_hero.mk
+++ b/products/cyanogen_hero.mk
@@ -32,10 +32,10 @@
else
ifdef CYANOGEN_RELEASE
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.0.0-RC0-Hero
+ ro.modversion=CyanogenMod-7.0.0-RC4-Hero
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.0.0-RC0-Hero-KANG
+ ro.modversion=CyanogenMod-7.0.0-RC4-Hero-KANG
endif
endif
diff --git a/products/cyanogen_speedy.mk b/products/cyanogen_speedy.mk
index 53d696f..ee36679 100644
--- a/products/cyanogen_speedy.mk
+++ b/products/cyanogen_speedy.mk
@@ -37,10 +37,10 @@
else
ifdef CYANOGEN_RELEASE
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.0.0-RC4-Speedy
+ ro.modversion=CyanogenMod-7.0.0-RC4.1-Speedy
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.0.0-RC4-Speedy-KANG
+ ro.modversion=CyanogenMod-7.0.0-RC4.1-Speedy-KANG
endif
endif
