Settings : Rebuild app list after reset

If the user resets app states, we need to rebuild the list
so the new app info is fetched

FEIJ-706
FEIJ-511

Change-Id: I5d6261d38dc2f06e37b29e6b7ba1f7a1e49a6ab8

2 files changed, 16 insertions, 3 deletions

diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 42399ae..668f381 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -87,7 +87,8 @@ import java.util.Comparator;
  * intent.
  */
 public class ManageApplications extends InstrumentedFragment
-        implements OnItemClickListener, OnItemSelectedListener {
+        implements OnItemClickListener, OnItemSelectedListener,
+        ResetAppsHelper.ResetCompletedCallback {
 
     static final String TAG = "ManageApplications";
     static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
@@ -276,7 +277,7 @@ public class ManageApplications extends InstrumentedFragment
 
         mInvalidSizeStr = getActivity().getText(R.string.invalid_size_value);
 
-        mResetAppsHelper = new ResetAppsHelper(getActivity());
+        mResetAppsHelper = new ResetAppsHelper(getActivity(), this);
     }
 
 
@@ -618,6 +619,11 @@ public class ManageApplications extends InstrumentedFragment
         mFilterAdapter.setFilterEnabled(FILTER_APPS_DISABLED, hasDisabledApps);
     }
 
+    @Override
+    public void onResetCompleted() {
+        mApplications.mExtraInfoBridge.onPackageListChanged();
+    }
+
     static class FilterSpinnerAdapter extends ArrayAdapter<CharSequence> {
 
         private final ManageApplications mManageApplications;
diff --git a/src/com/android/settings/applications/ResetAppsHelper.java b/src/com/android/settings/applications/ResetAppsHelper.java
index ad2ea02..2d0f671 100644
--- a/src/com/android/settings/applications/ResetAppsHelper.java
+++ b/src/com/android/settings/applications/ResetAppsHelper.java
@@ -49,10 +49,11 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,
     private final NetworkPolicyManager mNpm;
     private final AppOpsManager mAom;
     private final Context mContext;
+    private final ResetCompletedCallback mResetCompletedCallback;
 
     private AlertDialog mResetDialog;
 
-    public ResetAppsHelper(Context context) {
+    public ResetAppsHelper(Context context, ResetCompletedCallback callback) {
         mContext = context;
         mPm = context.getPackageManager();
         mIPm = IPackageManager.Stub.asInterface(ServiceManager.getService("package"));
@@ -60,6 +61,7 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,
                 ServiceManager.getService(Context.NOTIFICATION_SERVICE));
         mNpm = NetworkPolicyManager.from(context);
         mAom = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+        mResetCompletedCallback = callback;
     }
 
     public void onRestoreInstanceState(Bundle savedInstanceState) {
@@ -139,7 +141,12 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,
                         mNpm.setUidPolicy(uid, POLICY_NONE);
                     }
                 }
+                mResetCompletedCallback.onResetCompleted();
             }
         });
     }
+
+    public interface ResetCompletedCallback {
+        public void onResetCompleted();
+    }
 }