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

Link to the appropriate config activity for dnd rules

Browse Source 
Test: atest, manual
Bug: 111474881
Change-Id: I0c1d7b14abe3cf65762167f3c412fa8f2be1d842
This commit is contained in:
Julia Reynolds
2018-12-14 09:27:53 -05:00
parent 5156d7d4db
commit ec84a9367f
9 changed files with 121 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/utils/ManagedServiceSettings.java
View File

@@ -240,9 +240,11 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {
public final int warningDialogTitle;
public final int warningDialogSummary;
public final int emptyText;
public final String configIntentAction;
private Config(String tag, String setting, String intentAction, String permission,
String noun, int warningDialogTitle, int warningDialogSummary, int emptyText) {
private Config(String tag, String setting, String intentAction, String configIntentAction,
String permission, String noun, int warningDialogTitle, int warningDialogSummary,
int emptyText) {
this.tag = tag;
this.setting = setting;
this.intentAction = intentAction;
@@ -251,6 +253,7 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {
this.warningDialogTitle = warningDialogTitle;
this.warningDialogSummary = warningDialogSummary;
this.emptyText = emptyText;
this.configIntentAction = configIntentAction;
}
public static class Builder{
@@ -262,6 +265,7 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {
private int mWarningDialogTitle;
private int mWarningDialogSummary;
private int mEmptyText;
private String mConfigIntentAction;
public Builder setTag(String tag) {
mTag = tag;
@@ -278,6 +282,11 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {
return this;
}
public Builder setConfigurationIntentAction(String action) {
mConfigIntentAction = action;
return this;
}
public Builder setPermission(String permission) {
mPermission = permission;
return this;
@@ -304,8 +313,8 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {
}
public Config build() {
return new Config(mTag, mSetting, mIntentAction, mPermission, mNoun,
mWarningDialogTitle, mWarningDialogSummary, mEmptyText);
return new Config(mTag, mSetting, mIntentAction, mConfigIntentAction, mPermission,
mNoun, mWarningDialogTitle, mWarningDialogSummary, mEmptyText);
}
}
}