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

Update zen onboarding ui am: 29ba3601b0

Browse Source 
am: fa6482c4a4

Change-Id: I9010987409185d91ff039657cf2b20aeaefd01ad
This commit is contained in:
Julia Reynolds
2018-05-01 11:05:14 -07:00
committed by android-build-merger
parent d3ff522a0b fa6482c4a4
commit 5c19e7b6b0
6 changed files with 58 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,8 +33,6 @@ public class ZenOnboardingActivity extends Activity {
private NotificationManager mNm;
private MetricsLogger mMetrics;
CheckBox mScreenOn;
CheckBox mScreenOff;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -48,10 +46,6 @@ public class ZenOnboardingActivity extends Activity {
@VisibleForTesting
protected void setupUI() {
setContentView(R.layout.zen_onboarding);
mScreenOn = findViewById(R.id.screen_on_option);
mScreenOff = findViewById(R.id.screen_off_option);
mScreenOn.setChecked(true);
mScreenOff.setChecked(true);
mMetrics.visible(MetricsEvent.SETTINGS_ZEN_ONBOARDING);
}
@@ -66,39 +60,19 @@ public class ZenOnboardingActivity extends Activity {
mMetrics = ml;
}
public void logClick(View view) {
CheckBox checkbox = (CheckBox) view;
switch (checkbox.getId()) {
case R.id.screen_on_option:
mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_SCREEN_ON, checkbox.isChecked());
break;
case R.id.screen_off_option:
mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_SCREEN_OFF,
checkbox.isChecked());
break;
}
}
public void launchSettings(View button) {
mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_SETTINGS);
Intent settings = new Intent(Settings.ZEN_MODE_BLOCKED_EFFECTS_SETTINGS);
settings.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivity(settings);
public void close(View button) {
mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_KEEP_CURRENT_SETTINGS);
finishAndRemoveTask();
}
public void save(View button) {
mMetrics.action(MetricsEvent.ACTION_ZEN_ONBOARDING_OK);
NotificationManager.Policy policy = mNm.getNotificationPolicy();
int currentEffects = policy.suppressedVisualEffects;
currentEffects = NotificationManager.Policy.toggleScreenOnEffectsSuppressed(
currentEffects, mScreenOn != null && mScreenOn.isChecked());
currentEffects = NotificationManager.Policy.toggleScreenOffEffectsSuppressed(
currentEffects, mScreenOff != null && mScreenOff.isChecked());
NotificationManager.Policy newPolicy = new NotificationManager.Policy(
policy.priorityCategories, policy.priorityCallSenders,
policy.priorityMessageSenders, currentEffects);
policy.priorityCategories, NotificationManager.Policy.PRIORITY_SENDERS_STARRED,
policy.priorityMessageSenders,
NotificationManager.Policy.getAllSuppressedVisualEffects());
mNm.setNotificationPolicy(newPolicy);
finishAndRemoveTask();