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

Commit b234ca21 authored by Matías Hernández's avatar Matías Hernández Committed by Android (Google) Code Review
Browse files

Merge "Delete Settings code related to super-obsolete zen onboarding" into main

parents b589ba5e a2e71cc7

AndroidManifest.xml

+0 −34
Original line number Diff line number Diff line
@@ -1384,40 +1384,6 @@ 
            android:theme="@style/Theme.Settings.NoActionBar">

        </activity>



        <activity

            android:name=".notification.zen.ZenSuggestionActivity"

            android:label="@string/zen_mode_settings_title"

            android:icon="@drawable/ic_suggestion_dnd"

            android:exported="true"

            android:theme="@android:style/Theme.NoDisplay">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.ZEN" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />

            </intent-filter>



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

                       android:value="0" />

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

                       android:resource="@string/zen_suggestion_title" />

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

                       android:resource="@string/zen_suggestion_summary" />

        </activity>



        <activity

            android:name=".notification.zen.ZenOnboardingActivity"

            android:label="@string/zen_onboarding_dnd_visual_disturbances_header"

            android:icon="@drawable/ic_notifications"

            android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"

            android:exported="true">

            <intent-filter android:priority="1">

                <action android:name="android.settings.ZEN_MODE_ONBOARDING" />

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

            </intent-filter>

        </activity>

        <activity

            android:name="Settings$ZenModeAutomationSettingsActivity"

            android:label="@string/zen_mode_automation_settings_title"

res/layout/zen_onboarding.xml

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

<!--

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

-->

<RelativeLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



    <RelativeLayout

        android:id="@+id/zen_onboarding_choices"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingLeft="24dp"

        android:paddingRight="24dp"

        android:paddingTop="18dp">



        <TextView

            android:id="@+id/header"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/zen_onboarding_dnd_visual_disturbances_header"

            android:textAppearance="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle" />



        <LinearLayout

            android:id="@+id/zen_onboarding_new_setting"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_below="@+id/header"

            android:layout_centerHorizontal="true"

            android:layout_marginTop="22dp"

            android:orientation="horizontal">



            <RadioButton

                android:id="@+id/zen_onboarding_new_setting_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:paddingHorizontal="8dp"

                android:minHeight="48dp"/>



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical">



                <TextView

                    android:id="@+id/zen_onboarding_new_setting_title"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:text="@string/zen_onboarding_new_setting_title"

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



                <TextView

                    android:id="@+id/zen_onboarding_new_setting_summary"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

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

            </LinearLayout>



        </LinearLayout>



        <LinearLayout

            android:id="@+id/zen_onboarding_current_setting"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_below="@+id/zen_onboarding_new_setting"

            android:layout_centerHorizontal="true"

            android:layout_marginTop="10dp"

            android:orientation="horizontal">



            <RadioButton

                android:id="@+id/zen_onboarding_current_setting_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:paddingHorizontal="8dp"

                android:minHeight="48dp"/>



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical">



                <TextView

                    android:id="@+id/zen_onboarding_current_setting_title"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:text="@string/zen_onboarding_current_setting_title"

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



                <TextView

                    android:id="@+id/zen_onboarding_current_setting_summary"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

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

            </LinearLayout>

        </LinearLayout>

    </RelativeLayout>



    <RelativeLayout

        android:id="@+id/buttons"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_below="@+id/zen_onboarding_choices"

        android:layout_marginLeft="8dp"

        android:layout_marginTop="20dp"

        android:layout_marginBottom="10dp">



        <Button

            android:id="@+id/settings"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/zen_onboarding_settings"

            android:layout_alignParentStart="true"

            style="@style/TextAppearance.ZenOnboardingButton"

            android:onClick="launchSettings" />



        <Button

            android:id="@+id/ok"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignParentEnd="true"

            android:text="@string/zen_onboarding_ok"

            style="@style/TextAppearance.ZenOnboardingButton"

            android:onClick="save" />

    </RelativeLayout>

</RelativeLayout>
 
 No newline at end of file

res/values/strings.xml

+0 −22
Original line number Diff line number Diff line
@@ -8451,28 +8451,6 @@ 
    <!-- Do not disturb custom settings duration header [CHAR LIMIT=40]-->

    <string name="zen_custom_settings_duration_header">Duration</string>









    <!-- Do not disturb settings, messages, events and reminders title [CHAR LIMIT=100]-->









    <string name="zen_msg_event_reminder_title">Messages, events &amp; reminders</string>









    <!-- Do not disturb settings, messages, events and reminders footer [CHAR LIMIT=NONE]-->









    <string name="zen_msg_event_reminder_footer">When Do Not Disturb is on, messages, reminders, and events will be muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you.</string>

















    <!-- Do not disturb onboarding dialog, accept new settings [CHAR LIMIT=30]-->









    <string name="zen_onboarding_ok">Done</string>









    <!-- Do not disturb onboarding dialog, on click user goes to dnd settings page [CHAR LIMIT=30]-->









    <string name="zen_onboarding_settings">Settings</string>

















    <!-- Do not disturb onboarding dialog, title for radio button [CHAR LIMIT=80]-->









    <string name="zen_onboarding_new_setting_title">No visuals or sound from notifications</string>









    <!-- Do not disturb onboarding dialog, title for radio button [CHAR LIMIT=80]-->









    <string name="zen_onboarding_current_setting_title">No sound from notifications</string>









    <!-- Do not disturb onboarding dialog, secondary text for radio button [CHAR LIMIT=NONE]-->









    <string name="zen_onboarding_new_setting_summary">You won\u2019t see or hear notifications. Calls from starred contacts and repeat callers are allowed.</string>









    <!-- Do not disturb onboarding dialog, secondary text for radio button [CHAR LIMIT=NONE]-->









    <string name="zen_onboarding_current_setting_summary">(Current setting)</string>

















    <!-- Do not disturb onboarding dialog, header prompt for settings [CHAR LIMIT=80]-->









    <string name="zen_onboarding_dnd_visual_disturbances_header">Change Do Not Disturb notification settings?</string>

















    <!-- Work Sounds: Work sound settings section header.  [CHAR LIMIT=50] -->









    <string name="sound_work_settings">Work profile sounds</string>

































src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java



+0
−4






























Original line number
Diff line number
Diff line







@@ -30,8 +30,6 @@ import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionAc







import com.android.settings.biometrics.fingerprint.FingerprintSuggestionActivity;









import com.android.settings.display.NightDisplayPreferenceController;









import com.android.settings.flags.Flags;









import com.android.settings.notification.zen.ZenOnboardingActivity;









import com.android.settings.notification.zen.ZenSuggestionActivity;









import com.android.settings.password.ScreenLockSuggestionActivity;









import com.android.settings.wallpaper.StyleSuggestionActivity;









import com.android.settings.wallpaper.WallpaperSuggestionActivity;








@@ -72,8 +70,6 @@ public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider







            return WifiCallingSuggestionActivity.isSuggestionComplete(context);









        } else if (className.equals(NightDisplaySuggestionActivity.class.getName())) {









            return NightDisplayPreferenceController.isSuggestionComplete(context);









        } else if (className.equals(ZenSuggestionActivity.class.getName())) {









            return ZenOnboardingActivity.isSuggestionComplete(context);









        }









        return false;









    }
































src/com/android/settings/notification/zen/ZenModeBackend.java



+0
−3






























Original line number
Diff line number
Diff line







@@ -172,9 +172,6 @@ public class ZenModeBackend {







    }



















    protected void saveVisualEffectsPolicy(int category, boolean suppress) {









        Settings.Secure.putInt(mContext.getContentResolver(),









                Settings.Secure.ZEN_SETTINGS_UPDATED, 1);



















        int suppressedEffects = getNewSuppressedEffects(suppress, category);









        savePolicy(mPolicy.priorityCategories, mPolicy.priorityCallSenders,









                mPolicy.priorityMessageSenders, suppressedEffects,