am 7109aad6: Merge "Fix issue where recents would not show up sometimes" into jb-mr1-dev (6b045d3a) · Commits · e / os / android_frameworks_base

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

+11 −2

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import com.android.systemui.statusbar.tablet.StatusBarPanel;
		public class RecentsActivity extends Activity {
		public static final String TOGGLE_RECENTS_INTENT = "com.android.systemui.TOGGLE_RECENTS";
		public static final String CLOSE_RECENTS_INTENT = "com.android.systemui.CLOSE_RECENTS";
		private static final String WAS_SHOWING = "was_showing";

		private RecentsPanelView mRecentsPanel;
		private IntentFilter mIntentFilter;
		@@ -139,13 +140,21 @@ public class RecentsActivity extends Activity {
		mRecentsPanel.setMinSwipeAlpha(
		getResources().getInteger(R.integer.config_recent_item_min_alpha) / 100f);

		if (savedInstanceState == null \|\|
		savedInstanceState.getBoolean(WAS_SHOWING)) {
		handleIntent(getIntent());
		}
		mIntentFilter = new IntentFilter();
		mIntentFilter.addAction(CLOSE_RECENTS_INTENT);
		registerReceiver(mIntentReceiver, mIntentFilter);
		super.onCreate(savedInstanceState);
		}

		@Override
		protected void onSaveInstanceState(Bundle outState) {
		outState.putBoolean(WAS_SHOWING, mRecentsPanel.isShowing());
		}

		@Override
		protected void onDestroy() {
		final SystemUIApplication app = (SystemUIApplication) getApplication();
		@@ -165,7 +174,7 @@ public class RecentsActivity extends Activity {

		if (TOGGLE_RECENTS_INTENT.equals(intent.getAction())) {
		if (mRecentsPanel != null) {
		if (mRecentsPanel.isShowing() && mForeground) {
		if (mRecentsPanel.isShowing()) {
		dismissAndGoBack();
		} else {
		final SystemUIApplication app = (SystemUIApplication) getApplication();