Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a284b34f authored by Danny Baumann's avatar Danny Baumann Committed by Adnan Begovic
Browse files

settings: Squashed commit of CMHW features 

Add hardware tunables (gamma, color, vibration strength).

Change-Id: I44e3e4e6cb444498a7c56048618cd92a0e2b8e59

Settings: restore hardware tunable values on boot

Change-Id: I9d2720947d615cab6a7ab9b596b24b8033dd0b4f

Settings: Add default value for display color control (2/2)

Change-Id: I50b684abe504c21ef49492f99b18873d75509697

settings: Move headset option, hide MoreDeviceSettings if empty

 * This option fits much better in the sound menu under "automation
   and effects", and on many devices it's the only option in the
   "More..." menu under Tap & Pay.
 * Move it, and remove the MoreDeviceSettings top-level category if
   there's nothing else in it.

Change-Id: Idd82f582a1ba54f8b45fbd4fbe631057e9515f86

Remove 'More device settings' menu

Change-Id: I86cd84f6f6c408b26c04d92529e9a031c4fed1f7

DisplayColor: Properly handle a minValue

* Previously setting anything as a minValue would cause the
  percentages to get out of whack. For instance, setting it to 35
  would cause the maximum percentage to climb above 100% as well
  as still allowing the value to be set lower than the min.
* This makes the maximum for the slider the max value minus the min
  (so we get the proper spread for min to max) and then adds the min
  back on before setting so we can't possibly go below the min.

Change-Id: I8dcdc422f54847940351fae10c74af6301d1e1be

Settings: AdaptiveBacklight support

Add support for adaptive backlight technologies like NVIDIA SmartDimmer, QCOM CABL or Samsung CABC.

Patchset 2: Use internal shared prefs to store the smardimmer setting
Patchset 3: Rename to AdaptiveBacklight
Patchset 4: Reorganize settings and strings to follow design guidelines
Patchset 5: CleanUp
Patchset 6: Added suggestions
Patchset 7: Sync default value. CleanUp.

Depends	on http://review.cyanogenmod.org/#/c/48465/

Change-Id: I52cb990f36593b265a00b46a5f63590515822ea5

settings: Add support for SRE

 * Add support for sunlight readability enhancement
 * Optionally depends on adaptive backlight, depending on HAL

Change-Id: I9ca388ffd68080f0e497edb81d5f8616c194ea1d

Cleanup.

Now that button and keyboard backlight don't use the HW framework
anymore, there's no point in having an abstraction for a single use case.

Change-Id: Ib66b2a29a105d53e3ba4273abb06977b132c1fc8
parent af88d809

proguard.flags

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
-keep class com.android.settings.users.*

-keep class com.android.settings.nfc.*

-keep class com.android.settings.notification.*

-keep class com.android.settings.cyanogenmod.*Settings



# Keep click responders

-keepclassmembers class com.android.settings.inputmethod.UserDictionaryAddWordActivity {

res/drawable/color_tuning_preview.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2013 The CyanogenMod Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">



    <gradient

        android:angle="0"

        android:startColor="#000000"

        android:endColor="#FFFFFF" />

</shape>

res/layout/display_color_calibration.xml

0 → 100644
+89 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2013 The CyanogenMod Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



    <RelativeLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:gravity="center_horizontal"

            android:paddingStart="20dip"

            android:paddingEnd="20dip"

            android:paddingBottom="20dip">



        <TextView android:id="@+id/color_red_text"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/color_red_title"

                android:paddingTop="10dip" />

        <TextView android:id="@+id/color_red_value"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_alignParentRight="true"

                android:paddingTop="10dip" />

        <SeekBar android:id="@+id/color_red_seekbar"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_below="@id/color_red_text"

                android:paddingTop="2dip" />



        <TextView android:id="@+id/color_green_text"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_below="@id/color_red_seekbar"

                android:text="@string/color_green_title"

                android:paddingTop="10dip" />

        <TextView android:id="@+id/color_green_value"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_below="@id/color_red_seekbar"

                android:layout_alignParentRight="true"

                android:paddingTop="10dip" />

        <SeekBar android:id="@+id/color_green_seekbar"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_below="@id/color_green_text"

                android:paddingTop="2dip" />



        <TextView android:id="@+id/color_blue_text"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_below="@id/color_green_seekbar"

                android:text="@string/color_blue_title"

                android:paddingTop="10dip" />

        <TextView android:id="@+id/color_blue_value"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_below="@id/color_green_seekbar"

                android:layout_alignParentRight="true"

                android:paddingTop="10dip" />

        <SeekBar android:id="@+id/color_blue_seekbar"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_below="@id/color_blue_text"

                android:paddingTop="2dip" />



        <ImageView android:id="@+id/black_scale_picture_color"

                android:src="@drawable/color_tuning_preview"

                android:layout_width="match_parent"

                android:layout_height="40dip"

                android:layout_below="@id/color_blue_seekbar"

                android:paddingTop="20dip" />



    </RelativeLayout>

</ScrollView>

res/layout/display_gamma_calibration.xml

0 → 100644
+32 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2013 The CyanogenMod Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



    <LinearLayout

            android:id="@+id/gamma_container"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:gravity="center_horizontal"

            android:orientation="vertical"

            android:paddingBottom="20dp" >



        <!-- children will be filled in dynamically -->



    </LinearLayout>

</ScrollView>

res/layout/display_gamma_calibration_header.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2013 The CyanogenMod Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<TextView xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginStart="5dp"

        android:layout_marginEnd="5dp"

        style="?android:attr/listSeparatorTextViewStyle"

        android:paddingTop="10dp"

        android:paddingBottom="5dp" >



</TextView>