From 1cd1768436d1004bce888e4013a3a35f2afabb3f Mon Sep 17 00:00:00 2001 From: Simon Shields Date: Thu, 14 Jan 2016 00:12:58 +1100 Subject: smdk4412: kill low latency audio a2dp is super stuttery with low-latency audio enabled Change-Id: Ib3a6a0d666635f01ab51a21074322b61bd148219 --- common.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/common.mk b/common.mk index 38418f0..a7337f4 100644 --- a/common.mk +++ b/common.mk @@ -140,7 +140,6 @@ PRODUCT_PACKAGES += \ # These are the hardware-specific features PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \ frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \ frameworks/native/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml \ frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:system/etc/permissions/android.hardware.camera.flash-autofocus.xml \ -- cgit v1.1 From 27db785d781822af7376a9e65a48dc1b5956ff40 Mon Sep 17 00:00:00 2001 From: MarcKe Date: Sun, 1 Feb 2015 11:29:01 +0100 Subject: Fix crash when switching between cameras Conflicts: camera/exynos_camera.c Change-Id: I38b41feb4d0880b32fa847a907f50a7c2dc95cd6 --- camera/exynos_camera.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/camera/exynos_camera.c b/camera/exynos_camera.c index 8501bea..3021ff5 100644 --- a/camera/exynos_camera.c +++ b/camera/exynos_camera.c @@ -2364,10 +2364,14 @@ int exynos_camera_preview(struct exynos_camera *exynos_camera) } if (exynos_camera->preview_window != NULL && exynos_camera->gralloc != NULL) { - exynos_camera->preview_window->dequeue_buffer(exynos_camera->preview_window, &window_buffer, &window_stride); - exynos_camera->gralloc->lock(exynos_camera->gralloc, *window_buffer, GRALLOC_USAGE_SW_WRITE_OFTEN, 0, 0, width, height, &window_data); + int ret = exynos_camera->preview_window->dequeue_buffer(exynos_camera->preview_window, &window_buffer, &window_stride); + if (ret < 0) { + ALOGE("%s: Error in dequeueing buffer", __func__); + goto error; + } + ret = exynos_camera->gralloc->lock(exynos_camera->gralloc, *window_buffer, GRALLOC_USAGE_YUV_ADDR | GRALLOC_USAGE_SW_WRITE_OFTEN, 0, 0, width, height, &window_data); - if (window_data == NULL) { + if (window_data == NULL || ret == -EINVAL) { ALOGE("%s: Unable to lock gralloc", __func__); goto error; } -- cgit v1.1 From e0ee8862745fdbe0812af963e8fec8a0da6ec862 Mon Sep 17 00:00:00 2001 From: rogersb11 Date: Wed, 10 Feb 2016 20:20:36 -0500 Subject: Allow flashlight to hold a wakelock Change-Id: Ie610dbc7f24f8831b5074bcdf4035a4ec949a596 --- .../base/packages/SystemUI/res/values/config.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/config.xml diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml new file mode 100644 index 0000000..c207bfe --- /dev/null +++ b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml @@ -0,0 +1,22 @@ + + + + + true + -- cgit v1.1 From e8c54e0ff69cf7d27f02f12d30442db077cf68f8 Mon Sep 17 00:00:00 2001 From: Simon Shields Date: Tue, 9 Feb 2016 12:22:50 +1100 Subject: smdk4412-common: add macloader and tinyplay sepolicy [1/2] Change-Id: I1dcc6f97ba7f6d95ed92770d5f38d03b4e3b3d57 --- BoardCommonConfig.mk | 3 +++ selinux/file_contexts | 2 ++ selinux/macloader.te | 11 +++++++++++ selinux/tinyplay.te | 8 ++++++++ 4 files changed, 24 insertions(+) create mode 100644 selinux/file_contexts create mode 100644 selinux/macloader.te create mode 100644 selinux/tinyplay.te diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk index f38111f..e7ae11f 100755 --- a/BoardCommonConfig.mk +++ b/BoardCommonConfig.mk @@ -156,6 +156,9 @@ BOARD_HAS_LARGE_FILESYSTEM := true BOARD_HAS_NO_MISC_PARTITION := true BOARD_HAS_NO_SELECT_BUTTON := true +# SELinux +BOARD_SEPOLICY_DIRS += device/samsung/smdk4412-common/selinux + # Charging mode BOARD_CHARGING_MODE_BOOTING_LPM := /sys/class/power_supply/battery/batt_lp_charging BOARD_BATTERY_DEVICE_NAME := "battery" diff --git a/selinux/file_contexts b/selinux/file_contexts new file mode 100644 index 0000000..30f284f --- /dev/null +++ b/selinux/file_contexts @@ -0,0 +1,2 @@ +/system/bin/macloader u:object_r:macloader_exec:s0 +/system/bin/tinyplay u:object_r:tinyplay_exec:s0 diff --git a/selinux/macloader.te b/selinux/macloader.te new file mode 100644 index 0000000..a3eb4a2 --- /dev/null +++ b/selinux/macloader.te @@ -0,0 +1,11 @@ +type macloader, domain; +type macloader_exec, exec_type, file_type; +init_daemon_domain(macloader); + +allow macloader efs_file:dir search; +allow macloader efs_device_file:dir search; +allow macloader wifi_data_file:file { read getattr open write setattr }; +allow macloader self:capability { dac_override chown fowner fsetid }; +allow macloader system_data_file:dir w_dir_perms; + +domain_trans(init, rootfs, macloader) diff --git a/selinux/tinyplay.te b/selinux/tinyplay.te new file mode 100644 index 0000000..49a5f37 --- /dev/null +++ b/selinux/tinyplay.te @@ -0,0 +1,8 @@ +type tinyplay, domain; +type tinyplay_exec, exec_type, file_type; +init_daemon_domain(tinyplay) + +allow tinyplay audio_device:chr_file { open read write ioctl }; +allow tinyplay audio_device:dir search; + +domain_trans(init, rootfs, tinyplay) -- cgit v1.1 From bc4d6912918a166faf91da62574700a2de0aa3b9 Mon Sep 17 00:00:00 2001 From: rogersb11 Date: Sun, 14 Feb 2016 18:14:10 -0500 Subject: Remove ifdef for deprecated Torch package Change-Id: Ic74d8426d483182f916619a49f43f16e596a9c79 --- common.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/common.mk b/common.mk index a7337f4..c3a2b85 100644 --- a/common.mk +++ b/common.mk @@ -79,11 +79,6 @@ PRODUCT_PACKAGES := \ macloader \ tinymix -ifneq ($(TARGET_HAS_CAM_FLASH) ,false) -PRODUCT_PACKAGES += \ - Torch -endif - # MFC API PRODUCT_PACKAGES += \ libsecmfcdecapi \ -- cgit v1.1 From 8923d69452b4e0572eb85966ab0f50b4773ba422 Mon Sep 17 00:00:00 2001 From: rogersb11 Date: Sun, 14 Feb 2016 18:17:01 -0500 Subject: SMDK4412: Snap it Use Snapdragon camera for all 4412 devices instead of defining in each device Change-Id: Iff9c1c6c5a405b497ebc82b717a764527385272f --- common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/common.mk b/common.mk index c3a2b85..b0e725f 100644 --- a/common.mk +++ b/common.mk @@ -77,6 +77,7 @@ PRODUCT_PACKAGES := \ libsync \ lights.exynos4 \ macloader \ + Snap \ tinymix # MFC API -- cgit v1.1 From 1ff66e59f9592caaad9a502e7a4fff2875adaef5 Mon Sep 17 00:00:00 2001 From: Arne Coucheron Date: Thu, 10 Sep 2015 00:53:11 +0200 Subject: Fix Netflix and YouTube. Use custom google video xml, with removed support of adaptive playback. Change-Id: I6b0f0072a5cf55471043d1e95598359c02f8acf8 --- common.mk | 7 ++- configs/media_codecs.xml | 56 ++++++++++++++--- configs/media_codecs_google_video_le.xml | 101 +++++++++++++++++++++++++++++++ 3 files changed, 151 insertions(+), 13 deletions(-) create mode 100644 configs/media_codecs_google_video_le.xml diff --git a/common.mk b/common.mk index b0e725f..43ec678 100644 --- a/common.mk +++ b/common.mk @@ -98,11 +98,12 @@ PRODUCT_PACKAGES += \ # libOMX.SEC.VP8.Decoder PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/configs/media_profiles.xml:system/etc/media_profiles.xml \ - $(COMMON_PATH)/configs/media_codecs.xml:system/etc/media_codecs.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml + frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ + $(COMMON_PATH)/configs/media_profiles.xml:system/etc/media_profiles.xml \ + $(COMMON_PATH)/configs/media_codecs.xml:system/etc/media_codecs.xml \ + $(COMMON_PATH)/configs/media_codecs_google_video_le.xml:system/etc/media_codecs_google_video_le.xml # Filesystem management tools PRODUCT_PACKAGES += \ diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml index b628b68..48c516c 100755 --- a/configs/media_codecs.xml +++ b/configs/media_codecs.xml @@ -78,18 +78,54 @@ Only the three quirks included above are recognized at this point: - - - - + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - + diff --git a/configs/media_codecs_google_video_le.xml b/configs/media_codecs_google_video_le.xml new file mode 100644 index 0000000..368823e --- /dev/null +++ b/configs/media_codecs_google_video_le.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.1 From e8cd6c80e56408938cbce9be5ac5736df9098a9c Mon Sep 17 00:00:00 2001 From: Simon Shields Date: Sat, 20 Feb 2016 17:23:41 +1100 Subject: smdk4412: update proprietary-files.txt Change-Id: I9392b9c9c6560c35c3db3d2cfe816adf7bb719eb --- proprietary-files.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/proprietary-files.txt b/proprietary-files.txt index 5da466e..21c4b74 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -20,7 +20,6 @@ system/etc/wifi/nvram_net.txt_semcosh system/lib/egl/libEGL_mali.so system/lib/egl/libGLESv1_CM_mali.so system/lib/egl/libGLESv2_mali.so -system/lib/libaudiosa.so system/lib/libcec.so system/lib/libddc.so system/lib/libedid.so @@ -52,8 +51,6 @@ system/vendor/firmware/SlimISP_ZH.bin system/vendor/firmware/SlimISP_ZK.bin system/vendor/firmware/SlimISP_ZM.bin system/vendor/lib/drm/libdrmwvmplugin.so -system/vendor/lib/liblvverx.so -system/vendor/lib/liblvvetx.so system/vendor/lib/libwvdrm_L1.so system/vendor/lib/libwvm.so system/vendor/lib/libWVStreamControlAPI_L1.so -- cgit v1.1 From e836d0e18c46efad018368624fb9e4a2c80c77f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20G=C3=B3rski?= Date: Mon, 22 Feb 2016 12:19:14 -0800 Subject: Revert "Fix Netflix and YouTube." This reverts commit 1ff66e59f9592caaad9a502e7a4fff2875adaef5. Change-Id: I8b0200ad1f9476ee7ae670734ec34fb75e7ad4cd --- common.mk | 7 +-- configs/media_codecs.xml | 56 +++-------------- configs/media_codecs_google_video_le.xml | 101 ------------------------------- 3 files changed, 13 insertions(+), 151 deletions(-) delete mode 100644 configs/media_codecs_google_video_le.xml diff --git a/common.mk b/common.mk index 43ec678..b0e725f 100644 --- a/common.mk +++ b/common.mk @@ -98,12 +98,11 @@ PRODUCT_PACKAGES += \ # libOMX.SEC.VP8.Decoder PRODUCT_COPY_FILES += \ - frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ $(COMMON_PATH)/configs/media_profiles.xml:system/etc/media_profiles.xml \ $(COMMON_PATH)/configs/media_codecs.xml:system/etc/media_codecs.xml \ - $(COMMON_PATH)/configs/media_codecs_google_video_le.xml:system/etc/media_codecs_google_video_le.xml + frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml # Filesystem management tools PRODUCT_PACKAGES += \ diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml index 48c516c..b628b68 100755 --- a/configs/media_codecs.xml +++ b/configs/media_codecs.xml @@ -78,54 +78,18 @@ Only the three quirks included above are recognized at this point: + - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + - + + diff --git a/configs/media_codecs_google_video_le.xml b/configs/media_codecs_google_video_le.xml deleted file mode 100644 index 368823e..0000000 --- a/configs/media_codecs_google_video_le.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.1 From cbb13c9e0ac81ebb5e539a0ee32d3157374c96a9 Mon Sep 17 00:00:00 2001 From: Simon Shields Date: Fri, 18 Mar 2016 23:13:27 +1100 Subject: smdk4412-common: commonize AdvancedDisplay [3/3] Change-Id: Ie66ca09bccc5e651365c1fe0004ba81eaed823ba --- AdvancedDisplay/Android.mk | 15 -- AdvancedDisplay/AndroidManifest.xml | 33 --- .../res/drawable/ic_launcher_cmdevicesettings.png | Bin 11748 -> 0 bytes AdvancedDisplay/res/layout/seek_bar_preference.xml | 61 ------ AdvancedDisplay/res/layout/top.xml | 5 - AdvancedDisplay/res/values-de/arrays.xml | 40 ---- AdvancedDisplay/res/values-de/strings.xml | 28 --- AdvancedDisplay/res/values-es/arrays.xml | 38 ---- AdvancedDisplay/res/values-es/strings.xml | 26 --- AdvancedDisplay/res/values-fr/arrays.xml | 38 ---- AdvancedDisplay/res/values-fr/strings.xml | 26 --- AdvancedDisplay/res/values-hu/arrays.xml | 38 ---- AdvancedDisplay/res/values-hu/strings.xml | 26 --- AdvancedDisplay/res/values-nl/arrays.xml | 40 ---- AdvancedDisplay/res/values-nl/strings.xml | 28 --- AdvancedDisplay/res/values-pl/arrays.xml | 40 ---- AdvancedDisplay/res/values-pl/strings.xml | 25 --- AdvancedDisplay/res/values-pt-rBR/arrays.xml | 40 ---- AdvancedDisplay/res/values-pt-rBR/strings.xml | 25 --- AdvancedDisplay/res/values-ru/arrays.xml | 39 ---- AdvancedDisplay/res/values-ru/strings.xml | 25 --- AdvancedDisplay/res/values-zh-rCN/arrays.xml | 40 ---- AdvancedDisplay/res/values-zh-rCN/strings.xml | 25 --- AdvancedDisplay/res/values/arrays.xml | 106 ---------- AdvancedDisplay/res/values/config.xml | 58 ------ AdvancedDisplay/res/values/custom_attrs.xml | 27 --- AdvancedDisplay/res/values/strings.xml | 33 --- AdvancedDisplay/res/xml/screen_preferences.xml | 36 ---- .../settings/device/DisplaySettings.java | 162 --------------- .../settings/device/ScreenFragmentActivity.java | 79 ------- .../settings/device/SeekBarPreference.java | 226 --------------------- .../com/cyanogenmod/settings/device/Startup.java | 32 --- .../src/com/cyanogenmod/settings/device/Utils.java | 163 --------------- .../com/cyanogenmod/settings/device/mDNIeMode.java | 61 ------ .../cyanogenmod/settings/device/mDNIeNegative.java | 61 ------ .../cyanogenmod/settings/device/mDNIeScenario.java | 61 ------ 36 files changed, 1806 deletions(-) delete mode 100644 AdvancedDisplay/Android.mk delete mode 100644 AdvancedDisplay/AndroidManifest.xml delete mode 100755 AdvancedDisplay/res/drawable/ic_launcher_cmdevicesettings.png delete mode 100644 AdvancedDisplay/res/layout/seek_bar_preference.xml delete mode 100755 AdvancedDisplay/res/layout/top.xml delete mode 100644 AdvancedDisplay/res/values-de/arrays.xml delete mode 100644 AdvancedDisplay/res/values-de/strings.xml delete mode 100644 AdvancedDisplay/res/values-es/arrays.xml delete mode 100644 AdvancedDisplay/res/values-es/strings.xml delete mode 100644 AdvancedDisplay/res/values-fr/arrays.xml delete mode 100644 AdvancedDisplay/res/values-fr/strings.xml delete mode 100644 AdvancedDisplay/res/values-hu/arrays.xml delete mode 100644 AdvancedDisplay/res/values-hu/strings.xml delete mode 100644 AdvancedDisplay/res/values-nl/arrays.xml delete mode 100644 AdvancedDisplay/res/values-nl/strings.xml delete mode 100644 AdvancedDisplay/res/values-pl/arrays.xml delete mode 100644 AdvancedDisplay/res/values-pl/strings.xml delete mode 100644 AdvancedDisplay/res/values-pt-rBR/arrays.xml delete mode 100644 AdvancedDisplay/res/values-pt-rBR/strings.xml delete mode 100644 AdvancedDisplay/res/values-ru/arrays.xml delete mode 100644 AdvancedDisplay/res/values-ru/strings.xml delete mode 100644 AdvancedDisplay/res/values-zh-rCN/arrays.xml delete mode 100644 AdvancedDisplay/res/values-zh-rCN/strings.xml delete mode 100644 AdvancedDisplay/res/values/arrays.xml delete mode 100644 AdvancedDisplay/res/values/config.xml delete mode 100644 AdvancedDisplay/res/values/custom_attrs.xml delete mode 100644 AdvancedDisplay/res/values/strings.xml delete mode 100644 AdvancedDisplay/res/xml/screen_preferences.xml delete mode 100644 AdvancedDisplay/src/com/cyanogenmod/settings/device/DisplaySettings.java delete mode 100644 AdvancedDisplay/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java delete mode 100644 AdvancedDisplay/src/com/cyanogenmod/settings/device/SeekBarPreference.java delete mode 100644 AdvancedDisplay/src/com/cyanogenmod/settings/device/Startup.java delete mode 100644 AdvancedDisplay/src/com/cyanogenmod/settings/device/Utils.java delete mode 100644 AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeMode.java delete mode 100644 AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeNegative.java delete mode 100644 AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeScenario.java diff --git a/AdvancedDisplay/Android.mk b/AdvancedDisplay/Android.mk deleted file mode 100644 index f848efe..0000000 --- a/AdvancedDisplay/Android.mk +++ /dev/null @@ -1,15 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := AdvancedDisplay -LOCAL_CERTIFICATE := platform - -include $(BUILD_PACKAGE) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/AdvancedDisplay/AndroidManifest.xml b/AdvancedDisplay/AndroidManifest.xml deleted file mode 100644 index bd470fa..0000000 --- a/AdvancedDisplay/AndroidManifest.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/AdvancedDisplay/res/drawable/ic_launcher_cmdevicesettings.png b/AdvancedDisplay/res/drawable/ic_launcher_cmdevicesettings.png deleted file mode 100755 index 9bfdd78..0000000 Binary files a/AdvancedDisplay/res/drawable/ic_launcher_cmdevicesettings.png and /dev/null differ diff --git a/AdvancedDisplay/res/layout/seek_bar_preference.xml b/AdvancedDisplay/res/layout/seek_bar_preference.xml deleted file mode 100644 index 38d9a1e..0000000 --- a/AdvancedDisplay/res/layout/seek_bar_preference.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/AdvancedDisplay/res/layout/top.xml b/AdvancedDisplay/res/layout/top.xml deleted file mode 100755 index 744b568..0000000 --- a/AdvancedDisplay/res/layout/top.xml +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/AdvancedDisplay/res/values-de/arrays.xml b/AdvancedDisplay/res/values-de/arrays.xml deleted file mode 100644 index d3faa6a..0000000 --- a/AdvancedDisplay/res/values-de/arrays.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - CyanogenMod (Standard) - UI - Video - Video warm - Video kalt - Kamera - Navigation - Gallerie - VT - - - - Dynamisch (Standard) - Standard - Natürlich - Film - - - - Normal - Invertiert - - diff --git a/AdvancedDisplay/res/values-de/strings.xml b/AdvancedDisplay/res/values-de/strings.xml deleted file mode 100644 index 419f05c..0000000 --- a/AdvancedDisplay/res/values-de/strings.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - Zurücksetzen - - Display - Farben - Szenario - Wähle das mDNIe Szenario - Modus - Wähle den mDNIe Modus - Negativ Modus - Invertiere Farben - - diff --git a/AdvancedDisplay/res/values-es/arrays.xml b/AdvancedDisplay/res/values-es/arrays.xml deleted file mode 100644 index 94c10b9..0000000 --- a/AdvancedDisplay/res/values-es/arrays.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - CyanogenMod (por defecto) - UI - Vídeo - Vídeo cálido - Vídeo frío - Camara - Navegación - Galería - VT - - - Estándar (por defecto) - Dinámico - Natural - Película - - - Normal - Invertido - - diff --git a/AdvancedDisplay/res/values-es/strings.xml b/AdvancedDisplay/res/values-es/strings.xml deleted file mode 100644 index e7c1594..0000000 --- a/AdvancedDisplay/res/values-es/strings.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - Restablecer - Pantalla - Colores - Escenario - Establecer escenario mDNIe - Modo - Establecer modo mDNIe - Modo Negativo - Habilitar/deshabilitar colores invertidos - diff --git a/AdvancedDisplay/res/values-fr/arrays.xml b/AdvancedDisplay/res/values-fr/arrays.xml deleted file mode 100644 index 6983df7..0000000 --- a/AdvancedDisplay/res/values-fr/arrays.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - CyanogenMod (Défaut) - UI - Vidéo - Vidéo chaude - Vidéo froide - Caméra - Navigation - Galerie - VT - - - Dynamique (Défaut) - Standard - Naturel - Vidéo - - - Normal - Inversé - - diff --git a/AdvancedDisplay/res/values-fr/strings.xml b/AdvancedDisplay/res/values-fr/strings.xml deleted file mode 100644 index 4e5e67c..0000000 --- a/AdvancedDisplay/res/values-fr/strings.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - Réinitialiser - Écran - Couleurs - Scénario - Définir le scénario mDNIe - Mode - Définir le mode mDNIe - Mode négatif - Activer/désactiver les couleurs inversées - diff --git a/AdvancedDisplay/res/values-hu/arrays.xml b/AdvancedDisplay/res/values-hu/arrays.xml deleted file mode 100644 index dae3a4c..0000000 --- a/AdvancedDisplay/res/values-hu/arrays.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - CyanogenMod (Alapbeállítás) - Felhasználói felület - Videó - Videó (Meleg árnyalat) - Videó (Hideg árnyalat) - Kamera - Navigáció - Galéria - VT - - - Dinamikus (Alapbeállítás) - Hagyományos - Természetes - Film - - - Normál - Fordított - - diff --git a/AdvancedDisplay/res/values-hu/strings.xml b/AdvancedDisplay/res/values-hu/strings.xml deleted file mode 100644 index b8fcba6..0000000 --- a/AdvancedDisplay/res/values-hu/strings.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - Beállítások visszaállítása alaphelyzetbe - Kijelző - Színek - Megjelenítés - mDNIe megjelenítési beállítások - Üzemmód - mDNIe üzemmódok - Negatív üzemmód - Fordított színek ki/be - diff --git a/AdvancedDisplay/res/values-nl/arrays.xml b/AdvancedDisplay/res/values-nl/arrays.xml deleted file mode 100644 index d0baeed..0000000 --- a/AdvancedDisplay/res/values-nl/arrays.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - CyanogenMod (standaard) - Uiterlijk - Video - Video (warm) - Video (koud) - Camera - Navigatie - Galerij - VT - - - - Dynamisch (standaard) - Standaard - Natuurlijk - Film - - - - Normaal - Omgedraaid - - diff --git a/AdvancedDisplay/res/values-nl/strings.xml b/AdvancedDisplay/res/values-nl/strings.xml deleted file mode 100644 index eafc3a5..0000000 --- a/AdvancedDisplay/res/values-nl/strings.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - Standaardwaarden - - Scherm - Kleuren - - Scenario - mDNIe-scenario instellen - Modus - mDNIe-modus instellen - Negatieve modus - Negatieve kleuren in-/uitschakelen - diff --git a/AdvancedDisplay/res/values-pl/arrays.xml b/AdvancedDisplay/res/values-pl/arrays.xml deleted file mode 100644 index 30274f2..0000000 --- a/AdvancedDisplay/res/values-pl/arrays.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - CyanogenMod (domyślnie) - UI - Wideo - Ciepły film - Zimny film - Kamera - Nawigacja - Galeria - VT - - - - Dynamicznie (domyślnie) - Standardowo - Naturalnie - Film - - - - Normalnie - Odwrócony - - diff --git a/AdvancedDisplay/res/values-pl/strings.xml b/AdvancedDisplay/res/values-pl/strings.xml deleted file mode 100644 index 06ad53b..0000000 --- a/AdvancedDisplay/res/values-pl/strings.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - Ekran - Kolory - Technologia mDNIe - Ustaw scenariusz mDNIe - Tryb - Ustaw tryb mDNIe - Tryb negatywu - Włącz/wyłącz odwrócone kolory - diff --git a/AdvancedDisplay/res/values-pt-rBR/arrays.xml b/AdvancedDisplay/res/values-pt-rBR/arrays.xml deleted file mode 100644 index 77a51d2..0000000 --- a/AdvancedDisplay/res/values-pt-rBR/arrays.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - CyanogenMod (Padrão) - IU - Vídeo - Vídeo Quente - Vídeo Frio - Câmera - Navegação - Galeria - VT - - - - Padrão - Dinâmico - Natural - Filme - - - - Normal - Invertido - - diff --git a/AdvancedDisplay/res/values-pt-rBR/strings.xml b/AdvancedDisplay/res/values-pt-rBR/strings.xml deleted file mode 100644 index 76487b3..0000000 --- a/AdvancedDisplay/res/values-pt-rBR/strings.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - Tela - Cores - Cenário - Define o Cenário mDNIe - Modo - Define o Modo mDNIe - Modo Negativo - Ativar/Desativar cores invertidas - diff --git a/AdvancedDisplay/res/values-ru/arrays.xml b/AdvancedDisplay/res/values-ru/arrays.xml deleted file mode 100644 index a32bc26..0000000 --- a/AdvancedDisplay/res/values-ru/arrays.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - CyanogenMod (По умолч.) - Видео - Видео (тёпл.) - Видео (хол.) - Камера - Навигация - Галерея - VT - - - - Динамический (По умолч.) - Стандартный - Натуральный - Кино - - - - Нормально - Инверсия - - diff --git a/AdvancedDisplay/res/values-ru/strings.xml b/AdvancedDisplay/res/values-ru/strings.xml deleted file mode 100644 index 9cabd97..0000000 --- a/AdvancedDisplay/res/values-ru/strings.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - Экран - Цвета - Сценарий - Установка сценария mDNIe - Режим - Установка режима mDNIe - Негатив - Вкл./выкл. инверсии цветов - diff --git a/AdvancedDisplay/res/values-zh-rCN/arrays.xml b/AdvancedDisplay/res/values-zh-rCN/arrays.xml deleted file mode 100644 index 8b295c4..0000000 --- a/AdvancedDisplay/res/values-zh-rCN/arrays.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - CyanogenMod (默认) - 界面 - 影片 - 影片 (温) - 影片 (冷) - 相机 - 导航 - 图库 - VT - - - - 动态 (默认) - 标准 - 自然 - 电影 - - - - 正常 - 反色 - - diff --git a/AdvancedDisplay/res/values-zh-rCN/strings.xml b/AdvancedDisplay/res/values-zh-rCN/strings.xml deleted file mode 100644 index b5ee6f6..0000000 --- a/AdvancedDisplay/res/values-zh-rCN/strings.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 屏幕 - 颜色 - 场景 - 设置 mDNIe 场景 - 模式 - 设置 mDNIe 模式 - 负极模式 - 启用/禁用反色 - diff --git a/AdvancedDisplay/res/values/arrays.xml b/AdvancedDisplay/res/values/arrays.xml deleted file mode 100644 index cff1afa..0000000 --- a/AdvancedDisplay/res/values/arrays.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - CyanogenMod (Default) - UI - Video - Video Warm - Video Cold - Camera - Navigation - Gallery - VT - - - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - - - - Dynamic (Default) - Standard - Natural - Movie - - - - 0 - 1 - 2 - 3 - - - - Normal - Inverted - - - - 0 - 1 - - - - Never - 1 second - 2 seconds - 3 seconds (Default) - 4 seconds - 5 seconds - 6 seconds - - - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - - - - Blinking - Fading - - - - 0 - 1 - - - - UMTS Only - HSDPA Only - HSDPA + HSUPA - - - - 21 - 22 - 23 - - diff --git a/AdvancedDisplay/res/values/config.xml b/AdvancedDisplay/res/values/config.xml deleted file mode 100644 index 5e4be8f..0000000 --- a/AdvancedDisplay/res/values/config.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - true - "/sys/vibrator/pwm_val" - 100 - 75 - 50 - 0 - - - "/sys/class/sec/sec_epen" - "/sys/class/sec/sec_epen/epen_saving_mode" - - - false - false - - 10 - 9 - 5 - 1 - 63 - 60 - 50 - 0 - - - true - - - true - - - "/sys/class/lcd/panel/power_reduce" - "/sys/class/mdnie/mdnie/scenario" - "/sys/class/mdnie/mdnie/mode" - "/sys/class/mdnie/mdnie/negative" - - diff --git a/AdvancedDisplay/res/values/custom_attrs.xml b/AdvancedDisplay/res/values/custom_attrs.xml deleted file mode 100644 index b856986..0000000 --- a/AdvancedDisplay/res/values/custom_attrs.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/AdvancedDisplay/res/values/strings.xml b/AdvancedDisplay/res/values/strings.xml deleted file mode 100644 index d7438f4..0000000 --- a/AdvancedDisplay/res/values/strings.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - Advanced Display - - Reset to default - - - Screen - Colors - - - Scenario - Set the mDNIe Scenario - Mode - Set the mDNIe Mode - Negative Mode - Enable/Disable inverted colors - - diff --git a/AdvancedDisplay/res/xml/screen_preferences.xml b/AdvancedDisplay/res/xml/screen_preferences.xml deleted file mode 100644 index 56e536c..0000000 --- a/AdvancedDisplay/res/xml/screen_preferences.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/AdvancedDisplay/src/com/cyanogenmod/settings/device/DisplaySettings.java b/AdvancedDisplay/src/com/cyanogenmod/settings/device/DisplaySettings.java deleted file mode 100644 index d838c31..0000000 --- a/AdvancedDisplay/src/com/cyanogenmod/settings/device/DisplaySettings.java +++ /dev/null @@ -1,162 +0,0 @@ -/* - * Copyright (C) 2012 The CyanogenMod Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cyanogenmod.settings.device; - -import android.app.ActionBar; -import android.app.ActionBar.Tab; -import android.app.Activity; -import android.app.Fragment; -import android.app.FragmentTransaction; -import android.content.Context; -import android.os.Bundle; -import android.support.v4.app.FragmentActivity; -import android.support.v13.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; -import android.view.MenuItem; - -import com.cyanogenmod.settings.device.R; - -import java.util.ArrayList; - -public class DisplaySettings extends FragmentActivity { - - public static final String SHARED_PREFERENCES_BASENAME = "com.cyanogenmod.settings.device"; - public static final String ACTION_UPDATE_PREFERENCES = "com.cyanogenmod.settings.device.UPDATE"; - public static final String KEY_CABC = "cabc"; - public static final String KEY_MDNIE_SCENARIO = "mdnie_scenario"; - public static final String KEY_MDNIE_MODE = "mdnie_mode"; - public static final String KEY_MDNIE_NEGATIVE = "mdnie_negative"; - public static final String KEY_LED_FADE = "led_fade"; - public static final String KEY_TOUCHKEY_LIGHT = "touchkey_light"; - public static final String KEY_TOUCHKEY_TIMEOUT = "touchkey_timeout"; - public static final String KEY_HSPA = "hspa"; - public static final String KEY_USE_DOCK_AUDIO = "dock_audio"; - public static final String KEY_CATEGORY_SPEN = "category_spen"; - public static final String KEY_SPEN_POWER_SAVING_MODE = "spen_power_saving"; - - ViewPager mViewPager; - TabsAdapter mTabsAdapter; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - mViewPager = new ViewPager(this); - mViewPager.setId(R.id.viewPager); - setContentView(mViewPager); - - final ActionBar bar = getActionBar(); - bar.setTitle(R.string.app_name); - bar.setDisplayHomeAsUpEnabled(true); - - mTabsAdapter = new TabsAdapter(this, mViewPager); - mTabsAdapter.addTab(bar.newTab().setText(R.string.category_screen_title), - ScreenFragmentActivity.class, null); - - if (savedInstanceState != null) { - bar.setSelectedNavigationItem(savedInstanceState.getInt("tab", 0)); - } - } - - @Override - protected void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - outState.putInt("tab", getActionBar().getSelectedNavigationIndex()); - } - - public static class TabsAdapter extends FragmentPagerAdapter - implements ActionBar.TabListener, ViewPager.OnPageChangeListener { - private final Context mContext; - private final ActionBar mActionBar; - private final ViewPager mViewPager; - private final ArrayList mTabs = new ArrayList(); - - static final class TabInfo { - private final Class clss; - private final Bundle args; - - TabInfo(Class _class, Bundle _args) { - clss = _class; - args = _args; - } - } - - public TabsAdapter(Activity activity, ViewPager pager) { - super(activity.getFragmentManager()); - mContext = activity; - mActionBar = activity.getActionBar(); - mViewPager = pager; - mViewPager.setAdapter(this); - mViewPager.setOnPageChangeListener(this); - } - - public void addTab(ActionBar.Tab tab, Class clss, Bundle args) { - TabInfo info = new TabInfo(clss, args); - tab.setTag(info); - tab.setTabListener(this); - mTabs.add(info); - mActionBar.addTab(tab); - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mTabs.size(); - } - - @Override - public Fragment getItem(int position) { - TabInfo info = mTabs.get(position); - return Fragment.instantiate(mContext, info.clss.getName(), info.args); - } - - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - } - - public void onPageSelected(int position) { - mActionBar.setSelectedNavigationItem(position); - } - - public void onPageScrollStateChanged(int state) { - } - - public void onTabSelected(Tab tab, FragmentTransaction ft) { - Object tag = tab.getTag(); - for (int i=0; i mMaxValue) - newValue = mMaxValue; - else if(newValue < mMinValue) - newValue = mMinValue; - else if(mInterval != 1 && newValue % mInterval != 0) - newValue = Math.round(((float)newValue)/mInterval)*mInterval; - - // change rejected, revert to the previous value - if(!callChangeListener(newValue)){ - seekBar.setProgress(mCurrentValue - mMinValue); - return; - } - // change accepted, store it - mCurrentValue = newValue; - mStatusText.setText(String.valueOf(newValue)); - persistInt(newValue); - } - - @Override - public void onStartTrackingTouch(SeekBar seekBar) {} - - @Override - public void onStopTrackingTouch(SeekBar seekBar) { - notifyChanged(); - } - - @Override - protected Object onGetDefaultValue(TypedArray ta, int index){ - int defaultValue = ta.getInt(index, DEFAULT_VALUE); - return defaultValue; - } - - @Override - protected void onSetInitialValue(boolean restoreValue, Object defaultValue) { - if(restoreValue) { - mCurrentValue = getPersistedInt(mCurrentValue); - } - else { - int temp = 0; - try { - temp = (Integer)defaultValue; - } - catch(Exception ex) { - Log.e(TAG, "Invalid default value: " + defaultValue.toString()); - } - persistInt(temp); - mCurrentValue = temp; - } - } - - public void setValue(int value) { - mCurrentValue = value; - } -} diff --git a/AdvancedDisplay/src/com/cyanogenmod/settings/device/Startup.java b/AdvancedDisplay/src/com/cyanogenmod/settings/device/Startup.java deleted file mode 100644 index 2bada88..0000000 --- a/AdvancedDisplay/src/com/cyanogenmod/settings/device/Startup.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2012 The CyanogenMod Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cyanogenmod.settings.device; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; - -public class Startup extends BroadcastReceiver { - - @Override - public void onReceive(final Context context, final Intent bootintent) { - mDNIeScenario.restore(context); - mDNIeMode.restore(context); - mDNIeNegative.restore(context); - ScreenFragmentActivity.restore(context); - } -} diff --git a/AdvancedDisplay/src/com/cyanogenmod/settings/device/Utils.java b/AdvancedDisplay/src/com/cyanogenmod/settings/device/Utils.java deleted file mode 100644 index 4ca2e9e..0000000 --- a/AdvancedDisplay/src/com/cyanogenmod/settings/device/Utils.java +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Copyright (C) 2012 The CyanogenMod Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cyanogenmod.settings.device; - -import android.util.Log; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.IOException; -import java.io.SyncFailedException; -import android.app.AlertDialog; -import android.content.DialogInterface; -import android.content.Context; - -public class Utils { - - private static final String TAG = "DeviceSettings_Utils"; - private static final String TAG_READ = "DeviceSettings_Utils_Read"; - private static final String TAG_WRITE = "DeviceSettings_Utils_Write"; - - // Read value from sysfs interface - public static String readOneLine(String sFile) { - BufferedReader brBuffer; - String sLine = null; - - try { - brBuffer = new BufferedReader(new FileReader(sFile), 512); - try { - sLine = brBuffer.readLine(); - } finally { - Log.w(TAG_READ, "file " + sFile + ": " + sLine); - brBuffer.close(); - } - } catch (Exception e) { - Log.e(TAG_READ, "IO Exception when reading /sys/ file", e); - } - return sLine; - } - - /** - * Write a string value to the specified file. - * - * @param filename The filename - * @param value The value - */ - public static void writeValue(String filename, String value) { - FileOutputStream fos = null; - try { - fos = new FileOutputStream(new File(filename), false); - fos.write(value.getBytes()); - fos.flush(); - // fos.getFD().sync(); - } catch (FileNotFoundException ex) { - Log.w(TAG, "file " + filename + " not found: " + ex); - } catch (SyncFailedException ex) { - Log.w(TAG, "file " + filename + " sync failed: " + ex); - } catch (IOException ex) { - Log.w(TAG, "IOException trying to sync " + filename + ": " + ex); - } catch (RuntimeException ex) { - Log.w(TAG, "exception while syncing file: ", ex); - } finally { - if (fos != null) { - try { - Log.w(TAG_WRITE, "file " + filename + ": " + value); - fos.close(); - } catch (IOException ex) { - Log.w(TAG, "IOException while closing synced file: ", ex); - } catch (RuntimeException ex) { - Log.w(TAG, "exception while closing file: ", ex); - } - } - } - - } - - /** - * Write a string value to the specified file. - * - * @param filename The filename - * @param value The value - */ - public static void writeValue(String filename, Boolean value) { - FileOutputStream fos = null; - String sEnvia; - try { - fos = new FileOutputStream(new File(filename), false); - if (value) - sEnvia = "1"; - else - sEnvia = "0"; - fos.write(sEnvia.getBytes()); - fos.flush(); - // fos.getFD().sync(); - } catch (FileNotFoundException ex) { - Log.w(TAG, "file " + filename + " not found: " + ex); - } catch (SyncFailedException ex) { - Log.w(TAG, "file " + filename + " sync failed: " + ex); - } catch (IOException ex) { - Log.w(TAG, "IOException trying to sync " + filename + ": " + ex); - } catch (RuntimeException ex) { - Log.w(TAG, "exception while syncing file: ", ex); - } finally { - if (fos != null) { - try { - Log.w(TAG_WRITE, "file " + filename + ": " + value); - fos.close(); - } catch (IOException ex) { - Log.w(TAG, "IOException while closing synced file: ", ex); - } catch (RuntimeException ex) { - Log.w(TAG, "exception while closing file: ", ex); - } - } - } - } - - /** - * Write the "color value" to the specified file. The value is scaled from - * an integer to an unsigned integer by multiplying by 2. - * @param filename The filename - * @param value The value of max value Integer.MAX - */ - public static void writeColor(String filename, int value) { - writeValue(filename, String.valueOf((long) value * 2)); - } - - /** - * Check if the specified file exists. - * @param filename The filename - * @return Whether the file exists or not - */ - public static boolean fileExists(String filename) { - return new File(filename).exists(); - } - - public static void showDialog(Context ctx, String title, String message) { - final AlertDialog alertDialog = new AlertDialog.Builder(ctx).create(); - alertDialog.setTitle(title); - alertDialog.setMessage(message); - alertDialog.setButton("OK", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - alertDialog.dismiss(); - } - }); - alertDialog.show(); - } -} diff --git a/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeMode.java b/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeMode.java deleted file mode 100644 index c777d72..0000000 --- a/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeMode.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2012 The CyanogenMod Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cyanogenmod.settings.device; - -import android.content.Context; - -import android.content.SharedPreferences; -import android.util.AttributeSet; -import android.preference.Preference; -import android.preference.ListPreference; -import android.preference.Preference.OnPreferenceChangeListener; -import android.preference.PreferenceManager; - -public class mDNIeMode extends ListPreference implements OnPreferenceChangeListener { - - private static String FILE = null; - - public mDNIeMode(Context context, AttributeSet attrs) { - super(context, attrs); - this.setOnPreferenceChangeListener(this); - FILE = context.getResources().getString(R.string.mdnie_mode_sysfs_file); - } - - public static boolean isSupported(String filePath) { - return Utils.fileExists(filePath); - } - - /** - * Restore mdnie user mode setting from SharedPreferences. (Write to kernel.) - * @param context The context to read the SharedPreferences from - */ - public static void restore(Context context) { - FILE = context.getResources().getString(R.string.mdnie_mode_sysfs_file); - if (!isSupported(FILE)) { - return; - } - - SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); - Utils.writeValue(FILE, sharedPrefs.getString(DisplaySettings.KEY_MDNIE_MODE, "0")); - } - - public boolean onPreferenceChange(Preference preference, Object newValue) { - Utils.writeValue(FILE, (String) newValue); - return true; - } - -} diff --git a/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeNegative.java b/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeNegative.java deleted file mode 100644 index bde9946..0000000 --- a/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeNegative.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2012 The CyanogenMod Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cyanogenmod.settings.device; - -import java.io.IOException; -import android.content.Context; -import android.util.AttributeSet; -import android.content.SharedPreferences; -import android.preference.Preference; -import android.preference.ListPreference; -import android.preference.Preference.OnPreferenceChangeListener; -import android.preference.PreferenceManager; - -public class mDNIeNegative extends ListPreference implements OnPreferenceChangeListener { - - private static String FILE = null; - - public mDNIeNegative(Context context, AttributeSet attrs) { - super(context, attrs); - this.setOnPreferenceChangeListener(this); - FILE = context.getResources().getString(R.string.mdnie_negative_sysfs_file); - } - - public static boolean isSupported(String filePath) { - return Utils.fileExists(filePath); - } - - /** - * Restore mdnie user mode setting from SharedPreferences. (Write to kernel.) - * @param context The context to read the SharedPreferences from - */ - public static void restore(Context context) { - FILE = context.getResources().getString(R.string.mdnie_negative_sysfs_file); - if (!isSupported(FILE)) { - return; - } - - SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); - Utils.writeValue(FILE, sharedPrefs.getString(DisplaySettings.KEY_MDNIE_NEGATIVE, "0")); - } - - public boolean onPreferenceChange(Preference preference, Object newValue) { - Utils.writeValue(FILE, (String) newValue); - return true; - } - -} diff --git a/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeScenario.java b/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeScenario.java deleted file mode 100644 index cbab69d..0000000 --- a/AdvancedDisplay/src/com/cyanogenmod/settings/device/mDNIeScenario.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2012 The CyanogenMod Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.cyanogenmod.settings.device; - -import android.content.Context; - -import android.content.SharedPreferences; -import android.util.AttributeSet; -import android.preference.Preference; -import android.preference.ListPreference; -import android.preference.Preference.OnPreferenceChangeListener; -import android.preference.PreferenceManager; - -public class mDNIeScenario extends ListPreference implements OnPreferenceChangeListener { - - private static String FILE = null; - - public mDNIeScenario(Context context, AttributeSet attrs) { - super(context,attrs); - this.setOnPreferenceChangeListener(this); - FILE = context.getResources().getString(R.string.mdnie_scenario_sysfs_file); - } - - public static boolean isSupported(String filePath) { - return Utils.fileExists(filePath); - } - - /** - * Restore mdnie "camera" setting from SharedPreferences. (Write to kernel.) - * @param context The context to read the SharedPreferences from - */ - public static void restore(Context context) { - FILE = context.getResources().getString(R.string.mdnie_scenario_sysfs_file); - if (!isSupported(FILE)) { - return; - } - - SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); - Utils.writeValue(FILE, sharedPrefs.getString(DisplaySettings.KEY_MDNIE_SCENARIO, "0")); - } - - public boolean onPreferenceChange(Preference preference, Object newValue) { - Utils.writeValue(FILE, (String) newValue); - return true; - } - -} -- cgit v1.1 From ad20de920c31cea68bb328bfe6238b97037115b7 Mon Sep 17 00:00:00 2001 From: Simon Shields Date: Sat, 19 Mar 2016 19:18:33 +1100 Subject: smdk4412: drop AdvancedDisplay until it's re-merged Change-Id: I3a219c65666b98f7f22cb07ec1848c05cff95c17 --- common.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/common.mk b/common.mk index b0e725f..ddffbb9 100644 --- a/common.mk +++ b/common.mk @@ -62,7 +62,6 @@ PRODUCT_COPY_FILES += \ # Packages PRODUCT_PACKAGES := \ - AdvancedDisplay \ audio.a2dp.default \ audio.primary.smdk4x12 \ audio.r_submix.default \ -- cgit v1.1 From 538b627a054c027a4c9b10db52373f80ab37eef9 Mon Sep 17 00:00:00 2001 From: Simon Shields Date: Mon, 21 Mar 2016 12:42:39 -0700 Subject: Revert "smdk4412: drop AdvancedDisplay until it's re-merged" This reverts commit ad20de920c31cea68bb328bfe6238b97037115b7. Change-Id: I76d9c01191d99f5c1dfc575aa7a3489ccae4c5a1 --- common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/common.mk b/common.mk index ddffbb9..b0e725f 100644 --- a/common.mk +++ b/common.mk @@ -62,6 +62,7 @@ PRODUCT_COPY_FILES += \ # Packages PRODUCT_PACKAGES := \ + AdvancedDisplay \ audio.a2dp.default \ audio.primary.smdk4x12 \ audio.r_submix.default \ -- cgit v1.1 From e3df9a47d760378d2d974a8d86fc1eb7ebc71a74 Mon Sep 17 00:00:00 2001 From: Wolfgang Wiedmeyer Date: Fri, 1 Jan 2016 21:21:30 +0100 Subject: move macloader to late_start class If the device is encrypted and macloader is executed before data is decrypted, a corrupted string like "0urata" will end up in .cid.info. Change-Id: Ifac0b134153998e905db0f8b4b8f8ac6c2b1558c Signed-off-by: Wolfgang Wiedmeyer --- rootdir/init.smdk4x12.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootdir/init.smdk4x12.rc b/rootdir/init.smdk4x12.rc index a07a754..9be37d7 100755 --- a/rootdir/init.smdk4x12.rc +++ b/rootdir/init.smdk4x12.rc @@ -483,7 +483,7 @@ service iprenew_bt-pan /system/bin/dhcpcd -n oneshot service macloader /system/bin/macloader - class main + class late_start oneshot # Workaround for broken incall audio -- cgit v1.1 From 2b00deb8ccc0b13f02d4e73bb8adca6a440c71dd Mon Sep 17 00:00:00 2001 From: Simon Shields Date: Wed, 20 Apr 2016 14:56:57 +1000 Subject: smdk4412: opensource libfimc Change-Id: Idc21ced99368140bb4dc66392cb60461379e1658 --- BoardCommonConfig.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk index e7ae11f..7ec916c 100755 --- a/BoardCommonConfig.mk +++ b/BoardCommonConfig.mk @@ -95,7 +95,6 @@ BOARD_CAMERA_HAVE_ISO := true COMMON_GLOBAL_CFLAGS += -DHAVE_ISO COMMON_GLOBAL_CFLAGS += -DSAMSUNG_CAMERA_HARDWARE COMMON_GLOBAL_CFLAGS += -DSAMSUNG_DVFS -BOARD_USES_PROPRIETARY_LIBFIMC := true BOARD_CAMERA_MSG_MGMT := true # OMX -- cgit v1.1 From 9136d0d7d3643a8c08b3a98f3e394d7514fff839 Mon Sep 17 00:00:00 2001 From: Simon Shields Date: Fri, 22 Apr 2016 02:40:38 +1000 Subject: smdk4412: update extract-files and proprietary-files libump/libfimc are no longer blobs Change-Id: I3251f759b914652620fd80ffb80198974e6fed44 --- extract-files.sh | 21 --------------------- proprietary-files.txt | 2 -- 2 files changed, 23 deletions(-) diff --git a/extract-files.sh b/extract-files.sh index e380cb5..93d33c1 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -56,7 +56,6 @@ done LOCAL_PATH := vendor/samsung/smdk4412-common PRODUCT_PACKAGES += \\ - libTVOut \\ libUMP \\ libfimc @@ -105,26 +104,6 @@ LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib include \$(BUILD_PREBUILT) -include \$(CLEAR_VARS) -LOCAL_MODULE := libUMP -LOCAL_MODULE_OWNER := samsung -LOCAL_SRC_FILES := system/lib/libUMP.so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib -include \$(BUILD_PREBUILT) - -include \$(CLEAR_VARS) -LOCAL_MODULE := libfimc -LOCAL_MODULE_OWNER := samsung -LOCAL_SRC_FILES := system/lib/libfimc.so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib -include \$(BUILD_PREBUILT) - endif EOF diff --git a/proprietary-files.txt b/proprietary-files.txt index 21c4b74..2ccb529 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -23,7 +23,6 @@ system/lib/egl/libGLESv2_mali.so system/lib/libcec.so system/lib/libddc.so system/lib/libedid.so -system/lib/libfimc.so system/lib/libfimg.so system/lib/libhwconverter.so system/lib/libhwjpeg.so @@ -32,7 +31,6 @@ system/lib/libMcClient.so system/lib/libMcRegistry.so system/lib/libMcVersion.so system/lib/libsecnativefeature.so -system/lib/libUMP.so system/usr/idc/melfas_ts.idc system/usr/idc/sec_touchscreen.idc system/usr/keylayout/gpio-keys.kl -- cgit v1.1 From ae3e4110f37d465ce65bf39c182b230a2aacb84a Mon Sep 17 00:00:00 2001 From: Pratik Anurag Date: Fri, 29 Apr 2016 20:51:41 -0700 Subject: Revert "smdk4412: opensource libfimc" This reverts commit 2b00deb8ccc0b13f02d4e73bb8adca6a440c71dd. Solves: * causes green lines on YouTube * device freezes while watching the videos * gif(s) show the same behavior Change-Id: I4972b06ce2cad087bb6abacb2147b1fbba039b59 --- BoardCommonConfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk index 7ec916c..e7ae11f 100755 --- a/BoardCommonConfig.mk +++ b/BoardCommonConfig.mk @@ -95,6 +95,7 @@ BOARD_CAMERA_HAVE_ISO := true COMMON_GLOBAL_CFLAGS += -DHAVE_ISO COMMON_GLOBAL_CFLAGS += -DSAMSUNG_CAMERA_HARDWARE COMMON_GLOBAL_CFLAGS += -DSAMSUNG_DVFS +BOARD_USES_PROPRIETARY_LIBFIMC := true BOARD_CAMERA_MSG_MGMT := true # OMX -- cgit v1.1 From ee3031055a7c8082bcd4fe7ffca52c240836231f Mon Sep 17 00:00:00 2001 From: RGIB Date: Tue, 3 May 2016 15:20:59 +0200 Subject: smdk4412 : add Gello browser Change-Id: I588c1ebff9fe88c91596a27a87d84393641c6edb --- common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/common.mk b/common.mk index b0e725f..bf22206 100644 --- a/common.mk +++ b/common.mk @@ -68,6 +68,7 @@ PRODUCT_PACKAGES := \ audio.r_submix.default \ audio.usb.default \ com.android.future.usb.accessory \ + Gello \ gralloc.exynos4 \ hwcomposer.exynos4 \ libfimg \ -- cgit v1.1 From d508a5afb5ef8a760a09c6f0e8e1a3da07a17a47 Mon Sep 17 00:00:00 2001 From: Simon Shields Date: Fri, 13 May 2016 18:05:56 +1000 Subject: smdk4412-common: update extract-files/proprietary-files This partially reverts commit 9136d0d7d3643a8c08b3a98f3e394d7514fff839. Change-Id: Iae60db0dcc2b9736d41d6da58a07f0f2c2362452 --- extract-files.sh | 10 ++++++++++ proprietary-files.txt | 1 + 2 files changed, 11 insertions(+) diff --git a/extract-files.sh b/extract-files.sh index 93d33c1..622acd2 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -104,6 +104,16 @@ LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib include \$(BUILD_PREBUILT) +include \$(CLEAR_VARS) +LOCAL_MODULE := libfimc +LOCAL_MODULE_OWNER := samsung +LOCAL_SRC_FILES := system/lib/libfimc.so +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib +include \$(BUILD_PREBUILT) + endif EOF diff --git a/proprietary-files.txt b/proprietary-files.txt index 2ccb529..1625bb9 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -23,6 +23,7 @@ system/lib/egl/libGLESv2_mali.so system/lib/libcec.so system/lib/libddc.so system/lib/libedid.so +system/lib/libfimc.so system/lib/libfimg.so system/lib/libhwconverter.so system/lib/libhwjpeg.so -- cgit v1.1