From b68b765cbf61cc2aa79940475a11662dd97f3b80 Mon Sep 17 00:00:00 2001
From: Manu Cornet <manucornet@google.com>
Date: Mon, 23 Jan 2017 19:37:53 +0900
Subject: [PATCH] 2D Recents: Keep nav bar hidden from transition thumbnail

Bug: 32101881
Bug: 33752154
Test: Checked (slow motion screencast) transitions on local sw600dp device
Change-Id: Id124f62df1063cf0fa81b5ef4367c047c3f51be3
---
 services/core/java/com/android/server/wm/AppTransition.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java
index 2379374c67216..24f9eb705a3b2 100644
--- a/services/core/java/com/android/server/wm/AppTransition.java
+++ b/services/core/java/com/android/server/wm/AppTransition.java
@@ -1105,8 +1105,10 @@ public class AppTransition implements Dump {
                         // We scale the width and clip to the top/left square
                         float scale = thumbWidth /
                                 (appWidth - contentInsets.left - contentInsets.right);
-                        int unscaledThumbHeight = (int) (thumbHeight / scale);
-                        mTmpFromClipRect.bottom = mTmpFromClipRect.top + unscaledThumbHeight;
+                        if (!mGridLayoutRecentsEnabled) {
+                            int unscaledThumbHeight = (int) (thumbHeight / scale);
+                            mTmpFromClipRect.bottom = mTmpFromClipRect.top + unscaledThumbHeight;
+                        }
 
                         mNextAppTransitionInsets.set(contentInsets);