PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE Update zen onboarding

Browse Source 
- Update text
- Update buttons
- Update style

Bug: 79702414
Bug: 78447976
Bug: 79525632
Test: ZenOnboardingActivityTest
Change-Id: Ied476fc920828409993953fba32bf3dae324ea3c
This commit is contained in:
Beverly
2018-05-14 16:45:49 -04:00
parent a924a1e2ae
commit e3a66fc16d
5 changed files with 184 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/com/android/settings/notification/ZenOnboardingActivity.java
View File

@@ -20,12 +20,14 @@ import android.app.Activity;
import android.app.NotificationManager;
import android.app.NotificationManager.Policy;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.provider.Settings;
import android.text.format.DateUtils;
import android.util.Log;
import android.view.View;
import android.widget.RadioButton;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.MetricsLogger;
@@ -39,13 +41,16 @@ public class ZenOnboardingActivity extends Activity {
private static final String TAG = "ZenOnboardingActivity";
@VisibleForTesting
static final String PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME =
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;
View mNewSetting;
View mKeepCurrentSetting;
RadioButton mNewSettingButton;
RadioButton mKeepCurrentSettingButton;
private NotificationManager mNm;
private MetricsLogger mMetrics;
@@ -66,6 +71,34 @@ public class ZenOnboardingActivity extends Activity {
protected void setupUI() {
setContentView(R.layout.zen_onboarding);
mNewSetting = findViewById(R.id.zen_onboarding_new_setting);
mKeepCurrentSetting = findViewById(R.id.zen_onboarding_current_setting);
mNewSettingButton = findViewById(R.id.zen_onboarding_new_setting_button);
mKeepCurrentSettingButton = findViewById(R.id.zen_onboarding_current_setting_button);
View.OnClickListener newSettingClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
mKeepCurrentSettingButton.setChecked(false);
mNewSettingButton.setChecked(true);
}
};
View.OnClickListener currentSettingClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
mKeepCurrentSettingButton.setChecked(true);
mNewSettingButton.setChecked(false);
}
};
mNewSetting.setOnClickListener(newSettingClickListener);
mNewSettingButton.setOnClickListener(newSettingClickListener);
mKeepCurrentSetting.setOnClickListener(currentSettingClickListener);
mKeepCurrentSettingButton.setOnClickListener(currentSettingClickListener);
mKeepCurrentSettingButton.setChecked(true);
mMetrics.visible(MetricsEvent.SETTINGS_ZEN_ONBOARDING);
}
@@ -79,25 +112,27 @@ public class ZenOnboardingActivity extends Activity {
mMetrics = ml;
}
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 launchSettings(View button) {
mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_SETTINGS);
Intent settings = new Intent(Settings.ACTION_ZEN_MODE_SETTINGS);
settings.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivity(settings);
}
public void save(View button) {
mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK);
NotificationManager.Policy policy = mNm.getNotificationPolicy();
NotificationManager.Policy newPolicy = new NotificationManager.Policy(
Policy.PRIORITY_CATEGORY_REPEAT_CALLERS | policy.priorityCategories,
Policy.PRIORITY_SENDERS_STARRED,
policy.priorityMessageSenders,
NotificationManager.Policy.getAllSuppressedVisualEffects());
mNm.setNotificationPolicy(newPolicy);
if (mNewSettingButton.isChecked()) {
NotificationManager.Policy newPolicy = new NotificationManager.Policy(
Policy.PRIORITY_CATEGORY_REPEAT_CALLERS | policy.priorityCategories,
Policy.PRIORITY_SENDERS_STARRED,
policy.priorityMessageSenders,
NotificationManager.Policy.getAllSuppressedVisualEffects());
mNm.setNotificationPolicy(newPolicy);
mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK);
} else {
mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_KEEP_CURRENT_SETTINGS);
}
Settings.Global.putInt(getApplicationContext().getContentResolver(),
Settings.Global.ZEN_SETTINGS_UPDATED, 1);
@@ -143,11 +178,11 @@ public class ZenOnboardingActivity extends Activity {
final long currentTimeMs = System.currentTimeMillis();
final long firstDisplayTimeMs;
if (!prefs.contains(PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME)) {
if (!prefs.contains(PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME)) {
firstDisplayTimeMs = currentTimeMs;
prefs.edit().putLong(PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME, currentTimeMs).commit();
prefs.edit().putLong(PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME, currentTimeMs).commit();
} else {
firstDisplayTimeMs = prefs.getLong(PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME, -1);
firstDisplayTimeMs = prefs.getLong(PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME, -1);
}
final long showTimeMs = firstDisplayTimeMs + ALWAYS_SHOW_THRESHOLD;