Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41004091 authored by Winson Chung's avatar Winson Chung Committed by Android Git Automerger
Browse files

am 537dde12: Merge "Listening for widget changes while Recents is in the... 

am 537dde12: Merge "Listening for widget changes while Recents is in the background. (Bug 17153663)" into lmp-dev

* commit '537dde12838358aed704ae1afe0d66e4cb8cb045':
  Listening for widget changes while Recents is in the background. (Bug 17153663)
parents fde151ef 3133616d

packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java

+21 −21
Original line number Diff line number Diff line
@@ -405,6 +405,22 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView 
            mConfig.updateOnConfigurationChange();

            onConfigurationChange();

        }



        // Start listening for widget package changes if there is one bound, post it since we don't

        // want it stalling the startup

        if (mConfig.searchBarAppWidgetId >= 0) {

            final WeakReference<RecentsAppWidgetHost.RecentsAppWidgetHostCallbacks> callback =

                    new WeakReference<RecentsAppWidgetHost.RecentsAppWidgetHostCallbacks>(this);

            mRecentsView.post(new Runnable() {

                @Override

                public void run() {

                    RecentsAppWidgetHost.RecentsAppWidgetHostCallbacks cb = callback.get();

                    if (cb != null) {

                        mAppWidgetHost.startListening(cb);

                    }

                }

            });

        }

    }



    /** Inflates the debug overlay if debug mode is enabled. */
@@ -464,22 +480,6 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView 
    protected void onResume() {

        super.onResume();



        // Start listening for widget package changes if there is one bound, post it since we don't

        // want it stalling the startup

        if (mConfig.searchBarAppWidgetId >= 0) {

            final WeakReference<RecentsAppWidgetHost.RecentsAppWidgetHostCallbacks> callback =

                    new WeakReference<RecentsAppWidgetHost.RecentsAppWidgetHostCallbacks>(this);

            mRecentsView.postDelayed(new Runnable() {

                @Override

                public void run() {

                    RecentsAppWidgetHost.RecentsAppWidgetHostCallbacks cb = callback.get();

                    if (cb != null) {

                        mAppWidgetHost.startListening(cb);

                    }

                }

            }, 1);

        }



        // Mark Recents as visible

        mVisible = true;

    }
@@ -496,11 +496,6 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView 


        // Unregister any broadcast receivers for the task loader

        RecentsTaskLoader.getInstance().unregisterReceivers();



        // Stop listening for widget package changes if there was one bound

        if (mAppWidgetHost.isListening()) {

            mAppWidgetHost.stopListening();

        }

    }



    @Override
@@ -509,6 +504,11 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView 


        // Unregister the system broadcast receivers

        unregisterReceiver(mSystemBroadcastReceiver);



        // Stop listening for widget package changes if there was one bound

        if (mAppWidgetHost.isListening()) {

            mAppWidgetHost.stopListening();

        }

    }



    @Override