Add DND Settings suggestion
Cherry-picked from pi-dev ag/4019736 Test: SettingsSuggestionsTest, ZenOnboardingActivityTest Change-Id: Ie78c9cf8287ee56bc4596efe20d27f8eb432ab6c Bug: 78445134
This commit is contained in:
@@ -19,17 +19,34 @@ package com.android.settings.notification;
|
||||
import android.app.Activity;
|
||||
import android.app.NotificationManager;
|
||||
import android.app.NotificationManager.Policy;
|
||||
import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
import android.os.Bundle;
|
||||
import android.provider.Settings;
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import android.text.format.DateUtils;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
|
||||
public class ZenOnboardingActivity extends Activity {
|
||||
|
||||
private static final String TAG = "ZenOnboardingActivity";
|
||||
|
||||
@VisibleForTesting
|
||||
static final String PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME =
|
||||
"pref_zen_suggestion_first_display_time_ms";
|
||||
@VisibleForTesting
|
||||
static final String PREF_KEY_SUGGESTION_VIEWED = "pref_zen_suggestion_viewed";
|
||||
@VisibleForTesting
|
||||
static final long ALWAYS_SHOW_THRESHOLD = DateUtils.DAY_IN_MILLIS * 14;
|
||||
|
||||
private NotificationManager mNm;
|
||||
private MetricsLogger mMetrics;
|
||||
|
||||
@@ -39,6 +56,10 @@ public class ZenOnboardingActivity extends Activity {
|
||||
setNotificationManager(getSystemService(NotificationManager.class));
|
||||
setMetricsLogger(new MetricsLogger());
|
||||
|
||||
Context context = getApplicationContext();
|
||||
Settings.Global.putInt(context.getContentResolver(),
|
||||
Settings.Global.ZEN_SETTINGS_SUGGESTION_VIEWED, 1);
|
||||
|
||||
setupUI();
|
||||
}
|
||||
|
||||
@@ -61,20 +82,80 @@ public class ZenOnboardingActivity extends Activity {
|
||||
|
||||
public void close(View button) {
|
||||
mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_KEEP_CURRENT_SETTINGS);
|
||||
|
||||
Settings.Global.putInt(getApplicationContext().getContentResolver(),
|
||||
Settings.Global.ZEN_SETTINGS_UPDATED, 1);
|
||||
|
||||
finishAndRemoveTask();
|
||||
}
|
||||
|
||||
public void save(View button) {
|
||||
mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK);
|
||||
Policy policy = mNm.getNotificationPolicy();
|
||||
NotificationManager.Policy policy = mNm.getNotificationPolicy();
|
||||
|
||||
Policy newPolicy = new NotificationManager.Policy(
|
||||
NotificationManager.Policy newPolicy = new NotificationManager.Policy(
|
||||
Policy.PRIORITY_CATEGORY_REPEAT_CALLERS | policy.priorityCategories,
|
||||
Policy.PRIORITY_SENDERS_STARRED,
|
||||
policy.priorityMessageSenders,
|
||||
Policy.getAllSuppressedVisualEffects());
|
||||
NotificationManager.Policy.getAllSuppressedVisualEffects());
|
||||
mNm.setNotificationPolicy(newPolicy);
|
||||
|
||||
Settings.Global.putInt(getApplicationContext().getContentResolver(),
|
||||
Settings.Global.ZEN_SETTINGS_UPDATED, 1);
|
||||
|
||||
finishAndRemoveTask();
|
||||
}
|
||||
|
||||
public static boolean isSuggestionComplete(Context context) {
|
||||
if (wasZenUpdated(context)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (showSuggestion(context) || withinShowTimeThreshold(context)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private static boolean wasZenUpdated(Context context) {
|
||||
// ZEN_SETTINGS_UPDATED is true for:
|
||||
// - fresh P+ device
|
||||
// - if zen visual effects values were changed by the user in Settings
|
||||
return Settings.Global.getInt(context.getContentResolver(),
|
||||
Settings.Global.ZEN_SETTINGS_UPDATED, 0) != 0;
|
||||
}
|
||||
|
||||
private static boolean showSuggestion(Context context) {
|
||||
// SHOW_ZEN_SETTINGS_SUGGESTION is by default true, but false when:
|
||||
// - user manually turns on dnd
|
||||
|
||||
// SHOW_ZEN_SETTINGS_SUGGESTION is also true when:
|
||||
// - automatic rule has started DND and user has not seen the first use dialog
|
||||
return Settings.Global.getInt(context.getContentResolver(),
|
||||
Settings.Global.SHOW_ZEN_SETTINGS_SUGGESTION, 0) != 0;
|
||||
|
||||
}
|
||||
|
||||
private static boolean withinShowTimeThreshold(Context context) {
|
||||
final SuggestionFeatureProvider featureProvider = FeatureFactory.getFactory(context)
|
||||
.getSuggestionFeatureProvider(context);
|
||||
final SharedPreferences prefs = featureProvider.getSharedPrefs(context);
|
||||
final long currentTimeMs = System.currentTimeMillis();
|
||||
final long firstDisplayTimeMs;
|
||||
|
||||
if (!prefs.contains(PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME)) {
|
||||
firstDisplayTimeMs = currentTimeMs;
|
||||
prefs.edit().putLong(PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME, currentTimeMs).commit();
|
||||
} else {
|
||||
firstDisplayTimeMs = prefs.getLong(PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME, -1);
|
||||
}
|
||||
|
||||
final long showTimeMs = firstDisplayTimeMs + ALWAYS_SHOW_THRESHOLD;
|
||||
final boolean stillShow = currentTimeMs < showTimeMs;
|
||||
|
||||
Log.d(TAG, "still show zen suggestion based on time: " + stillShow + " showTimeMs="
|
||||
+ showTimeMs);
|
||||
return stillShow;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user