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

Commit 9a087f69 authored by Justin Klaassen's avatar Justin Klaassen Committed by android-build-merger
Browse files

Merge \"Remove \"Night mode\" from tuner\" into nyc-mr1-dev 

am: e615e16a

Change-Id: I497cf51948597f8f70e756e4f11dac94c2d69444
parents b1589396 e615e16a

packages/SystemUI/res/drawable/ic_night_mode.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2016 The Android Open Source 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="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M20.71,5.63l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0.0l-3.12,3.12 -1.93,-1.91 -1.41,1.41 1.42,1.42L3.0,16.25L3.0,21.0l4.75,0.0l8.92,-8.92 1.42,1.42 1.41,-1.41 -1.92,-1.92 3.12,-3.12c0.4,0.0 0.4,-1.0 0.01,-1.42zM6.92,19.0L5.0,17.08l8.06,-8.06 1.92,1.92L6.92,19.0z"/>

</vector>

packages/SystemUI/res/drawable/ic_night_mode_disabled.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2016 The Android Open Source 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="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#4DFFFFFF"

        android:pathData="M20.71,5.63l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0.0l-3.12,3.12 -1.93,-1.91 -1.41,1.41 1.42,1.42L3.0,16.25L3.0,21.0l4.75,0.0l8.92,-8.92 1.42,1.42 1.41,-1.41 -1.92,-1.92 3.12,-3.12c0.4,0.0 0.4,-1.0 0.01,-1.42zM6.92,19.0L5.0,17.08l8.06,-8.06 1.92,1.92L6.92,19.0z"/>

</vector>

packages/SystemUI/res/layout/calibrate_sliders.xml

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

<!--

     Copyright (C) 2015 The Android Open Source 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:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingTop="8dp"

    android:paddingBottom="8dp"

    android:orientation="vertical">



    <LinearLayout

        android:id="@+id/r_group"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="4dp"

        android:paddingBottom="4dp"

        android:orientation="horizontal">



        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/color_modification_r"

            android:gravity="center"

            android:textAppearance="?android:attr/textAppearanceMedium" />



        <SeekBar android:id="@*android:id/seekbar"

            android:layout_marginStart="16dp"

            android:layout_gravity="center_vertical"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1" />

    </LinearLayout>



    <LinearLayout

        android:id="@+id/g_group"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="4dp"

        android:paddingBottom="4dp"

        android:orientation="horizontal">



        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/color_modification_g"

            android:gravity="center"

            android:textAppearance="?android:attr/textAppearanceMedium" />



        <SeekBar android:id="@*android:id/seekbar"

            android:layout_marginStart="16dp"

            android:layout_gravity="center_vertical"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1" />

    </LinearLayout>



    <LinearLayout

        android:id="@+id/b_group"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="4dp"

        android:paddingBottom="4dp"

        android:orientation="horizontal">



        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/color_modification_b"

            android:gravity="center"

            android:textAppearance="?android:attr/textAppearanceMedium" />



        <SeekBar android:id="@*android:id/seekbar"

            android:layout_marginStart="16dp"

            android:layout_gravity="center_vertical"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1" />

    </LinearLayout>



</LinearLayout>

packages/SystemUI/res/layout/night_mode_settings.xml

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

<!-- Copyright (C) 2016 The Android Open Source 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">



    <include layout="@layout/switch_bar" />



</LinearLayout>

packages/SystemUI/res/values/strings.xml

+0 −53
Original line number Diff line number Diff line
@@ -1336,59 +1336,6 @@ 
    <!-- Notification: Gear: Content description for the gear. [CHAR LIMIT=NONE] -->

    <string name="notification_gear_accessibility"><xliff:g id="app_name" example="YouTube">%1$s</xliff:g> notification controls</string>



    <!-- SysUI Tuner: Color and appearance screen title [CHAR LIMIT=50] -->

    <string name="color_and_appearance">Color and appearance</string>



    <!-- SysUI Tuner: Name of the night mode feature [CHAR LIMIT=30] -->

    <string name="night_mode">Night mode</string>



    <!-- SysUI Tuner: Name of calibrate display dialog [CHAR LIMIT=30] -->

    <string name="calibrate_display">Calibrate display</string>



    <!-- SysUI Tuner: Summary of night mode when its on [CHAR LIMIT=NONE] -->

    <string name="night_mode_on">On</string>



    <!-- SysUI Tuner: Summary of night mode when its off [CHAR LIMIT=NONE] -->

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



    <!-- SysUI Tuner: Label for switch to turn on night mode automatically [CHAR LIMIT=50] -->

    <string name="turn_on_automatically">Turn on automatically</string>



    <!-- SysUI Tuner: Summary for switch to turn on night mode automatically [CHAR LIMIT=NONE] -->

    <string name="turn_on_auto_summary">Switch into Night Mode as appropriate for location and time of day</string>



    <!-- SysUI Tuner: Label for section controlling what night mode does [CHAR LIMIT=60] -->

    <string name="when_night_mode_on">When Night Mode is on</string>



    <!-- SysUI Tuner: Switch controlling whether dark theme is turned on with night mode [CHAR LIMIT=45] -->

    <string name="use_dark_theme">Use dark theme for Android OS</string>



    <!-- SysUI Tuner: Switch controlling whether tint is changed with night mode [CHAR LIMIT=45] -->

    <string name="adjust_tint">Adjust tint</string>



    <!-- SysUI Tuner: Switch controlling whether brightness is changed with night mode [CHAR LIMIT=45] -->

    <string name="adjust_brightness">Adjust brightness</string>



    <!-- SysUI Tuner: Disclaimer about using dark theme with night mode [CHAR LIMIT=NONE] -->

    <string name="night_mode_disclaimer">The dark theme is applied to

        core areas of Android OS that are normally displayed in a light theme,

        such as Settings.</string>



    <!-- Button to apply settings [CHAR LIMIT=30] -->

    <string name="color_apply">Apply</string>



    <!-- Title of warning dialog about bad color settings. [CHAR LIMIT=30] -->

    <string name="color_revert_title">Confirm settings</string>



    <!-- Message warning user about custom color settings [CHAR LIMIT=NONE] -->

    <string name="color_revert_message">Some color settings can make this

        device unusable. Click OK to confirm these color settings,

        otherwise these settings will reset after 10 seconds.</string>



    <string name="color_modification_r" translatable="false">R</string>

    <string name="color_modification_g" translatable="false">G</string>

    <string name="color_modification_b" translatable="false">B</string>



    <!-- Title of the battery settings detail panel [CHAR LIMIT=20] -->

    <string name="battery_panel_title">Battery usage</string>