Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Tweak Modes layouts and use updated strings to match mocks"

Browse Source 
This reverts commit 0359aaeb47.

Reason for revert: <Potential culprit for b/356564046  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>

Change-Id: I980838773078d822d20608e5975a26cf8dbed2be
This commit is contained in:
ELIYAZ MOMIN
2024-07-31 14:56:30 +00:00
committed by Android (Google) Code Review
parent 0359aaeb47
commit 9804955ad5
11 changed files with 68 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/notification/modes/ZenModeButtonPreferenceController.java
View File

@@ -84,9 +84,9 @@ class ZenModeButtonPreferenceController extends AbstractZenModePreferenceControl
}
});
if (zenMode.isActive()) {
mZenButton.setText(R.string.zen_mode_action_deactivate);
mZenButton.setText(R.string.zen_mode_button_turn_off);
} else {
mZenButton.setText(R.string.zen_mode_action_activate);
mZenButton.setText(R.string.zen_mode_button_turn_on);
}
}
}

2
src/com/android/settings/notification/modes/ZenModeFragmentBase.java
View File

@@ -131,7 +131,7 @@ abstract class ZenModeFragmentBase extends ZenModesFragmentBase {
}
private void toastAndFinish() {
Toast.makeText(mContext, R.string.zen_mode_not_found_text, Toast.LENGTH_SHORT)
Toast.makeText(mContext, R.string.zen_mode_rule_not_found_text, Toast.LENGTH_SHORT)
.show();
this.finish();
}

16
src/com/android/settings/notification/modes/ZenModeScheduleChooserDialog.java
View File

@@ -50,16 +50,15 @@ public class ZenModeScheduleChooserDialog extends InstrumentedDialogFragment {
static final int OPTION_TIME = 0;
static final int OPTION_CALENDAR = 1;
private record ScheduleOption(@StringRes int nameResId,
@Nullable @StringRes Integer exampleResId,
@DrawableRes int iconResId) { }
private record ScheduleOption(@StringRes int nameResId, @StringRes int exampleResId,
@DrawableRes int iconResId) {}
private static final ImmutableList<ScheduleOption> SCHEDULE_OPTIONS = ImmutableList.of(
new ScheduleOption(R.string.zen_mode_select_schedule_time,
R.string.zen_mode_select_schedule_time_example,
com.android.internal.R.drawable.ic_zen_mode_type_schedule_time),
new ScheduleOption(R.string.zen_mode_select_schedule_calendar,
null,
R.string.zen_mode_select_schedule_calendar_example,
com.android.internal.R.drawable.ic_zen_mode_type_schedule_calendar));
private OnScheduleOptionListener mOptionListener;
@@ -86,7 +85,7 @@ public class ZenModeScheduleChooserDialog extends InstrumentedDialogFragment {
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
checkState(getContext() != null);
return new AlertDialog.Builder(getContext())
.setTitle(R.string.zen_mode_select_schedule_title)
.setTitle(R.string.zen_mode_choose_rule_type)
.setAdapter(new OptionsAdapter(getContext()),
(dialog, which) -> onScheduleTypeSelected(which))
.setNegativeButton(R.string.cancel, null)
@@ -116,12 +115,7 @@ public class ZenModeScheduleChooserDialog extends InstrumentedDialogFragment {
ScheduleOption option = checkNotNull(getItem(position));
imageView.setImageResource(option.iconResId());
title.setText(option.nameResId());
if (option.exampleResId() != null) {
subtitle.setVisibility(View.VISIBLE);
subtitle.setText(option.exampleResId());
} else {
subtitle.setVisibility(View.GONE);
}
subtitle.setText(option.exampleResId());
return convertView;
}

9
src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceController.java
View File

@@ -53,8 +53,6 @@ class ZenModeTriggerUpdatePreferenceController extends AbstractZenModePreference
private final ConfigurationActivityHelper mConfigurationActivityHelper;
private final ZenServiceListing mServiceListing;
private String mModeName;
ZenModeTriggerUpdatePreferenceController(Context context, String key,
ZenModesBackend backend) {
this(context, key, backend, context.getPackageManager(),
@@ -84,7 +82,6 @@ class ZenModeTriggerUpdatePreferenceController extends AbstractZenModePreference
return;
}
mModeName = zenMode.getName();
PrimarySwitchPreference triggerPref = (PrimarySwitchPreference) preference;
triggerPref.setChecked(zenMode.getRule().isEnabled());
triggerPref.setOnPreferenceChangeListener(mSwitchChangeListener);
@@ -192,15 +189,15 @@ class ZenModeTriggerUpdatePreferenceController extends AbstractZenModePreference
};
private void confirmChangeEnabled(Preference preference, boolean enabled) {
@StringRes int titleFormat = enabled ? R.string.zen_mode_confirm_enable_mode_title
: R.string.zen_mode_confirm_disable_mode_title;
@StringRes int title = enabled ? R.string.zen_mode_confirm_enable_title
: R.string.zen_mode_confirm_disable_title;
@StringRes int message = enabled ? R.string.zen_mode_confirm_enable_message
: R.string.zen_mode_confirm_disable_message;
@StringRes int confirmButton = enabled ? R.string.zen_mode_action_enable
: R.string.zen_mode_action_disable;
new AlertDialog.Builder(mContext)
.setTitle(mContext.getString(titleFormat, mModeName))
.setTitle(title)
.setMessage(message)
.setPositiveButton(confirmButton,
(dialog, which) -> setModeEnabled(enabled))