project build/ diff --git a/target/product/languages_full.mk b/target/product/languages_full.mk index 56ca493..57694c7 100644 --- a/target/product/languages_full.mk +++ b/target/product/languages_full.mk @@ -20,64 +20,4 @@ # the system misbehaves when a density is the first locale. # Those are all the locales that have translations. -PRODUCT_LOCALES := en_US \ - ar_EG \ - ar_IL \ - ur_PK \ - fa_IR \ - bg_BG \ - ca_ES \ - cs_CZ \ - da_DK \ - de_AT \ - de_CH \ - de_DE \ - de_LI \ - el_GR \ - en_AU \ - en_CA \ - en_GB \ - en_IE \ - en_IN \ - en_NZ \ - en_SG \ - en_ZA \ - es_ES \ - fi_FI \ - fr_BE \ - fr_CA \ - fr_CH \ - fr_FR \ - he_IL \ - hi_IN \ - hr_HR \ - hu_HU \ - id_ID \ - it_CH \ - it_IT \ - iw_IL \ - ja_JP \ - ka_GE \ - ko_KR \ - lt_LT \ - lv_LV \ - nb_NO \ - nl_BE \ - nl_NL \ - pl_PL \ - pt_BR \ - pt_PT \ - ro_RO \ - ru_RU \ - sk_SK \ - sl_SI \ - sr_RS \ - sv_SE \ - th_TH \ - tl_PH \ - tr_TR \ - uk_UA \ - vi_VN \ - zh_CN \ - zh_HK \ - zh_TW +PRODUCT_LOCALES := en_US es_ES diff --git a/target/product/sdk.mk b/target/product/sdk.mk index 95c0c8e..62c443f 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -117,69 +117,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) PRODUCT_BRAND := generic PRODUCT_NAME := sdk PRODUCT_DEVICE := generic -PRODUCT_LOCALES := \ - ldpi \ - hdpi \ - mdpi \ - ar_EG \ - ar_IL \ - ur_PK \ - fa_IR \ - bg_BG \ - ca_ES \ - cs_CZ \ - da_DK \ - de_AT \ - de_CH \ - de_DE \ - de_LI \ - el_GR \ - en_AU \ - en_CA \ - en_GB \ - en_IE \ - en_IN \ - en_NZ \ - en_SG \ - en_US \ - en_ZA \ - es_ES \ - es_US \ - fi_FI \ - fr_BE \ - fr_CA \ - fr_CH \ - fr_FR \ - he_IL \ - hi_IN \ - hr_HR \ - hu_HU \ - id_ID \ - it_CH \ - it_IT \ - ja_JP \ - ko_KR \ - lt_LT \ - lv_LV \ - nb_NO \ - nl_BE \ - nl_NL \ - pl_PL \ - pt_BR \ - pt_PT \ - ro_RO \ - ru_RU \ - sk_SK \ - sl_SI \ - sr_RS \ - sv_SE \ - th_TH \ - tl_PH \ - tr_TR \ - uk_UA \ - vi_VN \ - zh_CN \ - zh_TW +PRODUCT_LOCALES := ldpi hdpi mdpi en_US es_ES # include available languages for TTS in the system image include external/svox/pico/lang/PicoLangDeDeInSystem.mk project device/geeksphone/zero/ diff --git a/320_480logo.rle b/320_480logo.rle index f02ab48..8672207 100644 Binary files a/320_480logo.rle and b/320_480logo.rle differ diff --git a/init.zero.rc b/init.zero.rc index 2da6757..1b9c618 100644 --- a/init.zero.rc +++ b/init.zero.rc @@ -20,6 +20,8 @@ on fs chmod 777 /data/simcom/simlog mkdir /data/simcom/btadd 0777 system system chmod 777 /data/simcom/btadd + mkdir /data/misc/sensors 0777 compass system + chmod 777 /data/misc/sensors #mount yaffs2 mtd@system /system rw remount #---enable keypad interrupt until boot complete @@ -50,15 +52,28 @@ on boot mkdir /data/misc/dhcp 0770 dhcp dhcp chmod 0770 /data/misc/wifi/cert/as chown dhcp dhcp /data/misc/dhcp + chmod 666 /dev/mot + chmod 666 /dev/mmc31xx + chmod 666 /dev/ecompass_ctrl + chmod 666 /dev/cm3623_ps + chmod 666 /dev/cm3623_als + mkdir /data/misc/sensors 0777 system system # Adjust socket buffer to enlarge TCP receive window for high bandwidth write /proc/sys/net/ipv4/tcp_adv_win_scale 1 on property:dev.bootcomplete=1 - # Adjust cpufreq to ondemand according to original post-boot script - write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor ondemand - write /sys/devices/system/cpu/cpu0/cpufreq/ondemand/up_threshold 90 - write /sys/devices/system/cpu/cpu0/cpufreq/ondemand/sampling_rate 25000 + # Adjust cpufreq to smartassV2 + write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor smartass2 + # write /sys/devices/system/cpu/cpu0/cpufreq/ondemand/up_threshold 90 + # write /sys/devices/system/cpu/cpu0/cpufreq/ondemand/sampling_rate 25000 + # LowMemoryKiller + write /sys/module/lowmemorykiller/parameters/minfree 3584,4096,8192,10240,11264,12288 + write /sys/module/lowmemorykiller/parameters/minfile 0,0,0,5120,5632,6144 + write /sys/module/lowmemorykiller/parameters/check_filepages 1 + # SD + write /sys/block/mmcblk0/bdi/read_ahead_kb 2048 + write /sys/devices/virtual/bdi/179:0/read_ahead_kb 2048 on property:init.svc.bluetoothd=running write /sys/devices/virtual/bluetooth/hci0/idle_timeout 7000 @@ -123,10 +138,8 @@ service dhcpcd_wlan0 /system/bin/dhcpcd -BKL wlan0 oneshot service memsicd /system/bin/memsicd - user compass oneshot service wifi-loader /system/bin/logwrapper /system/bin/wificit.sh disabled oneshot - diff --git a/kernel b/kernel index 79fe88b..6ab9cce 100755 Binary files a/kernel and b/kernel differ diff --git a/libcamera/QualcommCameraHardware.cpp b/libcamera/QualcommCameraHardware.cpp index c2360e7..81ac190 100644 --- a/libcamera/QualcommCameraHardware.cpp +++ b/libcamera/QualcommCameraHardware.cpp @@ -75,7 +75,7 @@ extern "C" { #define DEFAULT_PICTURE_WIDTH 1024 #define DEFAULT_PICTURE_HEIGHT 768 #define THUMBNAIL_BUFFER_SIZE (THUMBNAIL_WIDTH * THUMBNAIL_HEIGHT * 3/2) -#define MAX_ZOOM_LEVEL 5 +#define MAX_ZOOM_LEVEL 20 #define NOT_FOUND -1 // Number of video buffers held by kernal (initially 1,2 &3) #define ACTIVE_VIDEO_BUFFERS 3 @@ -219,12 +219,12 @@ board_property boardProperties[] = { static const camera_size_type picture_sizes[] = { { 2592, 1944 }, // 5MP { 2048, 1536 }, // 3MP QXGA - { 1920, 1080 }, //HD1080 +// { 1920, 1080 }, //HD1080 { 1600, 1200 }, // 2MP UXGA - { 1280, 768 }, //WXGA - { 1280, 720 }, //HD720 +// { 1280, 768 }, //WXGA +// { 1280, 720 }, //HD720 { 1024, 768}, // 1MP XGA - { 800, 600 }, //SVGA +// { 800, 600 }, //SVGA { 800, 480 }, // WVGA { 640, 480 }, // VGA { 352, 288 }, //CIF @@ -333,10 +333,10 @@ static const str_map effects[] = { { CameraParameters::EFFECT_NEGATIVE, CAMERA_EFFECT_NEGATIVE }, { CameraParameters::EFFECT_SOLARIZE, CAMERA_EFFECT_SOLARIZE }, { CameraParameters::EFFECT_SEPIA, CAMERA_EFFECT_SEPIA }, - { CameraParameters::EFFECT_POSTERIZE, CAMERA_EFFECT_POSTERIZE }, - { CameraParameters::EFFECT_WHITEBOARD, CAMERA_EFFECT_WHITEBOARD }, - { CameraParameters::EFFECT_BLACKBOARD, CAMERA_EFFECT_BLACKBOARD }, - { CameraParameters::EFFECT_AQUA, CAMERA_EFFECT_AQUA } +// { CameraParameters::EFFECT_POSTERIZE, CAMERA_EFFECT_POSTERIZE }, +// { CameraParameters::EFFECT_WHITEBOARD, CAMERA_EFFECT_WHITEBOARD }, +// { CameraParameters::EFFECT_BLACKBOARD, CAMERA_EFFECT_BLACKBOARD }, +// { CameraParameters::EFFECT_AQUA, CAMERA_EFFECT_AQUA } }; // from qcamera/common/camera.h @@ -563,20 +563,20 @@ static struct country_map country_numeric[] = { static const str_map scenemode[] = { { CameraParameters::SCENE_MODE_AUTO, CAMERA_BESTSHOT_OFF }, - { CameraParameters::SCENE_MODE_ACTION, CAMERA_BESTSHOT_ACTION }, - { CameraParameters::SCENE_MODE_PORTRAIT, CAMERA_BESTSHOT_PORTRAIT }, - { CameraParameters::SCENE_MODE_LANDSCAPE, CAMERA_BESTSHOT_LANDSCAPE }, +// { CameraParameters::SCENE_MODE_ACTION, CAMERA_BESTSHOT_ACTION }, +// { CameraParameters::SCENE_MODE_PORTRAIT, CAMERA_BESTSHOT_PORTRAIT }, +// { CameraParameters::SCENE_MODE_LANDSCAPE, CAMERA_BESTSHOT_LANDSCAPE }, { CameraParameters::SCENE_MODE_NIGHT, CAMERA_BESTSHOT_NIGHT }, - { CameraParameters::SCENE_MODE_NIGHT_PORTRAIT, CAMERA_BESTSHOT_NIGHT_PORTRAIT }, - { CameraParameters::SCENE_MODE_THEATRE, CAMERA_BESTSHOT_THEATRE }, - { CameraParameters::SCENE_MODE_BEACH, CAMERA_BESTSHOT_BEACH }, - { CameraParameters::SCENE_MODE_SNOW, CAMERA_BESTSHOT_SNOW }, - { CameraParameters::SCENE_MODE_SUNSET, CAMERA_BESTSHOT_SUNSET }, - { CameraParameters::SCENE_MODE_STEADYPHOTO, CAMERA_BESTSHOT_ANTISHAKE }, - { CameraParameters::SCENE_MODE_FIREWORKS , CAMERA_BESTSHOT_FIREWORKS }, - { CameraParameters::SCENE_MODE_SPORTS , CAMERA_BESTSHOT_SPORTS }, - { CameraParameters::SCENE_MODE_PARTY, CAMERA_BESTSHOT_PARTY }, - { CameraParameters::SCENE_MODE_CANDLELIGHT, CAMERA_BESTSHOT_CANDLELIGHT }, +// { CameraParameters::SCENE_MODE_NIGHT_PORTRAIT, CAMERA_BESTSHOT_NIGHT_PORTRAIT }, +// { CameraParameters::SCENE_MODE_THEATRE, CAMERA_BESTSHOT_THEATRE }, +// { CameraParameters::SCENE_MODE_BEACH, CAMERA_BESTSHOT_BEACH }, +// { CameraParameters::SCENE_MODE_SNOW, CAMERA_BESTSHOT_SNOW }, +// { CameraParameters::SCENE_MODE_SUNSET, CAMERA_BESTSHOT_SUNSET }, +// { CameraParameters::SCENE_MODE_STEADYPHOTO, CAMERA_BESTSHOT_ANTISHAKE }, +// { CameraParameters::SCENE_MODE_FIREWORKS , CAMERA_BESTSHOT_FIREWORKS }, +// { CameraParameters::SCENE_MODE_SPORTS , CAMERA_BESTSHOT_SPORTS }, +// { CameraParameters::SCENE_MODE_PARTY, CAMERA_BESTSHOT_PARTY }, +// { CameraParameters::SCENE_MODE_CANDLELIGHT, CAMERA_BESTSHOT_CANDLELIGHT }, }; #define country_number (sizeof(country_numeric) / sizeof(country_map)) @@ -644,8 +644,8 @@ static const str_map focus_modes[] = { }; static const str_map lensshade[] = { - { CameraParameters::LENSSHADE_ENABLE, TRUE }, - { CameraParameters::LENSSHADE_DISABLE, FALSE } +// { CameraParameters::LENSSHADE_ENABLE, TRUE }, +// { CameraParameters::LENSSHADE_DISABLE, FALSE } }; static const str_map continuous_af[] = { @@ -708,7 +708,7 @@ static String8 lensshade_values; static String8 touchafaec_values; static String8 picture_format_values; static String8 continuous_af_values; -static String8 zoom_ratio_values; +// static String8 zoom_ratio_values; static String8 scenemode_values; static String8 preview_frame_rate_values; @@ -912,9 +912,9 @@ static void receive_shutter_callback(common_crop_t *crop); static void receive_camframetimeout_callback(void); static int fb_fd = -1; static int32_t mMaxZoom = 0; -static bool zoomSupported = false; +// static bool zoomSupported = false; static bool native_get_maxzoom(int camfd, void *pZm); -static bool native_get_zoomratios(int camfd, void *pZr, int maxZoomLevel); +// static bool native_get_zoomratios(int camfd, void *pZr, int maxZoomLevel); static int dstOffset = 0; @@ -1111,32 +1111,32 @@ void QualcommCameraHardware::initDefaultParameters() continuous_af, sizeof(continuous_af) / sizeof(str_map)); } - if(native_get_maxzoom(mCameraControlFd, - (void *)&mMaxZoom) == true){ - LOGD("Maximum zoom value is %d", mMaxZoom); - zoomSupported = true; - if(mMaxZoom > 0){ +// if(native_get_maxzoom(mCameraControlFd, +// (void *)&mMaxZoom) == true){ +// LOGD("Maximum zoom value is %d", mMaxZoom); +// zoomSupported = true; +// if(mMaxZoom > 0){ //if max zoom is available find the zoom ratios - int16_t * zoomRatios = new int16_t[mMaxZoom+1]; - if(zoomRatios != NULL){ - if(native_get_zoomratios(mCameraControlFd, - (void *)zoomRatios, mMaxZoom + 1) == true){ - zoom_ratio_values = - create_str(zoomRatios, mMaxZoom + 1); - }else { - LOGE("Failed to get zoomratios..."); - } - delete zoomRatios; - } else { - LOGE("zoom ratios failed to acquire memory"); - } - } - } else { - zoomSupported = false; - LOGE("Failed to get maximum zoom value...setting max " - "zoom to zero"); - mMaxZoom = 0; - } +// int16_t * zoomRatios = new int16_t[mMaxZoom+1]; +// if(zoomRatios != NULL){ +// if(native_get_zoomratios(mCameraControlFd, +// (void *)zoomRatios, mMaxZoom + 1) == true){ +// zoom_ratio_values = +// create_str(zoomRatios, mMaxZoom + 1); +// }else { +// LOGE("Failed to get zoomratios..."); +// } +// delete zoomRatios; +// } else { +// LOGE("zoom ratios failed to acquire memory"); +// } +// } +// } else { +// zoomSupported = false; +// LOGE("Failed to get maximum zoom value...setting max " +// "zoom to zero"); +// mMaxZoom = 0; +// } preview_frame_rate_values = create_values_range_str( MINIMUM_FPS, MAXIMUM_FPS); parameter_string_initialized = true; @@ -1183,15 +1183,15 @@ void QualcommCameraHardware::initDefaultParameters() mParameters.set(CameraParameters::KEY_SUPPORTED_JPEG_THUMBNAIL_SIZES, valuesStr.string()); - if(zoomSupported){ - mParameters.set(CameraParameters::KEY_ZOOM_SUPPORTED, "true"); - LOGV("max zoom is %d", mMaxZoom); - mParameters.set("max-zoom",mMaxZoom); - mParameters.set(CameraParameters::KEY_ZOOM_RATIOS, - zoom_ratio_values); - } else { - mParameters.set(CameraParameters::KEY_ZOOM_SUPPORTED, "false"); - } +// if(zoomSupported){ +// mParameters.set(CameraParameters::KEY_ZOOM_SUPPORTED, "true"); +// LOGV("max zoom is %d", mMaxZoom); +// mParameters.set("max-zoom",mMaxZoom); +// mParameters.set(CameraParameters::KEY_ZOOM_RATIOS, +// zoom_ratio_values); +// } else { +// mParameters.set(CameraParameters::KEY_ZOOM_SUPPORTED, "false"); +// } mParameters.set(CameraParameters::KEY_ANTIBANDING, CameraParameters::ANTIBANDING_OFF); @@ -1257,6 +1257,8 @@ void QualcommCameraHardware::initDefaultParameters() mParameters.set("luma-adaptation", "3"); mParameters.set("zoom-supported", "true"); + mParameters.set("zoom-ratios", "100,105,110,115,120,125,130,135,140,145,150,155,160,165,170,175,180,185,190,195,200"); + mParameters.set("max-zoom", MAX_ZOOM_LEVEL); mParameters.set("zoom", 0); mParameters.set(CameraParameters::KEY_PICTURE_FORMAT, CameraParameters::PIXEL_FORMAT_JPEG); @@ -1554,30 +1556,30 @@ static bool native_get_maxzoom(int camfd, void *pZm) return true; } -static bool native_get_zoomratios(int camfd, void *pZr, int maxZoomSize) -{ - LOGV("native_get_zoomratios E"); - struct msm_ctrl_cmd ctrlCmd; - int16_t *zoomRatios = (int16_t *)pZr; +// static bool native_get_zoomratios(int camfd, void *pZr, int maxZoomSize) +//{ +// LOGV("native_get_zoomratios E"); +// struct msm_ctrl_cmd ctrlCmd; +// int16_t *zoomRatios = (int16_t *)pZr; - if(maxZoomSize <= 0) - return false; +// if(maxZoomSize <= 0) +// return false; - ctrlCmd.type = CAMERA_GET_PARM_ZOOMRATIOS; - ctrlCmd.timeout_ms = 5000; - ctrlCmd.length = sizeof(int16_t)* (maxZoomSize); - ctrlCmd.value = zoomRatios; - ctrlCmd.resp_fd = camfd; +// ctrlCmd.type = CAMERA_GET_PARM_ZOOMRATIOS; +// ctrlCmd.timeout_ms = 5000; +// ctrlCmd.length = sizeof(int16_t)* (maxZoomSize); +// ctrlCmd.value = zoomRatios; +// ctrlCmd.resp_fd = camfd; - if (ioctl(camfd, MSM_CAM_IOCTL_CTRL_COMMAND, &ctrlCmd) < 0) { - LOGE("native_get_zoomratios: ioctl fd %d error %s", - camfd, - strerror(errno)); - return false; - } - LOGV("native_get_zoomratios X"); - return true; -} +// if (ioctl(camfd, MSM_CAM_IOCTL_CTRL_COMMAND, &ctrlCmd) < 0) { +// LOGE("native_get_zoomratios: ioctl fd %d error %s", +// camfd, +// strerror(errno)); +// return false; +// } +// LOGV("native_get_zoomratios X"); +// return true; +//} static bool native_set_afmode(int camfd, isp3a_af_mode_t af_type) { @@ -2917,6 +2919,16 @@ status_t QualcommCameraHardware::startPreviewInternal() //Reset the Gps Information exif_table_numEntries = 0; + if(native_get_maxzoom(mCameraControlFd, (void *)&mMaxZoom) == true){ + LOGD("Maximum zoom value is %d", mMaxZoom); + mParameters.set("zoom-supported", "true"); + } else { + LOGE("Failed to get maximum zoom value...setting max zoom to zero"); + mParameters.set("zoom-supported", "false"); + mMaxZoom = 0; + } + mParameters.set("max-zoom",mMaxZoom); + LOGV("startPreviewInternal X"); return NO_ERROR; } @@ -2932,12 +2944,14 @@ void QualcommCameraHardware::stopPreviewInternal() { LOGV("stopPreviewInternal E: %d", mCameraRunning); if (mCameraRunning) { +#if 0 // Cancel auto focus. { if (mNotifyCallback && (mMsgEnabled & CAMERA_MSG_FOCUS)) { cancelAutoFocusInternal(); } } +#endif Mutex::Autolock l(&mCamframeTimeoutLock); { @@ -3095,12 +3109,12 @@ status_t QualcommCameraHardware::cancelAutoFocusInternal() return NO_ERROR; } -#if 0 +//#if 0 if (mAutoFocusFd < 0) { LOGV("cancelAutoFocusInternal X: not in progress"); return NO_ERROR; } -#endif +//#endif status_t rc = NO_ERROR; status_t err; @@ -3382,11 +3396,11 @@ status_t QualcommCameraHardware::setParameters(const CameraParameters& params) if ((rc = setRotation(params))) final_rc = rc; if ((rc = setZoom(params))) final_rc = rc; if ((rc = setOrientation(params))) final_rc = rc; - if ((rc = setLensshadeValue(params))) final_rc = rc; +// if ((rc = setLensshadeValue(params))) final_rc = rc; // 37 if ((rc = setPictureFormat(params))) final_rc = rc; - if ((rc = setSharpness(params))) final_rc = rc; - if ((rc = setSaturation(params))) final_rc = rc; - if ((rc = setSceneMode(params))) final_rc = rc; +// if ((rc = setSharpness(params))) final_rc = rc; // 4 +// if ((rc = setSaturation(params))) final_rc = rc; // 11 +// if ((rc = setSceneMode(params))) final_rc = rc; // 27 if ((rc = setContrast(params))) final_rc = rc; const char *str = params.get(CameraParameters::KEY_SCENE_MODE); @@ -3394,11 +3408,11 @@ status_t QualcommCameraHardware::setParameters(const CameraParameters& params) if((value != NOT_FOUND) && (value == CAMERA_BESTSHOT_OFF)) { if ((rc = setPreviewFrameRate(params))) final_rc = rc; - if ((rc = setAntibanding(params))) final_rc = rc; - if ((rc = setAutoExposure(params))) final_rc = rc; +// if ((rc = setAntibanding(params))) final_rc = rc; // 54 +// if ((rc = setAutoExposure(params))) final_rc = rc; // 12 if ((rc = setExposureCompensation(params))) final_rc = rc; if ((rc = setWhiteBalance(params))) final_rc = rc; - if ((rc = setFlash(params))) final_rc = rc; +// if ((rc = setFlash(params))) final_rc = rc; if ((rc = setFocusMode(params))) final_rc = rc; if ((rc = setBrightness(params))) final_rc = rc; if ((rc = setISOValue(params))) final_rc = rc; diff --git a/libcamera/QualcommCameraHardware.h b/libcamera/QualcommCameraHardware.h index ebba7f6..40e20a7 100644 --- a/libcamera/QualcommCameraHardware.h +++ b/libcamera/QualcommCameraHardware.h @@ -262,7 +262,8 @@ enum camera_ops { CAMERA_START_RECORDING, CAMERA_STOP_RECORDING, CAMERA_GET_PARM_MAXZOOM, - CAMERA_GET_PARM_ZOOMRATIOS, +// CAMERA_GET_PARM_ZOOMRATIOS, + CAMERA_START_RAW_SNAPSHOT, CAMERA_SET_PARM_LED_MODE, CAMERA_GET_PARM_AF_SHARPNESS, CAMERA_SET_MOTION_ISO, @@ -272,7 +273,6 @@ enum camera_ops { CAMERA_PREPARE_SNAPSHOT, CAMERA_SET_FPS_MODE, CAMERA_SET_PARM_SCENE_MODE, - CAMERA_START_RAW_SNAPSHOT, }; typedef enum { diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index e2b257d..6e1740b 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -59,10 +59,10 @@ than the size of the config_autoBrightnessLevels array. --> - 25 - 55 - 70 - 70 + 35 + 50 + 80 + 100 250 diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml index b1d33cd..8738ccb 100644 --- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -1,59 +1,64 @@ + - - 0 - - - 0.1 - - - 0.1 - - - 0.1 - - - 0.1 - - - 0.1 - - - 0.1 - - - 0.1 - - - 0.1 - - - 0.1 - - - 1 - - - 0.5 - - - 1 - + 0 + 20 + 90 + 0.2 + 35500 + 80 + 0.2 + 90 + 200 + 25 + 50 + 125 + 50 + 1150 + 100 - 0.2 - 0.1 - - - 600000 - 400000 - 128000 - - - 0.1 - - - 0.25 - 0.2 - 0.1 + 1 + 1 + + 122880 + 245760 + 320000 + 480000 + 604800 + 672000 + 729600 + 748800 + 768000 + + + 0.1 + + + 0.1 + 0.1 + 35 + 75 + 85 + 101.5 + 107.3 + 123.6 + 134.5 + diff --git a/prebuilt/dhd.ko b/prebuilt/dhd.ko index 569ce9e..3f40075 100644 Binary files a/prebuilt/dhd.ko and b/prebuilt/dhd.ko differ diff --git a/recovery.fstab b/recovery.fstab index 9cd8848..ff06875 100644 --- a/recovery.fstab +++ b/recovery.fstab @@ -6,3 +6,4 @@ /recovery mtd recovery /sdcard vfat /dev/block/mmcblk0p1 /dev/block/mmcblk0 /system yaffs2 system +/sd-ext ext3 /dev/block/mmcblk0p2 diff --git a/system.prop b/system.prop index 6585dcb..aed2243 100644 --- a/system.prop +++ b/system.prop @@ -28,3 +28,6 @@ dalvik.vm.dexopt-data-only=1 # Respect ALS setting, turn it off if not in use ro.hardware.respect_als=true + +# Raise heap size +dalvik.vm.heapsize=32m diff --git a/zero.mk b/zero.mk index 52d9db2..ba874ed 100644 --- a/zero.mk +++ b/zero.mk @@ -1,5 +1,5 @@ # The gps config appropriate for this device -$(call inherit-product, device/common/gps/gps_us_supl.mk) +$(call inherit-product, device/common/gps/gps_eu_supl.mk) $(call inherit-product-if-exists, vendor/geeksphone/zero/zero-vendor.mk) @@ -113,6 +113,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/geeksphone/zero/prebuilt/dhd.ko:system/lib/modules/dhd.ko +## Módulo TUN +PRODUCT_COPY_FILES += \ + device/geeksphone/zero/prebuilt/tun.ko:system/lib/modules/tun.ko + ## FMRadio app and dependencies PRODUCT_COPY_FILES += \ vendor/geeksphone/zero/proprietary/lib/libfmhal.so:system/lib/libfmhal.so \ project frameworks/base/ diff --git a/core/res/res/drawable/default_wallpaper.jpg b/core/res/res/drawable/default_wallpaper.jpg index 5ba522f..5431bc9 100644 Binary files a/core/res/res/drawable/default_wallpaper.jpg and b/core/res/res/drawable/default_wallpaper.jpg differ project packages/apps/Browser/ diff --git a/res/values/strings.xml b/res/values/strings.xml index 7a1c4cc..2510ac1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -678,32 +678,6 @@ Google http://www.google.com/ - Picasa - http://picasaweb.google.com/m/viewer?source=androidclient - Yahoo! - http://www.yahoo.com/ - MSN - http://www.msn.com/ - MySpace - http://www.myspace.com/ - Facebook - http://www.facebook.com/ - Wikipedia - http://www.wikipedia.org/ - eBay - http://www.ebay.com/ - CNN - http://www.cnn.com/ - NY Times - http://www.nytimes.com/ - ESPN - http://espn.com/ - Amazon - http://www.amazon.com/ - Weather Channel - http://www.weather.com/ - BBC - http://www.bbc.co.uk/ project packages/apps/Camera/ diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 3abc463..aef52a8 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -401,7 +401,7 @@ public class Camera extends BaseCamera implements View.OnClickListener, private void initializeZoom() { if (!mParameters.isZoomSupported()) return; - mZoomMax = mParameters.getMaxZoom(); + mZoomMax = mParameters.getZoomRatios().size() -1; mSmoothZoomSupported = mParameters.isSmoothZoomSupported(); mGestureDetector = new GestureDetector(this, new ZoomGestureListener()); @@ -1897,7 +1897,7 @@ public class Camera extends BaseCamera implements View.OnClickListener, * preview size/picture resolution */ mParameters = mCameraDevice.getParameters(); - mZoomMax = mParameters.getMaxZoom(); + mZoomMax = mParameters.getZoomRatios().size() -1; } private void stopPreview() { diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 7987d36..29e763f 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -1777,7 +1777,7 @@ public class VideoCamera extends BaseCamera // Maximum zoom value may change after preview size is set. Get the // latest parameters here. - mZoomMax = mParameters.getMaxZoom(); + mZoomMax = mParameters.getZoomRatios().size() -1; mGestureDetector = new GestureDetector(this, new ZoomGestureListener()); mCameraDevice.setZoomChangeListener(mZoomListener); project vendor/cyanogen/ diff --git a/overlay/common/frameworks/base/core/res/res/drawable/default_wallpaper.jpg b/overlay/common/frameworks/base/core/res/res/drawable/default_wallpaper.jpg index 0c29d88..5431bc9 100644 Binary files a/overlay/common/frameworks/base/core/res/res/drawable/default_wallpaper.jpg and b/overlay/common/frameworks/base/core/res/res/drawable/default_wallpaper.jpg differ