Merge "Fix flickering before transition animation of app search"

src/com/android/settings/applications/manageapplications/ManageApplications.java

@@ -559,11 +559,18 @@ public class ManageApplications extends InstrumentedFragment
         super.onStart();
         updateView();
         if (mApplications != null) {
-            mApplications.resume(mSortOrder);
             mApplications.updateLoading();
         }
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mApplications != null) {
+            mApplications.resume(mSortOrder);
+        }
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
@@ -582,11 +589,16 @@ public class ManageApplications extends InstrumentedFragment
     }
 
     @Override
-    public void onStop() {
+    public void onPause() {
-        super.onStop();
+        super.onPause();
         if (mApplications != null) {
             mApplications.pause();
         }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
         if (mResetAppsHelper != null) {
             mResetAppsHelper.stop();
         }