diff options
author | Steve Kondik <steve@cyngn.com> | 2016-07-21 23:55:13 -0700 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-08-05 17:50:15 -0700 |
commit | 228f65e1c460f0e632ad38351820a49821e81589 (patch) | |
tree | 5ec97738f3173226464014bd7b8660faf1583863 /res/layout | |
parent | c094d113153bfba705df2eb58013a2c3314890fe (diff) | |
download | packages_apps_Settings-228f65e1c460f0e632ad38351820a49821e81589.zip packages_apps_Settings-228f65e1c460f0e632ad38351820a49821e81589.tar.gz packages_apps_Settings-228f65e1c460f0e632ad38351820a49821e81589.tar.bz2 |
Revert "Settings: Add screen color settings"
* We now have support for HSIC controls in LiveDisplay and this
can be deprecated. A new UI to bring the same kind of functionality
is underway as well.
This reverts commit 853513841512a0fbf15dc22c7164a98d0a2de80b.
Change-Id: I4fa3af25f64b05338a78ba7832e75333cf15e448
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/custom_screencolor.xml | 287 | ||||
-rw-r--r-- | res/layout/screen_color_item.xml | 93 | ||||
-rw-r--r-- | res/layout/screencolor_settings.xml | 49 |
3 files changed, 0 insertions, 429 deletions
diff --git a/res/layout/custom_screencolor.xml b/res/layout/custom_screencolor.xml deleted file mode 100644 index b6c153b..0000000 --- a/res/layout/custom_screencolor.xml +++ /dev/null @@ -1,287 +0,0 @@ -<?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="@color/custom_screencolor_buttons_text_color" - 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="@color/custom_screencolor_buttons_text_color" - 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="@color/custom_screencolor_buttons_text_color" - 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="@color/custom_screencolor_buttons_text_color" - 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="@color/custom_screencolor_buttons_text_color" - 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="@color/custom_screencolor_buttons_text_color" - 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 deleted file mode 100644 index 7a87284..0000000 --- a/res/layout/screen_color_item.xml +++ /dev/null @@ -1,93 +0,0 @@ -<?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="@color/screen_color_button_text_color" - 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 deleted file mode 100644 index dd614a1..0000000 --- a/res/layout/screencolor_settings.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?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> |