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

Commit 49499bcb authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Add DND Settings suggestion" into pi-dev

parents a44d07c1 d4e7eedf

AndroidManifest.xml

+21 −1
Original line number Diff line number Diff line
@@ -742,6 +742,27 @@ 
                android:value="true" />

        </activity>



        <activity

            android:name=".notification.ZenSuggestionActivity"

            android:label="@string/zen_mode_settings_title"

            android:icon="@drawable/ic_zen"

            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.ZenOnboardingActivity"

            android:label="@string/zen_onboarding_dnd_visual_disturbances_header"
@@ -755,7 +776,6 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <activity

            android:name="Settings$ZenModeAutomationSettingsActivity"

            android:label="@string/zen_mode_automation_settings_title"

res/drawable/ic_zen.xml

+6 −6
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
        android:width="24dp" >



    <path

        android:fillColor="#FFFFFFFF"

        android:fillColor="?android:attr/colorControlActivated"

        android:pathData="M 12 2 C 6.48 2 2 6.48 2 12 s 4.48 10 10 10 10 -4.48 10 -10 S 17.52 2 12 2 z m 4 11 H 8 c -.55 0 -1 -.45 -1 -1 s .45 -1 1 -1 h 8c.55 0 1 .45 1 1 s -.45 1 -1 1z" />



</vector>

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -9876,6 +9876,12 @@ 
    <!-- Help URI, smart battery page [DO NOT TRANSLATE] -->

    <string name="help_uri_smart_battery_settings" translatable="false"></string>













    <!-- Title label for dnd suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->













    <string name="zen_suggestion_title">Update Do Not Disturb</string>

























    <!-- Summary label for dnd suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->













    <string name="zen_suggestion_summary">Hide notifications to stay focused</string>



























    <!-- Title label for new device suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->















    <string name="new_device_suggestion_title">What\'s new and exciting?</string>







































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



+4
−1




























Original line number
Diff line number
Diff line








@@ -22,7 +22,6 @@ import android.content.Context;













import android.content.SharedPreferences;















import android.service.settings.suggestions.Suggestion;















import android.support.annotation.NonNull;













import android.support.annotation.VisibleForTesting;















import android.util.Log;















import android.util.Pair;

























@@ -32,6 +31,8 @@ import com.android.settings.Settings.NightDisplaySuggestionActivity;













import com.android.settings.display.NightDisplayPreferenceController;















import com.android.settings.fingerprint.FingerprintEnrollSuggestionActivity;















import com.android.settings.fingerprint.FingerprintSuggestionActivity;













import com.android.settings.notification.ZenOnboardingActivity;













import com.android.settings.notification.ZenSuggestionActivity;















import com.android.settings.overlay.FeatureFactory;















import com.android.settings.password.ScreenLockSuggestionActivity;















import com.android.settings.support.NewDeviceIntroSuggestionActivity;










@@ -88,6 +89,8 @@ public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider













            return NightDisplayPreferenceController.isSuggestionComplete(context);















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















            return NewDeviceIntroSuggestionActivity.isSuggestionComplete(context);













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













            return ZenOnboardingActivity.isSuggestionComplete(context);















        }















        return false;















    }

































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



+3
−0




























Original line number
Diff line number
Diff line








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













    }































    protected void saveVisualEffectsPolicy(int category, boolean suppress) {













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













                Settings.Global.ZEN_SETTINGS_UPDATED, 1);





























        int suppressedEffects = getNewSuppressedEffects(suppress, category);















        savePolicy(mPolicy.priorityCategories, mPolicy.priorityCallSenders,















                mPolicy.priorityMessageSenders, suppressedEffects);