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

Commit bfaa555f authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Android (Google) Code Review
Browse files

Merge "Revert "[Dual Shade] Settings page for switching between Dual & Single shades."" into main

parents 700c9465 a6889da6

AndroidManifest.xml

+0 −16
Original line number Diff line number Diff line
@@ -1142,22 +1142,6 @@ 
                android:value="true"/>

        </activity>



        <activity

            android:name=".Settings$ShadeSettingsActivity"

            android:label="@string/shade_panels_title"

            android:exported="true">

            <intent-filter>

                <action android:name="com.android.settings.SHADE_SETTINGS"/>

                <category android:name="android.intent.category.DEFAULT"/>

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.system.ShadePanelsFragment"/>

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                android:value="@string/menu_key_notifications"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true"/>

        </activity>



        <activity

            android:name=".Settings$RegionSettingsActivity"

            android:label="@string/region_picker_preference_title"

res/values-ldrtl/strings.xml

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

<!-- Copyright (C) 2025 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.

-->

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

    <!-- Summary text for the separate panels mode. In this mode, notifications and Quick Settings are shown in separate panels, each opened by swiping down on a different side of the top edge of the screen. [CHAR_LIMIT=250] -->

    <string name="shade_panels_separate_summary">Swipe down from the top left to open Quick Settings. Swipe down from the top right to open notifications.</string>

</resources>

res/values/strings.xml

+0 −24
Original line number Diff line number Diff line
@@ -11686,30 +11686,6 @@ Data usage charges may apply.</string> 
    <!-- Summary text for swipe up to switch apps  [CHAR LIMIT=250] -->

    <string name="swipe_up_to_switch_apps_summary">To switch apps, swipe up on the Home button. To see all apps, swipe up again. To go back, tap the back button.</string>









    <!-- Title text for system panels showing notifications and quick settings [CHAR LIMIT=60] -->









    <string name="shade_panels_title">Notifications &amp; Quick Settings</string>

















    <!-- Search keywords for system panels settings. [CHAR_LIMIT=NONE]-->









    <string name="keywords_shade_panels">shade, panels, notifications, quick settings, qs, separate, combined, dual, single</string>

















    <!-- Category for system panels showing notifications and Quick Settings. [CHAR LIMIT=NONE]-->









    <string name="shade_panels_category">Panels</string>

















    <!-- Title text for the separate panels mode. In this mode, notifications and Quick Settings are shown in separate panels, each opened by swiping down on a different side of the top edge of the screen. [CHAR_LIMIT=60] -->









    <string name="shade_panels_separate_title">Separate</string>

















    <!-- Summary text for the separate panels mode. In this mode, notifications and Quick Settings are shown in separate panels, each opened by swiping down on a different side of the top edge of the screen. [CHAR_LIMIT=250] -->









    <string name="shade_panels_separate_summary">Swipe down from the top right to open Quick Settings. Swipe down from the top left to open notifications.</string>

















    <!-- Title text for the combined panels mode. In this mode, notifications and Quick Settings are shown a single panel, opened by swiping down from the top edge of the screen. In the past this used to be the only mode, so it is also referred to as "classic" mode. [CHAR_LIMIT=60] -->









    <string name="shade_panels_combined_title">Combined (classic)</string>

















    <!-- Summary text for the combined panels mode. In this mode, notifications and Quick Settings are shown a single panel, opened by swiping down from the top edge of the screen. In the past this used to be the only mode, so it is also referred to as "classic" mode. [CHAR_LIMIT=NONE] -->









    <string name="shade_panels_combined_summary">Swipe down from the top of your screen to access the classic panel that combines notifications and Quick Settings.</string>

















    <!-- Informational message shown to users of foldable devices, explaining that the combined shade view is only available on the outer (narrow) screen of their device. [CHAR LIMIT=200]-->









    <string name="shade_panels_foldables_footer_message">Combined (classic) view is limited to the outer screen of your foldable device</string>

















    <!-- Preference title for "Safety & emergency" settings page [CHAR LIMIT=60]-->









    <string name="emergency_settings_preference_title">Safety &amp; emergency</string>

































res/xml/configure_notification_settings.xml



+5
−12






























Original line number
Diff line number
Diff line







@@ -195,42 +195,35 @@







                android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>









        </com.android.settingslib.RestrictedPreference>



















        <Preference









            android:key="shade_panels_settings"









            android:title="@string/shade_panels_title"









            android:order="24"









            android:fragment="com.android.settings.system.ShadePanelsFragment"









            settings:controller="com.android.settings.system.ShadePanelsPreferenceController"/>



















        <SwitchPreferenceCompat









             android:key="silent_icons"









             android:order="25"









             android:order="24"









             android:title="@string/silent_notifications_status_bar"









             settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/>



















        <SwitchPreferenceCompat









            android:key="show_snooze_options"









            android:order="26"









            android:order="25"









            android:title="@string/snooze_options_title"









            settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" />



















        <!-- Notification badging -->









        <SwitchPreferenceCompat









            android:key="notification_badging"









            android:order="27"









            android:order="26"









            android:title="@string/notification_badging_title"









            settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>



















        <!-- Pulse notification light, on devices that support it -->









        <SwitchPreferenceCompat









            android:key="notification_pulse"









            android:order="28"









            android:order="27"









            android:title="@string/notification_pulse_title"









            settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>



















        <SwitchPreferenceCompat









            android:key="notification_assistant"









            android:order="29"









            android:order="28"









            android:title="@string/notification_assistant_title"









            android:summary="@string/notification_assistant_summary"









            settings:controller="com.android.settings.notification.NotificationAssistantPreferenceController"/>
































res/xml/shade_panels_settings.xml
deleted100644 → 0



+0
−22






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!--









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









  -->



















<PreferenceScreen









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









    xmlns:settings="http://schemas.android.com/apk/res-auto"









    android:title="@string/shade_panels_title"









    settings:keywords="@string/keywords_shade_panels"/>