From 0675f66f1b40be99066ba11e5c4bdca3c0efa74d Mon Sep 17 00:00:00 2001 From: cretin45 Date: Wed, 17 Feb 2016 11:57:52 -0800 Subject: SystemUI: Prevent search bar flicker between recents and launcher Issue-id: CYNGNOS-1892 Change-Id: I200ccc319e81762c0485f405279bcc9880f07b71 --- .../src/com/android/systemui/recents/RecentsActivity.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'packages/SystemUI/src') diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java index c5dcd94..f4fe677 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java @@ -217,10 +217,8 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED); mFinishLaunchHomeRunnable = new FinishRecentsRunnable(homeIntent, ActivityOptions.makeCustomAnimation(this, - mConfig.launchedFromSearchHome ? R.anim.recents_to_search_launcher_enter : - R.anim.recents_to_launcher_enter, - mConfig.launchedFromSearchHome ? R.anim.recents_to_search_launcher_exit : - R.anim.recents_to_launcher_exit)); + R.anim.recents_to_search_launcher_enter, + R.anim.recents_to_search_launcher_exit)); // Mark the task that is the launch target int taskStackCount = stacks.size(); @@ -441,6 +439,14 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView } @Override + protected void onResume() { + if (mConfig.searchBarEnabled && mConfig.launchedFromHome) { + overridePendingTransition(0, 0); + } + super.onResume(); + } + + @Override protected void onPause() { super.onPause(); if (mAfterPauseRunnable != null) { -- cgit v1.1