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

Merge "Set modified=true when user changes zen rule name"

Browse Source
This commit is contained in:
Beverly Tai
2018-11-05 18:58:39 +00:00
committed by Android (Google) Code Review
parent b9cc394a0e 8228c6ee02
commit 7ebb059ea5
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java
View File

@@ -24,13 +24,10 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig;
import android.text.TextUtils;
import android.util.Slog; import android.util.Slog;
import android.view.View; import android.view.View;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.applications.LayoutPreference; import com.android.settings.applications.LayoutPreference;
@@ -38,6 +35,10 @@ import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.EntityHeaderController; import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
public class ZenAutomaticRuleHeaderPreferenceController extends AbstractZenModePreferenceController public class ZenAutomaticRuleHeaderPreferenceController extends AbstractZenModePreferenceController
implements PreferenceControllerMixin { implements PreferenceControllerMixin {
@@ -128,9 +129,13 @@ public class ZenAutomaticRuleHeaderPreferenceController extends AbstractZenModeP
@Override @Override
public void onOk(String ruleName, Fragment parent) { public void onOk(String ruleName, Fragment parent) {
if (TextUtils.equals(ruleName, mRule.getName())) {
return;
}
mMetricsFeatureProvider.action(mContext, mMetricsFeatureProvider.action(mContext,
MetricsProto.MetricsEvent.ACTION_ZEN_MODE_RULE_NAME_CHANGE_OK); MetricsProto.MetricsEvent.ACTION_ZEN_MODE_RULE_NAME_CHANGE_OK);
mRule.setName(ruleName); mRule.setName(ruleName);
mRule.setModified(true);
mBackend.setZenRule(mId, mRule); mBackend.setZenRule(mId, mRule);
} }
} }