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

Commit c30551b3 authored by Adnan Begovic's avatar Adnan Begovic
Browse files

fw: Move LiveDisplay settings and resources. 

Change-Id: I3a7c38852a0fa224b65d5bb568df6c23fa3eb8b1
parent c21acd8f

core/java/android/provider/Settings.java

+0 −54
Original line number Diff line number Diff line
@@ -3617,54 +3617,6 @@ public final class Settings { 
         * the setting value. See an example above.

         */



        /**

         * Color temperature of the display during the day

         * @hide

         */

        public static final String DISPLAY_TEMPERATURE_DAY = "display_temperature_day";



        /**

         * Color temperature of the display at night

         * @hide

         */

        public static final String DISPLAY_TEMPERATURE_NIGHT = "display_temperature_night";



        /**

         * Display color temperature adjustment mode, one of DAY (default), NIGHT, or AUTO.

         * @hide

         */

        public static final String DISPLAY_TEMPERATURE_MODE = "display_temperature_mode";



        /**

         * Automatic outdoor mode

         * @hide

         */

        public static final String DISPLAY_AUTO_OUTDOOR_MODE = "display_auto_outdoor_mode";



        /**

         * Use display power saving features such as CABC or CABL

         * @hide

         */

        public static final String DISPLAY_LOW_POWER = "display_low_power";



        /**

         * Use color enhancement feature of display

         * @hide

         */

        public static final String DISPLAY_COLOR_ENHANCE = "display_color_enhance";



        /**

         * Manual display color adjustments (RGB values as floats, separated by spaces)

         * @hide

         */

        public static final String DISPLAY_COLOR_ADJUSTMENT = "display_color_adjustment";



        /**

         * Did we tell about how they can stop breaking their eyes?

         * @hide

         */

        public static final String LIVE_DISPLAY_HINTED = "live_display_hinted";



        /**

         *  Enable statusbar double tap gesture on to put device to sleep

         * @hide
@@ -3771,12 +3723,6 @@ public final class Settings { 
            RINGTONE,

            LOCK_TO_APP_ENABLED,

            NOTIFICATION_SOUND,

            WIFI_AUTO_CONNECT_TYPE,

            DISPLAY_TEMPERATURE_NIGHT,

            DISPLAY_TEMPERATURE_DAY,

            DISPLAY_TEMPERATURE_MODE,

            DISPLAY_AUTO_OUTDOOR_MODE,

            LIVE_DISPLAY_HINTED,

            PHONE_BLACKLIST_ENABLED,

            PHONE_BLACKLIST_NOTIFY_ENABLED,

            PHONE_BLACKLIST_PRIVATE_NUMBER_MODE,

core/res/res/drawable/ic_livedisplay_notif.xml

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

<!--

    Copyright (c) 2015 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.

-->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:fillColor="#FFFFFF"

        android:pathData="M15.5,15.5c0.4-0.4,0.7-0.8,0.9-1.2c-1.9,1-4.3,0.7-5.8-0.9s-1.9-4-0.9-5.8C9.2,7.8,8.8,8.1,8.5,8.5

c-2,2-2,5.1,0,7.1S13.6,17.5,15.5,15.5z M19,5v14H5V5H19

M19,3H5C3.9,3,3,3.9,3,5v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V5

C21,3.9,20.1,3,19,3L19,3z" />

</vector>
 
 No newline at end of file

core/res/res/values/cm_arrays.xml

+0 −24
Original line number Diff line number Diff line
@@ -23,30 +23,6 @@ 
        <item>com.google.android.gsf|com.google.android.talk</item>

    </string-array>



    <string-array name="live_display_entries" translatable="false">

        <item>@string/live_display_auto</item>

        <item>@string/live_display_off</item>

        <item>@string/live_display_day</item>

        <item>@string/live_display_night</item>

        <item>@string/live_display_outdoor</item>

    </string-array>



    <string-array name="live_display_summaries" translatable="false">

        <item>@string/live_display_auto_summary</item>

        <item>@string/live_display_off_summary</item>

        <item>@string/live_display_day_summary</item>

        <item>@string/live_display_night_summary</item>

        <item>@string/live_display_outdoor_summary</item>

    </string-array>



    <string-array name="live_display_values" translatable="false">

        <item>2</item>

        <item>0</item>

        <item>4</item>

        <item>1</item>

        <item>3</item>

    </string-array>



    <!-- Defines the shutdown options shown in the reboot dialog. -->

    <array name="shutdown_reboot_options" translatable="false">

        <item>@string/reboot_reboot</item>

core/res/res/values/cm_strings.xml

+0 −14
Original line number Diff line number Diff line
@@ -17,20 +17,6 @@ 
-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- LiveDisplay strings -->

    <string name="live_display_title" translatable="false">LiveDisplay</string>

    <string name="live_display_auto">Automatic</string>

    <string name="live_display_auto_summary">Automatically adjust color temperature of screen after sunset and sunrise</string>

    <string name="live_display_off">Off</string>

    <string name="live_display_off_summary">Disable all adjustments</string>

    <string name="live_display_day">Day</string>

    <string name="live_display_day_summary">Use day settings only</string>

    <string name="live_display_night">Night</string>

    <string name="live_display_night_summary">Use night settings only</string>

    <string name="live_display_outdoor">Outdoor (bright sun)</string>

    <string name="live_display_outdoor_summary">Use outdoor settings only</string>

    <string name="live_display_hint">LiveDisplay can help reduce eyestrain and help you sleep at night. Click here to try it out!</string>



    <!-- label for item that screenshots in phone options dialog -->

    <string name="global_action_screenshot">Screenshot</string>

core/res/res/values/cm_symbols.xml

+0 −20
Original line number Diff line number Diff line
@@ -48,26 +48,6 @@ 
    <java-symbol type="string" name="global_action_current_user" />

    <java-symbol type="dimen" name="global_actions_avatar_size" />



    <!-- LiveDisplay -->

    <java-symbol type="string" name="live_display_title" />

    <java-symbol type="string" name="live_display_hint" />

    <java-symbol type="string" name="live_display_auto" />

    <java-symbol type="string" name="live_display_auto_summary" />

    <java-symbol type="string" name="live_display_day" />

    <java-symbol type="string" name="live_display_day_summary" />

    <java-symbol type="string" name="live_display_night" />

    <java-symbol type="string" name="live_display_night_summary" />

    <java-symbol type="string" name="live_display_outdoor" />

    <java-symbol type="string" name="live_display_outdoor_summary" />

    <java-symbol type="array" name="live_display_entries" />

    <java-symbol type="array" name="live_display_summaries" />

    <java-symbol type="array" name="live_display_values" />

    <java-symbol type="drawable" name="ic_livedisplay_notif" />



    <java-symbol type="integer" name="config_dayColorTemperature" />

    <java-symbol type="integer" name="config_nightColorTemperature" />

    <java-symbol type="integer" name="config_outdoorAmbientLux" />



    <!-- Theme install failure notification -->

    <java-symbol type="string" name="theme_install_error_title" />

    <java-symbol type="string" name="theme_install_error_message" />