summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/profiles
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2015-02-18 13:16:11 -0800
committerAdnan Begovic <adnan@cyngn.com>2015-10-26 16:11:14 -0700
commita2f286637a3dd4035014af7081722a50050b4cf6 (patch)
tree5fe5dfcea40f1b7691f1d4e12bd4768e666b907a /src/com/android/settings/profiles
parentb3623e1c2acdeac4500dbe55fb0e1000f78d881c (diff)
downloadpackages_apps_Settings-a2f286637a3dd4035014af7081722a50050b4cf6.zip
packages_apps_Settings-a2f286637a3dd4035014af7081722a50050b4cf6.tar.gz
packages_apps_Settings-a2f286637a3dd4035014af7081722a50050b4cf6.tar.bz2
Settings: fix changing profile triggers not updating actions page
With an already-configured profile, modifying the triggers, and returning to the actions screen does not reflect any updates that may have been made. When returning from the Triggers fragment, reload the profile, and the item list. Change-Id: I784c941d0572a48a0afe1a620f309fcb6f462599 Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'src/com/android/settings/profiles')
-rw-r--r--src/com/android/settings/profiles/SetupActionsFragment.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/settings/profiles/SetupActionsFragment.java b/src/com/android/settings/profiles/SetupActionsFragment.java
index 6eac9a4..d33b9ba 100644
--- a/src/com/android/settings/profiles/SetupActionsFragment.java
+++ b/src/com/android/settings/profiles/SetupActionsFragment.java
@@ -92,6 +92,7 @@ public class SetupActionsFragment extends SettingsPreferenceFragment
implements AdapterView.OnItemClickListener {
private static final int RINGTONE_REQUEST_CODE = 1000;
+ private static final int NEW_TRIGGER_REQUEST_CODE = 1001;
private static final int MENU_REMOVE = Menu.FIRST;
private static final int MENU_FILL_PROFILE = Menu.FIRST + 1;
@@ -529,6 +530,10 @@ public class SetupActionsFragment extends SettingsPreferenceFragment
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
+ if (requestCode == NEW_TRIGGER_REQUEST_CODE) {
+ mProfile = mProfileManager.getProfile(mProfile.getUuid());
+ rebuildItemList();
+ }
}
private void requestRingModeDialog(final RingModeSettings setting) {
@@ -826,6 +831,6 @@ public class SetupActionsFragment extends SettingsPreferenceFragment
SubSettings pa = (SubSettings) getActivity();
pa.startPreferencePanel(SetupTriggersFragment.class.getCanonicalName(), args,
- R.string.profile_profile_manage, null, null, 0);
+ R.string.profile_profile_manage, null, this, NEW_TRIGGER_REQUEST_CODE);
}
}