| commit | 644c6f70a873fc9a345b2a2689fb3597b371f373 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Fri Dec 04 01:45:35 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Dec 04 01:45:35 2015 +0000 |
| tree | cfc5e1373f85be7e04f2b44b5ab05844062675a2 | |
| parent | 6e79b084078675d3886886a50864b67cce446c52 [diff] | |
| parent | 116b2c2c5430122ad7dfa14470bc640bf3c1c59f [diff] |
Merge "Minor tweak to initial paging state."
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java index cdfad18..53c10b7 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java
@@ -115,8 +115,8 @@ // Recompute some values based on the given state, since we can not rely on the resource // system to get certain values. boolean isLandscape = windowRect.width() > windowRect.height(); - hasTransposedNavBar = isLandscape && isLargeScreen && !isXLargeScreen; - hasTransposedSearchBar = isLandscape && isLargeScreen && !isXLargeScreen; + hasTransposedNavBar = isLandscape && !isXLargeScreen; + hasTransposedSearchBar = isLandscape && !isXLargeScreen; } /**
diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java b/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java index e313fd2..7a98393 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java +++ b/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java
@@ -137,7 +137,7 @@ /** Returns the index of this task in the list of filtered tasks */ int indexOf(Task t) { - if (mTaskIndices.containsKey(t.key)) { + if (t != null && mTaskIndices.containsKey(t.key)) { return mTaskIndices.get(t.key); } return -1;
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java index a9f570e..a0a1bac 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
@@ -521,7 +521,7 @@ public final void onBusEvent(DraggingInRecentsEndedEvent event) { ViewPropertyAnimator animator = animate(); - if (event.velocity > ViewConfiguration.get(getContext()).getScaledMinimumFlingVelocity()) { + if (event.velocity > mFlingAnimationUtils.getMinVelocityPxPerSecond()) { animator.translationY(getHeight()); animator.withEndAction(new Runnable() { @Override