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

Commit 395e839b authored by Wilson Wu's avatar Wilson Wu Committed by Android (Google) Code Review
Browse files

Merge "Update settings PrimarySwitchPreference reference"

parents eb969df5 9edf7974

res/layout/restricted_preference_widget_primary_switch.xml

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

<!--

  ~ Copyright (C) 2019 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.

  -->



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

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



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

</merge>
 
 No newline at end of file

res/xml/accessibility_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
            android:title="@string/accessibility_text_and_display_title"

            settings:searchable="true"/>



        <com.android.settings.widget.PrimarySwitchPreference

        <com.android.settingslib.PrimarySwitchPreference

            android:fragment="com.android.settings.accessibility.ToggleReduceBrightColorsPreferenceFragment"

            android:key="reduce_bright_colors_preference"

            android:icon="@drawable/ic_reduce_bright_colors"

res/xml/development_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ 
        <Preference android:key="clear_adb_keys"

                    android:title="@string/clear_adb_keys" />



        <com.android.settings.widget.PrimarySwitchPreference

        <com.android.settingslib.PrimarySwitchPreference

            android:fragment="com.android.settings.development.WirelessDebuggingFragment"

            android:key="toggle_adb_wireless"

            android:title="@string/enable_adb_wireless"

res/xml/display_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
            settings:useAdminDisabledSummary="true"

            settings:userRestriction="no_config_brightness"/>



        <com.android.settings.widget.PrimarySwitchPreference

        <com.android.settingslib.PrimarySwitchPreference

            android:key="auto_brightness_entry"

            android:title="@string/auto_brightness_title"

            android:fragment="com.android.settings.display.AutoBrightnessSettings"
@@ -85,7 +85,7 @@ 
    <PreferenceCategory

        android:title="@string/category_name_color">



        <com.android.settings.widget.PrimarySwitchPreference

        <com.android.settingslib.PrimarySwitchPreference

            android:key="night_display"

            android:title="@string/night_display_title"

            android:fragment="com.android.settings.display.NightDisplaySettings"

res/xml/gestures.xml

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ 
        android:fragment="com.android.settings.gestures.PowerMenuSettings"

        settings:controller="com.android.settings.gestures.PowerMenuPreferenceController" />



    <com.android.settings.widget.PrimarySwitchPreference

    <com.android.settingslib.PrimarySwitchPreference

        android:key="gesture_prevent_ringing_summary"

        android:title="@string/gesture_prevent_ringing_screen_title"

        android:fragment="com.android.settings.gestures.PreventRingingGestureSettings"