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

Commit 30ce864b authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "Add basic-level gamma calibration to hardware tunables" into cm-10.2

parents 4467ed9c 5709e48b

res/layout/display_gamma_calibration.xml

0 → 100644
+31 −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">



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



    </LinearLayout>

</ScrollView>

res/layout/display_gamma_calibration_item.xml

0 → 100644
+38 −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.

-->



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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="20dip"

        android:paddingEnd="20dip"

        android:paddingTop="10dip"

        android:paddingBottom="10dip">



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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content" />

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignParentRight="true" />

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

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_below="@id/color_text"

            android:paddingTop="2dip" />



</RelativeLayout>

res/values/cm_strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -1003,6 +1003,11 @@ two in order to insert additional control points. \'Remove\' deletes the selecte 
    <string name="button_backlight_title">Button backlight brightness</string>

    <string name="keyboard_backlight_title">Keyboard backlight brightness</string>



    <!-- Hardware tunables - Gamma calibration -->

    <string name="category_gamma_title">Gamma</string>

    <string name="gamma_tuning_title_head">Gamma calibration</string>

    <string name="gamma_tuning_summary_head">Tweak gamma values</string>



    <!--  Other device settings -->

    <string name="more_device_controls_title">More\u2026</string>

    <string name="more_device_settings_title">Other device options</string>

res/xml/more_device_settings.xml

+7 −0
Original line number Diff line number Diff line
@@ -30,6 +30,13 @@ 
                android:summary="@string/color_calibration_summary"

                android:persistent="false" />



        <com.android.settings.cyanogenmod.DisplayGamma

                android:key="gamma_tuning"

                android:title="@string/gamma_tuning_title_head"

                android:dialogTitle="@string/gamma_tuning_title_head"

                android:summary="@string/gamma_tuning_summary_head"

                android:persistent="false" />



    </PreferenceCategory>



    <PreferenceCategory

src/com/android/settings/DisplaySettings.java

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import android.provider.Settings; 
import android.util.Log;



import com.android.internal.view.RotationPolicy;

import com.android.settings.cyanogenmod.DisplayColor;

import com.android.settings.cyanogenmod.DisplayRotation;

import com.android.settings.Utils;