diff options
| author | cretin45 <cretin45@gmail.com> | 2016-02-17 11:57:52 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-02-18 09:58:57 -0800 |
| commit | 0675f66f1b40be99066ba11e5c4bdca3c0efa74d (patch) | |
| tree | bcc7fdc1a3e967637feb209250bfd6d275c9de9b /packages/SystemUI/src | |
| parent | 0d7fd344265cb92d6a459fe9d07af10e6af6fba0 (diff) | |
| download | frameworks_base-0675f66f1b40be99066ba11e5c4bdca3c0efa74d.zip frameworks_base-0675f66f1b40be99066ba11e5c4bdca3c0efa74d.tar.gz frameworks_base-0675f66f1b40be99066ba11e5c4bdca3c0efa74d.tar.bz2 | |
SystemUI: Prevent search bar flicker between recents and launcher
Issue-id: CYNGNOS-1892
Change-Id: I200ccc319e81762c0485f405279bcc9880f07b71
Diffstat (limited to 'packages/SystemUI/src')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java | 14 |
1 files changed, 10 insertions, 4 deletions
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) { |