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

Settings: Enable "ok" dialog button for no-op changes to existing zen rules.

Browse Source 
Bug: 21307309
Change-Id: Ic7a9cc124e26340e93a08da45c9f1a0043beee76
This commit is contained in:
John Spurlock
2015-06-04 10:44:45 -04:00
parent d9e92ea551
commit c5bab237f5
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/notification/ZenRuleNameDialog.java
View File

@@ -48,6 +48,7 @@ public abstract class ZenRuleNameDialog {
private final AlertDialog mDialog; private final AlertDialog mDialog;
private final EditText mEditText; private final EditText mEditText;
private final RadioGroup mTypes; private final RadioGroup mTypes;
private final String mOriginalRuleName;
private final ArraySet<String> mExistingNames; private final ArraySet<String> mExistingNames;
private final ServiceListing mServiceListing; private final ServiceListing mServiceListing;
private final RuleInfo[] mExternalRules = new RuleInfo[3]; private final RuleInfo[] mExternalRules = new RuleInfo[3];
@@ -57,6 +58,7 @@ public abstract class ZenRuleNameDialog {
ArraySet<String> existingNames) { ArraySet<String> existingNames) {
mServiceListing = serviceListing; mServiceListing = serviceListing;
mIsNew = ruleName == null; mIsNew = ruleName == null;
mOriginalRuleName = ruleName;
final View v = LayoutInflater.from(context).inflate(R.layout.zen_rule_name, null, false); final View v = LayoutInflater.from(context).inflate(R.layout.zen_rule_name, null, false);
mEditText = (EditText) v.findViewById(R.id.rule_name); mEditText = (EditText) v.findViewById(R.id.rule_name);
if (!mIsNew) { if (!mIsNew) {
@@ -79,7 +81,12 @@ public abstract class ZenRuleNameDialog {
.setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() { .setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
onOk(trimmedText(), selectedRuleInfo()); final String newName = trimmedText();
if (!mIsNew && mOriginalRuleName != null
&& mOriginalRuleName.equalsIgnoreCase(newName)) {
return; // no change to an existing rule, just dismiss
}
onOk(newName, selectedRuleInfo());
} }
}) })
.setOnDismissListener(new OnDismissListener() { .setOnDismissListener(new OnDismissListener() {
@@ -148,7 +155,8 @@ public abstract class ZenRuleNameDialog {
private void updatePositiveButton() { private void updatePositiveButton() {
final String name = trimmedText(); final String name = trimmedText();
final boolean validName = !TextUtils.isEmpty(name) final boolean validName = !TextUtils.isEmpty(name)
&& !mExistingNames.contains(name.toLowerCase()); && (name.equalsIgnoreCase(mOriginalRuleName)
|| !mExistingNames.contains(name.toLowerCase()));
mDialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(validName); mDialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(validName);
} }