diff options
| author | Zhang Fang <zfang@codeaurora.org> | 2014-01-08 23:03:21 +0800 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2015-10-29 17:36:29 -0700 |
| commit | 853513841512a0fbf15dc22c7164a98d0a2de80b (patch) | |
| tree | 69fb124b302ca8f5f96be0695df04764c9581190 | |
| parent | d4ebf3a59930db25be8296c88b40c3ee4330768f (diff) | |
| download | packages_apps_Settings-853513841512a0fbf15dc22c7164a98d0a2de80b.zip packages_apps_Settings-853513841512a0fbf15dc22c7164a98d0a2de80b.tar.gz packages_apps_Settings-853513841512a0fbf15dc22c7164a98d0a2de80b.tar.bz2 | |
Settings: Add screen color settings
Add "Screen Color" item in settings.
This function support set Hue, Saturation, Contrast and Intensity value,
and screen color will be changed by this settings.
Change-Id: If6f6e7ee7f28862476a8b955cd3252175fefa2a1
Settings : Fix CustomScreenColor when picking an image
Change-Id: I510b562eb0e9fb9b558380db5c5d6e818ba17d12
Settings: Start service as explicit intent
Needed for API level 21. Add some ressource bits, set text color to
white.
Change-Id: I9c4a9139be69fa5c6d6c74055b5475f0d930c93a
52 files changed, 1954 insertions, 1 deletions
@@ -16,6 +16,9 @@ LOCAL_SRC_FILES := \ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res +LOCAL_SRC_FILES += \ + src/com/android/display/IPPService.aidl + LOCAL_PACKAGE_NAME := Settings LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 17eb93d..ff771f2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -94,6 +94,16 @@ android:allowBackup="false" android:usesCleartextTraffic="false"> + <!-- Screen color Settings Controls --> + <activity android:name=".ScreenColorSettings" android:label="@string/screencolor" + android:configChanges="orientation|keyboardHidden|screenSize" + android:screenOrientation="nosensor"> + </activity> + <activity android:name=".CustomScreenColor" android:label="@string/custom_screencolor" + android:configChanges="orientation|keyboardHidden|screenSize" + android:screenOrientation="nosensor"> + </activity> + <!-- Settings --> <uses-library android:name="org.cyanogenmod.hardware" android:required="false" /> diff --git a/res/drawable-hdpi/btn_default.9.png b/res/drawable-hdpi/btn_default.9.png Binary files differnew file mode 100644 index 0000000..a82048e --- /dev/null +++ b/res/drawable-hdpi/btn_default.9.png diff --git a/res/drawable-hdpi/btn_default_disabled.9.png b/res/drawable-hdpi/btn_default_disabled.9.png Binary files differnew file mode 100644 index 0000000..45fa090 --- /dev/null +++ b/res/drawable-hdpi/btn_default_disabled.9.png diff --git a/res/drawable-hdpi/btn_default_disabled_focused_holo_dark.9.png b/res/drawable-hdpi/btn_default_disabled_focused_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..13ab8f7 --- /dev/null +++ b/res/drawable-hdpi/btn_default_disabled_focused_holo_dark.9.png diff --git a/res/drawable-hdpi/btn_default_focused_holo_dark.9.png b/res/drawable-hdpi/btn_default_focused_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..fee599a --- /dev/null +++ b/res/drawable-hdpi/btn_default_focused_holo_dark.9.png diff --git a/res/drawable-hdpi/btn_default_pressed_holo_dark.9.png b/res/drawable-hdpi/btn_default_pressed_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..baf7018 --- /dev/null +++ b/res/drawable-hdpi/btn_default_pressed_holo_dark.9.png diff --git a/res/drawable-hdpi/default_screencolor_setting.png b/res/drawable-hdpi/default_screencolor_setting.png Binary files differnew file mode 100644 index 0000000..90de65d --- /dev/null +++ b/res/drawable-hdpi/default_screencolor_setting.png diff --git a/res/drawable-hdpi/ic_down.png b/res/drawable-hdpi/ic_down.png Binary files differnew file mode 100644 index 0000000..f2ae375 --- /dev/null +++ b/res/drawable-hdpi/ic_down.png diff --git a/res/drawable-hdpi/ic_down_pressed.png b/res/drawable-hdpi/ic_down_pressed.png Binary files differnew file mode 100644 index 0000000..4646056 --- /dev/null +++ b/res/drawable-hdpi/ic_down_pressed.png diff --git a/res/drawable-hdpi/ic_more_default.png b/res/drawable-hdpi/ic_more_default.png Binary files differnew file mode 100644 index 0000000..b05d204 --- /dev/null +++ b/res/drawable-hdpi/ic_more_default.png diff --git a/res/drawable-hdpi/ic_more_pressed.png b/res/drawable-hdpi/ic_more_pressed.png Binary files differnew file mode 100644 index 0000000..30ef4f3 --- /dev/null +++ b/res/drawable-hdpi/ic_more_pressed.png diff --git a/res/drawable-hdpi/ic_new_default.png b/res/drawable-hdpi/ic_new_default.png Binary files differnew file mode 100644 index 0000000..24f96f3 --- /dev/null +++ b/res/drawable-hdpi/ic_new_default.png diff --git a/res/drawable-hdpi/ic_new_dis.png b/res/drawable-hdpi/ic_new_dis.png Binary files differnew file mode 100644 index 0000000..2454ced --- /dev/null +++ b/res/drawable-hdpi/ic_new_dis.png diff --git a/res/drawable-hdpi/ic_new_glow.png b/res/drawable-hdpi/ic_new_glow.png Binary files differnew file mode 100644 index 0000000..201ec86 --- /dev/null +++ b/res/drawable-hdpi/ic_new_glow.png diff --git a/res/drawable-hdpi/ic_new_pressed.png b/res/drawable-hdpi/ic_new_pressed.png Binary files differnew file mode 100644 index 0000000..4f0c46a --- /dev/null +++ b/res/drawable-hdpi/ic_new_pressed.png diff --git a/res/drawable-hdpi/ic_previous_default.png b/res/drawable-hdpi/ic_previous_default.png Binary files differnew file mode 100644 index 0000000..a84990e --- /dev/null +++ b/res/drawable-hdpi/ic_previous_default.png diff --git a/res/drawable-hdpi/ic_previous_dis.png b/res/drawable-hdpi/ic_previous_dis.png Binary files differnew file mode 100644 index 0000000..aea14f3 --- /dev/null +++ b/res/drawable-hdpi/ic_previous_dis.png diff --git a/res/drawable-hdpi/ic_previous_glow.png b/res/drawable-hdpi/ic_previous_glow.png Binary files differnew file mode 100644 index 0000000..ec83882 --- /dev/null +++ b/res/drawable-hdpi/ic_previous_glow.png diff --git a/res/drawable-hdpi/ic_previous_pressed.png b/res/drawable-hdpi/ic_previous_pressed.png Binary files differnew file mode 100644 index 0000000..75af0be --- /dev/null +++ b/res/drawable-hdpi/ic_previous_pressed.png diff --git a/res/drawable-hdpi/ic_up.png b/res/drawable-hdpi/ic_up.png Binary files differnew file mode 100644 index 0000000..2d51f39 --- /dev/null +++ b/res/drawable-hdpi/ic_up.png diff --git a/res/drawable-hdpi/ic_up_pressed.png b/res/drawable-hdpi/ic_up_pressed.png Binary files differnew file mode 100644 index 0000000..ee03700 --- /dev/null +++ b/res/drawable-hdpi/ic_up_pressed.png diff --git a/res/drawable-hdpi/ic_zoom_in_holo_dark.png b/res/drawable-hdpi/ic_zoom_in_holo_dark.png Binary files differnew file mode 100644 index 0000000..89b5f15 --- /dev/null +++ b/res/drawable-hdpi/ic_zoom_in_holo_dark.png diff --git a/res/drawable-hdpi/ic_zoom_in_holo_light.png b/res/drawable-hdpi/ic_zoom_in_holo_light.png Binary files differnew file mode 100644 index 0000000..9751ca3 --- /dev/null +++ b/res/drawable-hdpi/ic_zoom_in_holo_light.png diff --git a/res/drawable-hdpi/ic_zoom_out_holo_dark.png b/res/drawable-hdpi/ic_zoom_out_holo_dark.png Binary files differnew file mode 100644 index 0000000..f4a2589 --- /dev/null +++ b/res/drawable-hdpi/ic_zoom_out_holo_dark.png diff --git a/res/drawable-hdpi/ic_zoom_out_holo_light.png b/res/drawable-hdpi/ic_zoom_out_holo_light.png Binary files differnew file mode 100644 index 0000000..ba094ac --- /dev/null +++ b/res/drawable-hdpi/ic_zoom_out_holo_light.png diff --git a/res/drawable-hdpi/ic_zoom_slider.png b/res/drawable-hdpi/ic_zoom_slider.png Binary files differnew file mode 100644 index 0000000..8427e4d --- /dev/null +++ b/res/drawable-hdpi/ic_zoom_slider.png diff --git a/res/drawable-hdpi/scrubber_track_holo_dark.9.png b/res/drawable-hdpi/scrubber_track_holo_dark.9.png Binary files differnew file mode 100644 index 0000000..0c0ccda --- /dev/null +++ b/res/drawable-hdpi/scrubber_track_holo_dark.9.png diff --git a/res/drawable/down_button.xml b/res/drawable/down_button.xml new file mode 100644 index 0000000..29dbf42 --- /dev/null +++ b/res/drawable/down_button.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2014, The Linux Foundation. All Rights Reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" android:drawable="@drawable/ic_down_pressed" /> + <item android:drawable="@drawable/ic_down" /> +</selector> diff --git a/res/drawable/ic_zoom_in.xml b/res/drawable/ic_zoom_in.xml new file mode 100644 index 0000000..3a10ff1 --- /dev/null +++ b/res/drawable/ic_zoom_in.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2014, The Linux Foundation. All Rights Reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_activated="true" android:drawable="@drawable/ic_zoom_in_holo_light" /> + <item android:state_pressed="true" android:drawable="@drawable/ic_zoom_in_holo_light" /> + <item android:drawable="@drawable/ic_zoom_in_holo_dark" /> +</selector> diff --git a/res/drawable/ic_zoom_out.xml b/res/drawable/ic_zoom_out.xml new file mode 100644 index 0000000..070cffd --- /dev/null +++ b/res/drawable/ic_zoom_out.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2014, The Linux Foundation. All Rights Reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_activated="true" android:drawable="@drawable/ic_zoom_out_holo_light" /> + <item android:state_pressed="true" android:drawable="@drawable/ic_zoom_out_holo_light" /> + <item android:drawable="@drawable/ic_zoom_out_holo_dark" /> +</selector> diff --git a/res/drawable/more_button.xml b/res/drawable/more_button.xml new file mode 100644 index 0000000..bbad9d4 --- /dev/null +++ b/res/drawable/more_button.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2014, The Linux Foundation. All Rights Reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" android:drawable="@drawable/ic_more_pressed" /> + <item android:drawable="@drawable/ic_more_default" /> +</selector> diff --git a/res/drawable/new_button.xml b/res/drawable/new_button.xml new file mode 100644 index 0000000..4ed9daf --- /dev/null +++ b/res/drawable/new_button.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2014, The Linux Foundation. All Rights Reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" android:drawable="@drawable/ic_new_pressed" /> + <item android:drawable="@drawable/ic_new_default" /> +</selector> diff --git a/res/drawable/new_glow_button.xml b/res/drawable/new_glow_button.xml new file mode 100644 index 0000000..506d8cf --- /dev/null +++ b/res/drawable/new_glow_button.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2014, The Linux Foundation. All Rights Reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" android:drawable="@drawable/ic_new_pressed" /> + <item android:drawable="@drawable/ic_new_glow" /> +</selector> diff --git a/res/drawable/previous_button.xml b/res/drawable/previous_button.xml new file mode 100644 index 0000000..ab7317b --- /dev/null +++ b/res/drawable/previous_button.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2014, The Linux Foundation. All Rights Reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" android:drawable="@drawable/ic_previous_pressed" /> + <item android:drawable="@drawable/ic_previous_default" /> +</selector> diff --git a/res/drawable/previous_glow_button.xml b/res/drawable/previous_glow_button.xml new file mode 100644 index 0000000..1e896c6 --- /dev/null +++ b/res/drawable/previous_glow_button.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2014, The Linux Foundation. All Rights Reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" android:drawable="@drawable/ic_previous_pressed" /> + <item android:drawable="@drawable/ic_previous_glow" /> +</selector> diff --git a/res/drawable/screencolor_btn.xml b/res/drawable/screencolor_btn.xml new file mode 100644 index 0000000..d89ae58 --- /dev/null +++ b/res/drawable/screencolor_btn.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2014, The Linux Foundation. All Rights Reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_window_focused="false" android:state_enabled="true" + android:drawable="@drawable/btn_default" /> + <item android:state_window_focused="false" android:state_enabled="false" + android:drawable="@drawable/btn_default_disabled" /> + <item android:state_pressed="true" + android:drawable="@drawable/btn_default_pressed_holo_dark" /> + <item android:state_focused="true" android:state_enabled="true" + android:drawable="@drawable/btn_default_focused_holo_dark" /> + <item android:state_enabled="true" + android:drawable="@drawable/btn_default" /> + <item android:state_focused="true" + android:drawable="@drawable/btn_default_disabled_focused_holo_dark" /> + <item + android:drawable="@drawable/btn_default_disabled" /> +</selector> diff --git a/res/drawable/seekbar_define_style.xml b/res/drawable/seekbar_define_style.xml new file mode 100644 index 0000000..1d097b1 --- /dev/null +++ b/res/drawable/seekbar_define_style.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2014, The Linux Foundation. All Rights Reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:id="@+android:id/background" android:drawable="@drawable/scrubber_track_holo_dark" /> + <item android:id="@+android:id/secondaryProgress" android:drawable="@drawable/scrubber_track_holo_dark" /> + <item android:id="@+android:id/progress" android:drawable="@drawable/scrubber_track_holo_dark" /> +</layer-list> diff --git a/res/drawable/up_button.xml b/res/drawable/up_button.xml new file mode 100644 index 0000000..6f33a56 --- /dev/null +++ b/res/drawable/up_button.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2014, The Linux Foundation. All Rights Reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" android:drawable="@drawable/ic_up_pressed" /> + <item android:drawable="@drawable/ic_up" /> +</selector> diff --git a/res/layout/custom_screencolor.xml b/res/layout/custom_screencolor.xml new file mode 100644 index 0000000..7fc7cfd --- /dev/null +++ b/res/layout/custom_screencolor.xml @@ -0,0 +1,287 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2014, The Linux Foundation. All Rights Reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/background_preview" + android:background="@drawable/default_screencolor_setting"> + + <LinearLayout + android:id="@+id/bottons_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_gravity="center_horizontal|bottom" + style="?android:attr/buttonBarStyle"> + <Button + android:id="@+id/cancel" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_gravity="center_vertical" + android:textColor="@android:color/white" + android:text="@string/screencolor_cancel" + android:background="@drawable/screencolor_btn"/> + <Button + android:id="@+id/save" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_gravity="center_vertical" + android:textColor="@android:color/white" + android:text="@string/screencolor_save" + android:background="@drawable/screencolor_btn"/> + </LinearLayout> + + <LinearLayout + android:id="@+id/controls_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_above="@id/bottons_layout" + android:paddingLeft="10dip" + android:paddingRight="10dip" + android:background="@drawable/transparent_background"> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center"> + <ImageView + android:id="@+id/up_down" + android:layout_width="48dip" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:background="@drawable/down_button"/> + <ImageView + android:id="@+id/more" + android:layout_width="48dip" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:background="@drawable/more_button"/> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/up_down" + android:layout_toLeftOf="@id/more" + android:gravity="center"> + <Button + android:id="@+id/previous_btn" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@drawable/previous_button"/> + <Button + android:id="@+id/new_btn" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@drawable/new_button"/> + </LinearLayout> + </RelativeLayout> + </LinearLayout> + + <LinearLayout + android:id="@+id/preview_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_above="@id/controls_layout" + android:paddingLeft="20dip" + android:paddingRight="20dip" + android:paddingBottom="10dip"> + <LinearLayout android:id="@+id/screencolor_control" + android:orientation="vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <TextView android:id="@+id/hue" + android:layout_height="wrap_content" + android:paddingLeft="20dip" + android:paddingTop="10dip" + android:layout_width="match_parent" + android:textColor="@android:color/white" + android:text="@string/hue_str"/> + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="10dip" + android:paddingRight="10dip"> + <ImageView + android:id="@+id/reduce_hue" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@drawable/ic_zoom_out" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true"/> + <ImageView + android:id="@+id/increase_hue" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@drawable/ic_zoom_in" + android:layout_alignParentRight="true" + android:layout_centerVertical="true"/> + <SeekBar android:id="@+id/hcontrol" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:thumb="@drawable/ic_zoom_slider" + android:progressDrawable="@drawable/seekbar_define_style" + android:layout_toRightOf="@id/reduce_hue" + android:layout_toLeftOf="@id/increase_hue" + android:maxHeight="12px" + android:minHeight="12px" + android:paddingLeft="20dip" + android:paddingTop="10dip" + android:paddingRight="20dip" + android:paddingBottom="10dip"/> + </RelativeLayout> + + <TextView android:id="@+id/saturation" + android:layout_height="wrap_content" + android:paddingLeft="20dip" + android:paddingTop="10dip" + android:layout_width="fill_parent" + android:textColor="@android:color/white" + android:text="@string/saturation_str"/> + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="10dip" + android:paddingRight="10dip"> + <ImageView + android:id="@+id/reduce_saturation" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_zoom_out" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" /> + <ImageView + android:id="@+id/increase_saturation" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_zoom_in" + android:layout_alignParentRight="true" + android:layout_centerVertical="true"/> + <SeekBar android:id="@+id/scontrol" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:thumb="@drawable/ic_zoom_slider" + android:progressDrawable="@drawable/seekbar_define_style" + android:layout_toRightOf="@id/reduce_saturation" + android:layout_toLeftOf="@id/increase_saturation" + android:paddingLeft="20dip" + android:paddingTop="10dip" + android:paddingRight="20dip" + android:paddingBottom="10dip"/> + </RelativeLayout> + + <TextView android:id="@+id/contrast" + android:layout_height="wrap_content" + android:paddingLeft="20dip" + android:paddingTop="10dip" + android:layout_width="fill_parent" + android:textColor="@android:color/white" + android:text="@string/contrast_str"/> + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="10dip" + android:paddingRight="10dip"> + <ImageView + android:id="@+id/reduce_contrast" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_zoom_out" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" /> + <ImageView + android:id="@+id/increase_contrast" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_zoom_in" + android:layout_alignParentRight="true" + android:layout_centerVertical="true"/> + <SeekBar android:id="@+id/ccontrol" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:thumb="@drawable/ic_zoom_slider" + android:progressDrawable="@drawable/seekbar_define_style" + android:layout_toRightOf="@id/reduce_contrast" + android:layout_toLeftOf="@id/increase_contrast" + android:paddingLeft="20dip" + android:paddingTop="10dip" + android:paddingRight="20dip" + android:paddingBottom="10dip"/> + </RelativeLayout> + + <TextView android:id="@+id/intensity" + android:layout_height="wrap_content" + android:paddingLeft="20dip" + android:paddingTop="10dip" + android:layout_width="fill_parent" + android:textColor="@android:color/white" + android:text="@string/intensity_str"/> + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="10dip" + android:paddingRight="10dip" + android:id="@+id/intensity_layout"> + <ImageView + android:id="@+id/reduce_intensity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_zoom_out" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" /> + <ImageView + android:id="@+id/increase_intensity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_zoom_in" + android:layout_alignParentRight="true" + android:layout_centerVertical="true"/> + <SeekBar android:id="@+id/icontrol" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:thumb="@drawable/ic_zoom_slider" + android:progressDrawable="@drawable/seekbar_define_style" + android:layout_toRightOf="@id/reduce_intensity" + android:layout_toLeftOf="@id/increase_intensity" + android:paddingLeft="20dip" + android:paddingTop="10dip" + android:paddingRight="20dip" + android:paddingBottom="10dip"/> + </RelativeLayout> + </LinearLayout> + + </LinearLayout> + +</RelativeLayout> diff --git a/res/layout/screen_color_item.xml b/res/layout/screen_color_item.xml new file mode 100644 index 0000000..b55af06 --- /dev/null +++ b/res/layout/screen_color_item.xml @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2014, The Linux Foundation. All Rights Reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +--> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="10dip" + android:paddingTop="4dip" + android:paddingRight="10dip" + android:paddingBottom="4dip" > + + <RelativeLayout + android:id="@+id/widget_frame" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_toStartOf="@+id/divider" + android:clickable="true" + android:focusable="true" + android:paddingLeft="10dip" > + + <TextView + android:id="@android:id/title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toStartOf="@android:id/button1" + android:layout_toEndOf="@android:id/icon" + android:ellipsize="end" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textAlignment="viewStart" + android:textColor="@android:color/white" + android:labelFor="@android:id/button2" /> + + <RadioButton + android:id="@android:id/button1" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" + android:duplicateParentState="true" + android:clickable="false" + android:focusable="false" /> + </RelativeLayout> + + <ImageView + android:id="@id/divider" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_centerVertical="true" + android:layout_toStartOf="@android:id/button2" + android:src="@drawable/nav_divider" /> + + <ImageView + android:id="@android:id/button2" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_alignBottom="@android:id/widget_frame" + android:layout_alignParentEnd="true" + android:layout_alignTop="@android:id/widget_frame" + android:layout_centerVertical="true" + android:background="?android:attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:src="@drawable/ic_bt_config" /> + +</RelativeLayout> diff --git a/res/layout/screencolor_settings.xml b/res/layout/screencolor_settings.xml new file mode 100644 index 0000000..dd614a1 --- /dev/null +++ b/res/layout/screencolor_settings.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2014, The Linux Foundation. All Rights Reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/background_preview" + android:orientation="vertical" + android:gravity="bottom" + android:background="@drawable/default_screencolor_setting"> + + + <ListView + android:id="@+id/mode_list" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="20dip" + android:layout_marginRight="20dip" + android:layout_marginBottom="20dip" + android:layout_gravity="bottom" + android:background="@drawable/transparent_background" > + </ListView> +</LinearLayout> diff --git a/res/menu/screencolor_more.xml b/res/menu/screencolor_more.xml new file mode 100644 index 0000000..dc914b4 --- /dev/null +++ b/res/menu/screencolor_more.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2014, The Linux Foundation. All Rights Reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/restore_preview" + android:title="@string/restore_preview" + /> + <item + android:id="@+id/selectnewfile_menu" + android:title="@string/selectnewfile_menu" + /> + <item + android:id="@+id/selectfile_menu" + android:title="@string/selectfile_menu" + /> + <item + android:id="@+id/restore_default_str" + android:title="@string/restore_default_str" + /> +</menu> diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml index 2e4dac8..80b4ace 100644 --- a/res/values/cm_arrays.xml +++ b/res/values/cm_arrays.xml @@ -261,4 +261,11 @@ per-device overlay. Required to build on non-hardware tunable devices --> <string-array name="gamma_descriptors" translatable="false"> </string-array> + + <!-- Values for screen color --> + <string-array name="screen_color_setting"> + <item>Standard</item> + <item>Vivid</item> + <item>Custom</item> + </string-array> </resources> diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml index 8542f5c..3d09dac 100644 --- a/res/values/cm_colors.xml +++ b/res/values/cm_colors.xml @@ -61,4 +61,6 @@ limitations under the License. <!-- Personal Dictionary Add Icon --> <drawable name="ic_menu_add_word">@drawable/ic_menu_add_dark</drawable> + <color name="screencolor_background">#50000000</color> + <drawable name="transparent_background">#00000000</drawable> </resources> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 58e94f6..c751d86 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -470,4 +470,20 @@ <string name="display_rotation_180_title">180 degrees</string> <string name="display_rotation_270_title">270 degrees</string> + <!-- Display settings. Screen color. --> + <string name="screencolor">Screen color</string> + <string name="screencolor_summary">Tune screen Hue, Saturation, Contrast and Intensity</string> + <string name="custom_screencolor">Custom screen color</string> + <string name="screencolor_save">Save</string> + <string name="screencolor_cancel">Cancel</string> + <string name="previous_str">Previous</string> + <string name="new_str">New</string> + <string name="restore_preview">View default picture</string> + <string name="selectnewfile_menu">View new picture from Gallery</string> + <string name="selectfile_menu">View picture from Gallery</string> + <string name="restore_default_str">Reset</string> + <string name="hue_str">Hue: <xliff:g id="hue_value">%1$s</xliff:g></string> + <string name="saturation_str">Saturation: <xliff:g id="saturation_value">%1$s</xliff:g></string> + <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string> + <string name="intensity_str">Intensity: <xliff:g id="intensity_str_value">%1$s</xliff:g></string> </resources> diff --git a/res/values/config.xml b/res/values/config.xml index 62e7e67..a02e775 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -43,4 +43,40 @@ <!-- Config to enable/disable ppp number in APN editor --> <bool name="config_ppp_enabled">false</bool> + + <!-- This used to define screen color's Hue progress bar minimum value --> + <integer name="minimum_hue_value" translatable="false">0</integer> + + <!-- This is used to define screen color's Hue progress bar maximum value--> + <integer name="maximum_hue_value" translatable="false">360</integer> + + <!-- This is used to define screen color's Hue progress bar default value--> + <integer name="default_hue_value" translatable="false">180</integer> + + <!-- This is used to define screen color's saturation progress bar minimum value--> + <integer name="minimum_saturation_value" translatable="false">0</integer> + + <!-- This is used to define screen color's saturation progress bar maximum value--> + <integer name="maximum_saturation_value" translatable="false">360</integer> + + <!-- This is used to define screen color's saturation progress bar default value--> + <integer name="default_saturation_value" translatable="false">180</integer> + + <!-- This is used to define screen color's intensity progress bar minimum value--> + <integer name="minimum_intensity_value" translatable="false">0</integer> + + <!-- This is used to define screen color's intensity progress bar maximum value--> + <integer name="maximum_intensity_value" translatable="false">400</integer> + + <!-- This is used to define screen color's intensity progress bar default value--> + <integer name="default_intensity_value" translatable="false">200</integer> + + <!-- This is used to define screen color's contrast progress bar minimum value--> + <integer name="minimum_contrast_value" translatable="false">0</integer> + + <!-- This is used to define screen color's contrast progress bar default value--> + <integer name="default_contrast_value" translatable="false">180</integer> + + <!-- This is used to define screen color's contrast progress bar maximum value--> + <integer name="maximum_contrast_value" translatable="false">360</integer> </resources> diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index 08875cf..e4f6759 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -141,7 +141,6 @@ android:summary="@string/color_enhancement_summary" android:defaultValue="true" /> - <com.android.settings.hardware.DisplayColor android:key="color_calibration" android:title="@string/color_calibration_title" @@ -156,4 +155,16 @@ android:summary="@string/gamma_tuning_summary_head" android:persistent="false" /> </PreferenceCategory> + + <PreferenceScreen + android:persistent="false" + android:key="screencolor_settings" + android:title="@string/screencolor" + android:summary="@string/screencolor_summary"> + <intent + android:action="com.qualcomm.display.PPService" + android:targetPackage="com.android.settings" + android:targetClass="com.android.settings.ScreenColorSettings" /> + </PreferenceScreen> + </PreferenceScreen> diff --git a/src/com/android/display/IPPService.aidl b/src/com/android/display/IPPService.aidl new file mode 100644 index 0000000..c934efe --- /dev/null +++ b/src/com/android/display/IPPService.aidl @@ -0,0 +1,7 @@ +package com.android.display; +interface IPPService { + boolean startPP(); + boolean stopPP(); + boolean updateHSIC(int h, int s, int i, int c); + boolean getPPStatus(); +} diff --git a/src/com/android/settings/CustomScreenColor.java b/src/com/android/settings/CustomScreenColor.java new file mode 100644 index 0000000..2d6c7c2 --- /dev/null +++ b/src/com/android/settings/CustomScreenColor.java @@ -0,0 +1,721 @@ +/* + Copyright (c) 2014, The Linux Foundation. All Rights Reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +package com.android.settings; + +import android.app.ActionBar; +import android.app.Activity; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.ServiceConnection; +import android.content.SharedPreferences; +import android.content.SharedPreferences.Editor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.drawable.BitmapDrawable; +import android.net.Uri; +import android.os.Bundle; +import android.os.IBinder; +import android.os.RemoteException; +import android.util.Log; +import android.view.Gravity; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; +import android.view.Window; +import android.widget.AdapterView; +import android.widget.AdapterView.OnItemClickListener; +import android.widget.ListView; +import android.widget.Button; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.PopupMenu; +import android.widget.PopupMenu.OnMenuItemClickListener; +import android.widget.RelativeLayout; +import android.widget.SeekBar; +import android.widget.TextView; +import android.widget.PopupWindow; + +import com.android.display.IPPService; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; + +public class CustomScreenColor extends Activity implements SeekBar.OnSeekBarChangeListener, + View.OnClickListener { + private final static String TAG = "CustomScreenColor"; + + private static final int RESTORE_DEFAULT_PREVIEW = 0; + private static final int SELECT_NEW_FILE_ITEM = 1; + private static final int SELECT_FILE_ITEM = 2; + private static final int RESET = 3; + private static final int SELECT_FILE_GROUP1 = 0; + private static final int SELECT_FILE_GROUP2 = 1; + private static final int SELECT_FILE_ORDER = 0; + private static final int REQUEST_SELECT_FILE = 100; + private static final String IMAGE_UNSPECIFIED = "image/*"; + private static final String PREVIEW_STRING_KEY = "screencolor_preview_key"; + private static final String PREVIEW_STRING_NAME = "screencolor_preview_name"; + private static final String COLOR_HUE = "hue"; + private static final String COLOR_SATURATION = "saturation"; + private static final String COLOR_INTENSITY = "intensity"; + private static final String COLOR_CONTRAST = "contrast"; + + private static final String KEY_ASPECT_X = "aspectX"; + private static final String KEY_ASPECT_Y = "aspectY"; + private static final String KEY_SPOTLIGHT_X = "spotlightX"; + private static final String KEY_SPOTLIGHT_Y = "spotlightY"; + private static final String KEY_FROME_SCREENCOLOR = "fromScreenColor"; + + private ImageView mImageView; + private RelativeLayout mRLayout; + private LinearLayout mScreenColorLayout; + private SeekBar mHBar, mSBar, mCBar, mIBar; + private TextView mHTv, mSTv, mCTv, mITv; + private ImageView mReduceH, mIncreaseH, mReduceS, mIncreaseS, mReduceC, mIncreaseC, mReduceI, + mIncreaseI, mUpdown, mMore; + private Button mCancelBtn, mSaveBtn, mPreviousBtn, mNewBtn; + private boolean canRestorePreview; + private int mHueValue = 0; + private int mSaturationValue = 0; + private int mIntensityValue = 0; + private int mContrastValue = 0; + + private int mMinHueValue = 0; + private int mMaxHueValue = 0; + private int mDefaultHueValue = 0; + private int mMinSaturationValue = 0; + private int mMaxSaturationValue = 0; + private int mDefaultSaturationValue = 0; + private int mMinIntensityValue = 0; + private int mMaxIntensityValue = 0; + private int mDefaultIntensityValue = 0; + private int mMinContrastValue = 0; + private int mMaxContrastValue = 0; + private int mDefaultContrastValue = 0; + + /** + * It is used to update the screen's hue, saturation, contrast, and intensity. + */ + IPPService mPPService = null; + PPServiceConnection mPPServiceConn = null; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + initPPService(); + getWindow().requestFeature(Window.FEATURE_ACTION_BAR); + setContentView(R.layout.custom_screencolor); + initView(); + restoreSavedHSCI(true); + } + + @Override + protected void onResume() { + super.onResume(); + } + + @Override + protected void onPause() { + super.onPause(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + unbindService(mPPServiceConn); + } + + private void initView() { + ActionBar actionBar = getActionBar(); + actionBar.setDisplayHomeAsUpEnabled(true); + + mMinHueValue = getResources().getInteger(R.integer.minimum_hue_value); + mMaxHueValue = getResources().getInteger(R.integer.maximum_hue_value); + mDefaultHueValue = getResources().getInteger(R.integer.default_hue_value); + mMinSaturationValue = getResources().getInteger(R.integer.minimum_saturation_value); + mMaxSaturationValue = getResources().getInteger(R.integer.maximum_saturation_value); + mDefaultSaturationValue = getResources().getInteger(R.integer.default_saturation_value); + mMinIntensityValue = getResources().getInteger(R.integer.minimum_intensity_value); + mMaxIntensityValue = getResources().getInteger(R.integer.maximum_intensity_value); + mDefaultIntensityValue = getResources().getInteger(R.integer.default_intensity_value); + mMinContrastValue = getResources().getInteger(R.integer.minimum_contrast_value); + mMaxContrastValue = getResources().getInteger(R.integer.maximum_contrast_value); + mDefaultContrastValue = getResources().getInteger(R.integer.default_contrast_value); + + mRLayout = (RelativeLayout) findViewById(R.id.background_preview); + String previewContent = getScreenColorPreviewKey(); + if ("".equals(previewContent)) { + resotreBackgroundByDefault(); + } else { + Uri previewUri = Uri.parse(previewContent); + setBackgroundByUri(previewUri); + } + + mScreenColorLayout = (LinearLayout) findViewById(R.id.screencolor_control); + mScreenColorLayout.setBackgroundColor(R.color.screencolor_background); + mScreenColorLayout.setOnClickListener(this); + + mHBar = (SeekBar) findViewById(R.id.hcontrol); + mHBar.setMax(mMaxHueValue); + mHBar.setOnSeekBarChangeListener(this); + mSBar = (SeekBar) findViewById(R.id.scontrol); + mSBar.setMax(mMaxSaturationValue); + mSBar.setOnSeekBarChangeListener(this); + mIBar = (SeekBar) findViewById(R.id.icontrol); + mIBar.setMax(mMaxIntensityValue); + mIBar.setOnSeekBarChangeListener(this); + mCBar = (SeekBar) findViewById(R.id.ccontrol); + mCBar.setMax(mMaxContrastValue); + mCBar.setOnSeekBarChangeListener(this); + + mHTv = (TextView) findViewById(R.id.hue); + mHTv.setText(getString(R.string.hue_str, mHBar.getProgress())); + mSTv = (TextView) findViewById(R.id.saturation); + mSTv.setText(getString(R.string.saturation_str, mSBar.getProgress())); + mITv = (TextView) findViewById(R.id.intensity); + mITv.setText(getString(R.string.intensity_str, mIBar.getProgress())); + mCTv = (TextView) findViewById(R.id.contrast); + mCTv.setText(getString(R.string.contrast_str, mCBar.getProgress())); + + mReduceH = (ImageView) findViewById(R.id.reduce_hue); + mReduceH.setOnClickListener(this); + mIncreaseH = (ImageView) findViewById(R.id.increase_hue); + mIncreaseH.setOnClickListener(this); + mReduceS = (ImageView) findViewById(R.id.reduce_saturation); + mReduceS.setOnClickListener(this); + mIncreaseS = (ImageView) findViewById(R.id.increase_saturation); + mIncreaseS.setOnClickListener(this); + mReduceI = (ImageView) findViewById(R.id.reduce_intensity); + mReduceI.setOnClickListener(this); + mIncreaseI = (ImageView) findViewById(R.id.increase_intensity); + mIncreaseI.setOnClickListener(this); + mReduceC = (ImageView) findViewById(R.id.reduce_contrast); + mReduceC.setOnClickListener(this); + mIncreaseC = (ImageView) findViewById(R.id.increase_contrast); + mIncreaseC.setOnClickListener(this); + + mUpdown = (ImageView) findViewById(R.id.up_down); + mUpdown.setOnClickListener(this); + mMore = (ImageView) findViewById(R.id.more); + mMore.setOnClickListener(this); + + mPreviousBtn = (Button) findViewById(R.id.previous_btn); + mPreviousBtn.setOnClickListener(this); + mNewBtn = (Button) findViewById(R.id.new_btn); + mNewBtn.setOnClickListener(this); + mCancelBtn = (Button) findViewById(R.id.cancel); + mCancelBtn.setOnClickListener(this); + mSaveBtn = (Button) findViewById(R.id.save); + mSaveBtn.setOnClickListener(this); + + initBtnsStatus(); + } + + private void initPPService() { + mPPServiceConn = new PPServiceConnection(); + String packetname = "com.qualcomm.display"; + String service = "com.qualcomm.display.PPService"; + Intent i = new Intent(IPPService.class.getName()); + + ComponentName component = new ComponentName(packetname, service); + i.setComponent(component); + + boolean ret = bindService(i, mPPServiceConn, Context.BIND_AUTO_CREATE); + } + + private class PPServiceConnection implements ServiceConnection { + + @Override + public void onServiceConnected(ComponentName name, IBinder service) { + mPPService = IPPService.Stub.asInterface((IBinder) service); + Log.d(TAG, "onServiceConnected, service=" + mPPService); + try { + if (null != mPPService) { + mPPService.startPP(); + restoreSavedHSCI(true); + } + } catch (RemoteException e) { + Log.e(TAG, "startPP exception"); + } + + } + + @Override + public void onServiceDisconnected(ComponentName name) { + if (null != mPPService) { + // end thread + try { + Log.d(TAG, "stopPP"); + mPPService.stopPP(); + } catch (RemoteException e) { + Log.e(TAG, "stopPP exception"); + } + } + mPPService = null; + } + + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + if (resultCode != RESULT_OK) { + Log.i(TAG, "bail due to resultCode=" + resultCode); + return; + } + switch (requestCode) { + case REQUEST_SELECT_FILE: + changePreviewByData(data); + break; + default: + break; + } + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + menu.add(SELECT_FILE_GROUP1, SELECT_FILE_ITEM, SELECT_FILE_ORDER, + R.string.selectfile_menu); + menu.add(SELECT_FILE_GROUP1, RESET, SELECT_FILE_ORDER, R.string.restore_default_str); + menu.add(SELECT_FILE_GROUP2, RESTORE_DEFAULT_PREVIEW, SELECT_FILE_ORDER, + R.string.restore_preview); + menu.add(SELECT_FILE_GROUP2, SELECT_NEW_FILE_ITEM, SELECT_FILE_ORDER, + R.string.selectnewfile_menu); + menu.add(SELECT_FILE_GROUP2, RESET, SELECT_FILE_ORDER, R.string.restore_default_str); + return true; + } + + @Override + public boolean onPrepareOptionsMenu(Menu menu) { + if (canRestorePreview) { + menu.setGroupVisible(SELECT_FILE_GROUP1, false); + menu.setGroupVisible(SELECT_FILE_GROUP2, true); + } else { + menu.setGroupVisible(SELECT_FILE_GROUP1, true); + menu.setGroupVisible(SELECT_FILE_GROUP2, false); + } + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case android.R.id.home: + finish(); + break; + case SELECT_NEW_FILE_ITEM: + selectPicFromGallery2(); + break; + case SELECT_FILE_ITEM: + selectPicFromGallery2(); + break; + case RESTORE_DEFAULT_PREVIEW: + resotreBackgroundByDefault(); + break; + case RESET: + restoreDefaultHSCI(); + break; + default: + return true; + } + return false; + } + + public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { + setNewBtnHighlight(); + int id = seekBar.getId(); + switch (id) { + case R.id.hcontrol: + mHueValue = progress; + //The screen hue display value varies from -180 to 180. + mHTv.setText(getString(R.string.hue_str, progress - 180)); + break; + case R.id.scontrol: + mSaturationValue = progress; + //Change the saturation display value varies from (-180, 180) to (-1.0, 1.0). + mSTv.setText(getString(R.string.saturation_str, + ((int) (((progress - 180) * 100) / 180.0)) / 100.0)); + break; + case R.id.ccontrol: + mContrastValue = progress; + //Change the contrast display value varies from (-180, 180) to (-1.0, 1.0). + mCTv.setText(getString(R.string.contrast_str, + ((int) (((progress - 180) * 100) / 180.0)) / 100.0)); + break; + case R.id.icontrol: + mIntensityValue = progress; + //The screen intensity display value varies from -200 to 200. + mITv.setText(getString(R.string.intensity_str, progress - 200)); + break; + default: + break; + + } + Log.i(TAG, "onProgressChanged mHueValue=" + mHueValue + " mSaturationValue=" + + mSaturationValue + " mNewContrastValue=" + mContrastValue + " mIntensityValue=" + + mIntensityValue); + try { + if (null != mPPService && mPPService.getPPStatus()) { + mPPService.updateHSIC(mHueValue, mSaturationValue, mIntensityValue, + mContrastValue); + } + } catch (RemoteException e) { + Log.e(TAG, "updateHSIC exception"); + } + } + + public void onStartTrackingTouch(SeekBar seekBar) { + setActivated(seekBar, true); + } + + public void onStopTrackingTouch(SeekBar seekBar) { + setActivated(seekBar, false); + } + + private void setActivated(SeekBar seekBar, boolean isActivated) { + int id = seekBar.getId(); + switch (id) { + case R.id.hcontrol: + mReduceH.setActivated(isActivated); + mIncreaseH.setActivated(isActivated); + break; + case R.id.scontrol: + mReduceS.setActivated(isActivated); + mIncreaseS.setActivated(isActivated); + break; + case R.id.icontrol: + mReduceI.setActivated(isActivated); + mIncreaseI.setActivated(isActivated); + break; + case R.id.ccontrol: + mReduceC.setActivated(isActivated); + mIncreaseC.setActivated(isActivated); + break; + default: + break; + } + + } + + public void onClick(View v) { + int id = v.getId(); + + switch (id) { + case R.id.cancel: + restoreSavedHSCI(false); + finish(); + break; + case R.id.save: + saveHSCI(); + break; + case R.id.previous_btn: + previousOrNewHSCI(true); + break; + case R.id.new_btn: + previousOrNewHSCI(false); + break; + case R.id.up_down: + upDownHSCISettingLayout(); + break; + case R.id.more: + showMoreMenus(); + break; + case R.id.reduce_hue: + mHBar.setProgress((mHueValue - 1 > mMinHueValue) ? (mHueValue - 1) : mMinHueValue); + break; + case R.id.increase_hue: + mHBar.setProgress((mHueValue + 1 < mMaxHueValue) ? (mHueValue + 1) : mMaxHueValue); + break; + case R.id.reduce_saturation: + mSBar.setProgress((mSaturationValue - 1 > mMinSaturationValue) ? + (mSaturationValue - 1) : mMinSaturationValue); + break; + case R.id.increase_saturation: + mSBar.setProgress((mSaturationValue + 1 < mMaxSaturationValue) ? + (mSaturationValue + 1) : mMaxSaturationValue); + break; + case R.id.reduce_intensity: + mIBar.setProgress((mIntensityValue - 1 > mMinIntensityValue) ? + (mIntensityValue - 1) : mMinIntensityValue); + break; + case R.id.increase_intensity: + mIBar.setProgress((mIntensityValue + 1 < mMaxIntensityValue) ? + (mIntensityValue + 1) : mMaxIntensityValue); + break; + case R.id.reduce_contrast: + mCBar.setProgress((mContrastValue - 1 > mMinContrastValue) ? + (mContrastValue - 1) : mMinContrastValue); + break; + case R.id.increase_contrast: + mCBar.setProgress((mContrastValue + 1 < mMaxContrastValue) ? + (mContrastValue + 1) : mMaxContrastValue); + break; + default: + break; + } + } + + private void selectPicFromGallery2() { + Intent intent = new Intent(Intent.ACTION_GET_CONTENT); + intent.setType("image/*"); + startActivityForResult(intent, REQUEST_SELECT_FILE); + } + + private void restoreDefaultHSCI() { + mHBar.setProgress(mDefaultHueValue); + mSBar.setProgress(mDefaultSaturationValue); + mIBar.setProgress(mDefaultIntensityValue); + mCBar.setProgress(mDefaultContrastValue); + setNewBtnHighlight(); + } + + private void restoreSavedHSCI(boolean setProgress) { + SharedPreferences share = getSharedPreferences(PREVIEW_STRING_NAME, + Context.MODE_WORLD_WRITEABLE); + int hueValue = share.getInt(COLOR_HUE, mDefaultHueValue); + int saturationValue = share.getInt(COLOR_SATURATION, mDefaultSaturationValue); + int intensityValue = share.getInt(COLOR_INTENSITY, mDefaultIntensityValue); + int contrastValue = share.getInt(COLOR_CONTRAST, mDefaultContrastValue); + if (setProgress) { + mHBar.setProgress(hueValue); + mSBar.setProgress(saturationValue); + mIBar.setProgress(intensityValue); + mCBar.setProgress(contrastValue); + } + Log.i(TAG, "restoreSavedHSCI hueValue=" + hueValue + " saturationValue=" + saturationValue + + " contrastValue=" + contrastValue + " intensityValue=" + intensityValue); + try { + if (null != mPPService && mPPService.getPPStatus()) { + mPPService.updateHSIC(hueValue, saturationValue, intensityValue, contrastValue); + } + } catch (RemoteException e) { + Log.e(TAG, "updateHSIC exception"); + } + } + + private void previewNewHSIC() { + mHBar.setProgress(mHueValue); + mSBar.setProgress(mSaturationValue); + mIBar.setProgress(mIntensityValue); + mCBar.setProgress(mContrastValue); + Log.i(TAG, "previewNewHSIC mHueValue=" + mHueValue + " mSaturationValue=" + + mSaturationValue + " mContrastValue=" + mContrastValue + " mIntensityValue=" + + mIntensityValue); + try { + if (null != mPPService && mPPService.getPPStatus()) { + mPPService.updateHSIC(mHueValue, mSaturationValue, mIntensityValue, + mContrastValue); + } + } catch (RemoteException e) { + Log.e(TAG, "updateHSIC exception"); + } + } + + private void setNewBtnHighlight() { + mPreviousBtn.setBackgroundResource(R.drawable.ic_previous_default); + mNewBtn.setBackgroundResource(R.drawable.ic_new_glow); + mPreviousBtn.setEnabled(true); + mNewBtn.setEnabled(true); + mSaveBtn.setEnabled(true); + + } + + private void initBtnsStatus() { + mPreviousBtn.setBackgroundResource(R.drawable.ic_previous_dis); + mNewBtn.setBackgroundResource(R.drawable.ic_new_dis); + mPreviousBtn.setEnabled(false); + mNewBtn.setEnabled(false); + mSaveBtn.setEnabled(false); + } + + private void previousOrNewHSCI(boolean isPrevious) { + if (View.GONE != mScreenColorLayout.getVisibility()) { + mScreenColorLayout.setVisibility(View.GONE); + mUpdown.setBackgroundResource(R.drawable.up_button); + } + if (isPrevious) { + mPreviousBtn.setBackgroundResource(R.drawable.ic_previous_glow); + mNewBtn.setBackgroundResource(R.drawable.ic_new_default); + mUpdown.setVisibility(View.GONE); + mMore.setVisibility(View.GONE); + restoreSavedHSCI(false); + } else { + mPreviousBtn.setBackgroundResource(R.drawable.ic_previous_default); + mNewBtn.setBackgroundResource(R.drawable.ic_new_glow); + mUpdown.setVisibility(View.VISIBLE); + mMore.setVisibility(View.VISIBLE); + previewNewHSIC(); + } + } + + private void saveHSCI() { + // TODO save HSCI values. + saveHSICPreference(mHueValue, mSaturationValue, mIntensityValue, mContrastValue); + finish(); + } + + private void changePreviewByData(Intent data) { + if (data != null) { + Uri uri = data.getData(); + setBackgroundByUri(uri); + savePreviewKey(uri.toString()); + } + } + + private void setBackgroundByUri(Uri uri) { + InputStream is = null; + try { + is = getContentResolver().openInputStream(uri); + BitmapFactory.Options opts = new BitmapFactory.Options(); + opts.inJustDecodeBounds = true; + BitmapFactory.decodeStream(is, null, opts); + is.close(); + is = getContentResolver().openInputStream(uri); + opts.inJustDecodeBounds = false; + opts.inSampleSize = calculateInSampleSize(opts, + mRLayout.getWidth(), mRLayout.getHeight()); + Bitmap bm = BitmapFactory.decodeStream(is, null, opts); + BitmapDrawable bd = new BitmapDrawable(bm); + mRLayout.setBackgroundDrawable(bd); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (is != null) { + try { + is.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + canRestorePreview = true; + } + + public static int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) { + // Raw height and width of image + final int height = options.outHeight; + final int width = options.outWidth; + int inSampleSize = 1; + + if (height > reqHeight || width > reqWidth) { + + final int halfHeight = height / 2; + final int halfWidth = width / 2; + + // Calculate the largest inSampleSize value that is a power of 2 and keeps both + // height and width larger than the requested height and width. + while ((halfHeight / inSampleSize) > reqHeight + && (halfWidth / inSampleSize) > reqWidth) { + inSampleSize *= 2; + } + } + + return inSampleSize; + } + + private void resotreBackgroundByDefault() { + mRLayout.setBackgroundResource(R.drawable.default_screencolor_setting); + savePreviewKey(""); + canRestorePreview = false; + } + + // use sharepreference to save preview image. + private void savePreviewKey(String value) { + SharedPreferences share = getSharedPreferences(PREVIEW_STRING_NAME, Context.MODE_PRIVATE); + Editor editor = share.edit(); + editor.putString(PREVIEW_STRING_KEY, value); + editor.commit(); + } + + private void saveHSICPreference(int h, int s, int i, int c) { + SharedPreferences share = getSharedPreferences(PREVIEW_STRING_NAME, Context.MODE_PRIVATE); + Editor editor = share.edit(); + editor.putInt(COLOR_HUE, h); + editor.putInt(COLOR_SATURATION, s); + editor.putInt(COLOR_INTENSITY, i); + editor.putInt(COLOR_CONTRAST, c); + editor.commit(); + } + + private String getScreenColorPreviewKey() { + SharedPreferences share = getSharedPreferences(PREVIEW_STRING_NAME, + Context.MODE_WORLD_WRITEABLE | Context.MODE_WORLD_READABLE); + return share.getString(PREVIEW_STRING_KEY, ""); + } + + private void upDownHSCISettingLayout() { + if (View.GONE != mScreenColorLayout.getVisibility()) { + mScreenColorLayout.setVisibility(View.GONE); + mUpdown.setBackgroundResource(R.drawable.up_button); + } else { + mScreenColorLayout.setVisibility(View.VISIBLE); + mUpdown.setBackgroundResource(R.drawable.down_button); + } + } + + private void showMoreMenus() { + PopupMenu popup = new PopupMenu(CustomScreenColor.this, mMore); + Menu menu = popup.getMenu(); + popup.getMenuInflater().inflate(R.menu.screencolor_more, menu); + + if (canRestorePreview) { + menu.removeItem(R.id.selectfile_menu); + } else { + menu.removeItem(R.id.restore_preview); + menu.removeItem(R.id.selectnewfile_menu); + } + + popup.setOnMenuItemClickListener(new MyMenuItemclick()); + popup.show(); + } + + private class MyMenuItemclick implements OnMenuItemClickListener { + @Override + public boolean onMenuItemClick(MenuItem item) { + switch (item.getItemId()) { + case R.id.restore_preview: + resotreBackgroundByDefault(); + return true; + case R.id.selectnewfile_menu: + selectPicFromGallery2(); + return true; + case R.id.selectfile_menu: + selectPicFromGallery2(); + return true; + case R.id.restore_default_str: + restoreDefaultHSCI(); + return true; + } + return true; + } + } +} diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index 2f429da..6bc46cb 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -38,6 +38,8 @@ import android.app.UiModeManager; import android.app.admin.DevicePolicyManager; import android.content.ContentResolver; import android.content.Context; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Configuration; import android.content.res.Resources; import android.content.SharedPreferences; @@ -101,11 +103,13 @@ public class DisplaySettings extends SettingsPreferenceFragment implements private static final String CATEGORY_ADVANCED = "advanced_display_prefs"; private static final String KEY_DISPLAY_COLOR = "color_calibration"; private static final String KEY_DISPLAY_GAMMA = "gamma_tuning"; + private static final String KEY_SCREEN_COLOR_SETTINGS = "screencolor_settings"; private static final int DLG_GLOBAL_CHANGE_WARNING = 1; private FontDialogPreference mFontSizePref; private PreferenceScreen mDisplayRotationPreference; + private PreferenceScreen mScreenColorSettings; private final Configuration mCurConfig = new Configuration(); @@ -253,6 +257,11 @@ public class DisplaySettings extends SettingsPreferenceFragment implements mWakeWhenPluggedOrUnplugged = (SwitchPreference) findPreference(KEY_WAKE_WHEN_PLUGGED_OR_UNPLUGGED); + + mScreenColorSettings = (PreferenceScreen) findPreference(KEY_SCREEN_COLOR_SETTINGS); + if (!isPostProcessingSupported()) { + getPreferenceScreen().removePreference(mScreenColorSettings); + } } private static boolean allowAllRotations(Context context) { @@ -675,6 +684,17 @@ public class DisplaySettings extends SettingsPreferenceFragment implements } } + private boolean isPostProcessingSupported() { + boolean ret = true; + final PackageManager pm = getPackageManager(); + try { + pm.getPackageInfo("com.qualcomm.display", PackageManager.GET_META_DATA); + } catch (NameNotFoundException e) { + ret = false; + } + return ret; + } + private static boolean isAdaptiveBacklightSupported() { try { return AdaptiveBacklight.isSupported(); diff --git a/src/com/android/settings/ScreenColorSettings.java b/src/com/android/settings/ScreenColorSettings.java new file mode 100644 index 0000000..4d4caaa --- /dev/null +++ b/src/com/android/settings/ScreenColorSettings.java @@ -0,0 +1,269 @@ +/* + Copyright (c) 2014, The Linux Foundation. All Rights Reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +package com.android.settings; + +import java.io.FileNotFoundException; +import java.io.InputStream; + +import android.app.ActionBar; +import android.app.Activity; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.ServiceConnection; +import android.content.SharedPreferences; +import android.content.SharedPreferences.Editor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.drawable.BitmapDrawable; +import android.net.Uri; +import android.os.Bundle; +import android.os.IBinder; +import android.os.RemoteException; +import android.util.Log; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; +import android.view.View.OnClickListener; +import android.view.ViewGroup; +import android.view.Window; +import android.widget.AdapterView; +import android.widget.AdapterView.OnItemClickListener; +import android.widget.ArrayAdapter; +import android.widget.ListView; +import android.widget.Button; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.PopupMenu; +import android.widget.RadioButton; +import android.widget.PopupMenu.OnMenuItemClickListener; +import android.widget.RadioGroup; +import android.widget.RelativeLayout; +import android.widget.SeekBar; +import android.widget.TextView; +import android.widget.PopupWindow; + +import com.android.display.IPPService; + +public class ScreenColorSettings extends Activity { + private final static String TAG = "ScreenColorSettings"; + private final static boolean DEBUG = false; + + private final static int MODE_STANDARD = 0; + private final static int MODE_VIVID = 1; + private final static int MODE_CUSTOM = 2; + + private static final String COLOR_MODE = "mode"; + private static final String COLOR_HUE = "hue"; + private static final String COLOR_SATURATION = "saturation"; + private static final String COLOR_INTENSITY = "intensity"; + private static final String COLOR_CONTRAST = "contrast"; + + private static final String PREVIEW_STRING_NAME = "screencolor_preview_name"; + + private int mMode = 0; + private IPPService mPPService = null; + private PPServiceConnection mPPServiceConn = null; + private SharedPreferences mSharedPreference; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + initPPService(); + getWindow().requestFeature(Window.FEATURE_ACTION_BAR); + setContentView(R.layout.screencolor_settings); + + ListView listView = (ListView)findViewById(R.id.mode_list); + listView.setBackgroundColor(R.color.screencolor_background); + mSharedPreference = getSharedPreferences(PREVIEW_STRING_NAME, Context.MODE_PRIVATE); + mMode = mSharedPreference.getInt(COLOR_MODE, 0); + setScreenColorMode(mMode); + String[] list = getResources().getStringArray(R.array.screen_color_setting); + ColorModeAdaper adapter = new ColorModeAdaper(this, + R.layout.screen_color_item, list); + listView.setAdapter(adapter); + } + + private class ColorModeAdaper extends ArrayAdapter<String> { + private int mResource; + private RelativeLayout mItemView; + + public ColorModeAdaper(Context context, int resource, String[] list) { + super(context, resource, list); + this.mResource = resource; + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + String name = getItem(position); + if(convertView == null) { + mItemView = new RelativeLayout(getContext()); + LayoutInflater vi = (LayoutInflater)getContext() + .getSystemService(Context.LAYOUT_INFLATER_SERVICE); + vi.inflate(mResource, mItemView, true); + } else { + mItemView = (RelativeLayout) convertView; + } + ((TextView) mItemView.findViewById(android.R.id.title)).setText(name); + + RadioButton radioButton = (RadioButton) mItemView.findViewById(android.R.id.button1); + ImageView setting = (ImageView) mItemView.findViewById(android.R.id.button2); + if (mMode == position) { + radioButton.setChecked(true); + setting.setEnabled(true); + } else { + radioButton.setChecked(false); + setting.setEnabled(false); + } + + if (position != getCount()-1) { + ((ImageView) mItemView.findViewById(R.id.divider)).setVisibility(View.INVISIBLE); + setting.setVisibility(View.INVISIBLE); + } else { + setting.setOnClickListener(new OnClickListener () { + @Override + public void onClick(View v) { + Intent intent = new Intent(); + intent.setClass(ScreenColorSettings.this, CustomScreenColor.class); + startActivity(intent); + }}); + } + + View v = mItemView.findViewById(R.id.widget_frame); + v.setTag(position); + v.setOnClickListener(new OnClickListener () { + @Override + public void onClick(View v) { + int mode = (Integer)(v.getTag()); + setScreenColorMode(mode); + notifyDataSetChanged(); + }}); + return mItemView; + } + } + + private void initPPService() { + mPPServiceConn = new PPServiceConnection(); + String packetname = "com.qualcomm.display"; + String service = "com.qualcomm.display.PPService"; + Intent i = new Intent(IPPService.class.getName()); + + ComponentName component = new ComponentName(packetname, service); + i.setComponent(component); + + bindService(i, mPPServiceConn, Context.BIND_AUTO_CREATE); + } + + private class PPServiceConnection implements ServiceConnection { + + @Override + public void onServiceConnected(ComponentName name, IBinder service) { + mPPService = IPPService.Stub.asInterface((IBinder) service); + if (DEBUG) Log.d(TAG, "onServiceConnected, service=" + mPPService); + try { + if (null != mPPService) { + mPPService.startPP(); + setScreenColorMode(mMode); + } + } catch (RemoteException e) { + Log.e(TAG, "startPP exception"); + } + } + + @Override + public void onServiceDisconnected(ComponentName name) { + if (null != mPPService) { + try { + mPPService.stopPP(); + } catch (RemoteException e) { + Log.e(TAG, "stopPP exception"); + } + } + mPPService = null; + } + + } + + private void setScreenColorMode(int mode) { + if (DEBUG) Log.i(TAG, "setScreenColorMode mode = " + mode); + int hue = 0; + int saturation = 0; + int intensity = 0; + int contrast = 0; + switch (mode) { + case MODE_STANDARD: + hue = 180; + saturation = 180; + intensity = 255; + contrast = 180; + break; + case MODE_VIVID: + hue = 180; + saturation = 210; + intensity = 255; + contrast = 180; + break; + case MODE_CUSTOM: + hue = mSharedPreference.getInt(COLOR_HUE, 180); + saturation = mSharedPreference.getInt(COLOR_SATURATION, 180); + intensity = mSharedPreference.getInt(COLOR_INTENSITY, 255); + contrast = mSharedPreference.getInt(COLOR_CONTRAST, 180); + break; + default: + break; + } + saveModeValue(mode); + updateHSCIValue(hue, saturation, intensity, contrast); + } + + private void updateHSCIValue(int hue, int saturation, int intensity, int contrast) { + try { + if (null != mPPService && mPPService.getPPStatus()) { + mPPService.updateHSIC(hue, saturation, intensity, contrast); + } + } catch (RemoteException e) { + Log.e(TAG, "updateHSIC exception"); + } + } + + @Override + protected void onDestroy() { + super.onDestroy(); + unbindService(mPPServiceConn); + } + + private void saveModeValue(int mode) { + mMode = mode; + Editor editor = mSharedPreference.edit(); + editor.putInt(COLOR_MODE, mode); + editor.commit(); + } +} |
