summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2019-12-18 16:01:15 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2019-12-18 16:01:15 +0000
commitd7c79c3a2c61f162138632f29be1580d1649cab5 (patch)
treea976a2496cb280d86278a146d8af0269aaa0c3f9
parent86d4d92ac386159e30116875796eeffa3b0e59fd (diff)
parent0416784c2e41d8ac316d4b1f2473cfbd9d0a228e (diff)
Merge "Do not restart activity when pinned set changes - just re-sort." into qt-qpr1-dev am: 0416784c2e
Change-Id: I094be054c2a0be923714cc2cee54a95aced84bf8
-rw-r--r--core/java/com/android/internal/app/ChooserActivity.java11
-rw-r--r--core/java/com/android/internal/app/ResolverTargetActionsDialogFragment.java2
2 files changed, 10 insertions, 3 deletions
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 346361a5120e..fbb9b2092881 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -819,12 +819,19 @@ public class ChooserActivity extends ResolverActivity {
return new PackageMonitor() {
@Override
public void onSomePackagesChanged() {
- mAdapter.handlePackagesChanged();
- bindProfileView();
+ handlePackagesChanged();
}
};
}
+ /**
+ * Update UI to reflect changes in data.
+ */
+ public void handlePackagesChanged() {
+ mAdapter.handlePackagesChanged();
+ bindProfileView();
+ }
+
private void onCopyButtonClicked(View v) {
Intent targetIntent = getTargetIntent();
if (targetIntent == null) {
diff --git a/core/java/com/android/internal/app/ResolverTargetActionsDialogFragment.java b/core/java/com/android/internal/app/ResolverTargetActionsDialogFragment.java
index df91c4a1f88d..aec4bfab373c 100644
--- a/core/java/com/android/internal/app/ResolverTargetActionsDialogFragment.java
+++ b/core/java/com/android/internal/app/ResolverTargetActionsDialogFragment.java
@@ -84,7 +84,7 @@ public class ResolverTargetActionsDialogFragment extends DialogFragment
}
// Force the chooser to requery and resort things
- getActivity().recreate();
+ ((ChooserActivity) getActivity()).handlePackagesChanged();
break;
case APP_INFO_INDEX:
Intent in = new Intent().setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)