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

Merge "Don\'t save a rule without a name." into nyc-dev am: 257355afde

Browse Source 
am: 8db5a1313f

* commit '8db5a1313feb404295713a1f19758bb8eaaea721':
  Don't save a rule without a name.

Change-Id: I6014fc170e8b227fba9dca41a78a7a1c260029ec
This commit is contained in:
Julia Reynolds
2016-04-21 12:48:40 +00:00
committed by android-build-merger
parent 9145064fbd 8db5a1313f
commit 08fccc5cdd
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ package com.android.settings.notification;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
@@ -51,6 +52,9 @@ public abstract class ZenRuleNameDialog {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
final String newName = trimmedText(); final String newName = trimmedText();
if (TextUtils.isEmpty(newName)) {
return;
}
if (!mIsNew && mOriginalRuleName != null if (!mIsNew && mOriginalRuleName != null
&& mOriginalRuleName.equals(newName)) { && mOriginalRuleName.equals(newName)) {
return; // no change to an existing rule, just dismiss return; // no change to an existing rule, just dismiss