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

Commit 112b03ee authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Add back backlight curve adjustment. 

Patch set 1-8: Initial commits
Patch set 9  : Shortened strings to better fit Design Guidelines

Change-Id: I1eb370f8911d1c92ef06e553cc1c1be81e83cb95
parent f699b2e2

res/layout/auto_brightness_list_item.xml

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

<!--

/*

** Copyright 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.

*/

-->

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center_vertical"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:paddingStart="8dip"

    android:paddingEnd="8dip"

    android:descendantFocusability="blocksDescendants">



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

        android:layout_width="65dp"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical" />



    <LinearLayout

        android:orientation="vertical"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1">



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

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />



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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="end"

            android:layout_marginTop="-4dp"

            style="?android:attr/textAppearanceSmall" />



    </LinearLayout>



</LinearLayout>

res/layout/auto_brightness_lux_config.xml

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

-->



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

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical"

        android:gravity="center_horizontal"

        android:padding="8dip">



    <TextView

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@string/auto_brightness_start_lux" />



    <EditText android:id="@+id/start_lux"

            android:enabled="false"

            android:singleLine="true"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="2dip"

            android:numeric="integer" />



    <TextView

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="8dip"

            android:text="@string/auto_brightness_end_lux" />



    <EditText android:id="@+id/end_lux"

            android:singleLine="true"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="2dip"

            android:numeric="integer" />



</LinearLayout>

res/layout/auto_brightness_split_dialog.xml

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

-->



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

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical"

        android:gravity="center_horizontal"

        android:padding="8dip">



    <TextView

            android:id="@+id/split_label"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="8dip" />



    <EditText android:id="@+id/split_position"

            android:singleLine="true"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="2dip"

            android:numeric="integer" />



</LinearLayout>

res/layout/dialog_auto_brightness_levels.xml

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

<!--

     Copyright (C) 2010 Daniel Nilsson

     Copyright (C) 2012 THe CyanogenMod Project

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

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

     You may obtain a copy of the License at



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



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

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

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

     See the License for the specific language governing permissions and

     limitations under the License. -->



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

    android:layout_width="match_parent"

    android:layout_height="match_parent" >



    <TextView

        android:id="@+id/light_sensor_value"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:padding="8dip" />



    <TextView

        android:id="@+id/current_brightness"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_below="@id/light_sensor_value"

        android:padding="8dip" />



    <ListView

        android:id="@android:id/list"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_below="@id/light_sensor_value"

        android:layout_alignParentBottom="true" />



</RelativeLayout>

res/values/strings.xml

+20 −0
Original line number Diff line number Diff line
@@ -5158,5 +5158,25 @@ 
    <string name="cyanogenmod_waiver_title">Waiver</string>

    <string name="cyanogenmod_waiver_body">Changing this setting may be against your state or government laws.\n\nIn selecting \'OK\' below, you acknowledge this warning and waive, indemnify and hold harmless CyanogenMod and its contributors from all legal liabilities.</string>



    <!-- Automatic brightness customization -->

    <string name="light_sensor_current_value">Current light sensor value: <xliff:g id="light_level">%d</xliff:g> lux</string>

    <string name="auto_brightness_dialog_title">Automatic brightness levels</string>

    <string name="auto_brightness_level_format"><xliff:g id="start_level">%1$s</xliff:g> -\n<xliff:g id="end_level">%2$s</xliff:g> lux</string>

    <string name="auto_brightness_brightness_format"><xliff:g id="percent">%s</xliff:g>%%</string>

    <string name="auto_brightness_adjust_button">Adjust</string>

    <string name="auto_brightness_reset_button">Reset</string>

    <string name="auto_brightness_remove_button">Remove</string>

    <string name="auto_brightness_add_line">Add line</string>

    <string name="auto_brightness_lux_dialog_title">Ambient brightness range</string>

    <string name="auto_brightness_split_dialog_title">Split brightness level</string>

    <string name="auto_brightness_start_lux">Range start (lux)</string>

    <string name="auto_brightness_end_lux">Range end (lux)</string>

    <string name="auto_brightness_reset_dialog_title">Reset levels?</string>

    <string name="auto_brightness_reset_confirmation">All brightness levels will be reset to their default settings.</string>

    <string name="auto_brightness_split_lux_format">Split position (between <xliff:g id="min">%1$d</xliff:g> and <xliff:g id="max">%2$d</xliff:g> lux)</string>

    <string name="auto_brightness_level_options">Light level options</string>

    <string name="auto_brightness_menu_edit_lux">Ambient brightness range</string>

    <string name="auto_brightness_menu_split">Split</string>

    <string name="auto_brightness_menu_remove">Remove</string>

    <!-- **** CYANOGENMOD ADDITIONS END **** -->

</resources>