commit 8fceeed5bc768e9579b80b9ae557ab764fb5c76b
author Priyank Singh <priyanksingh@google.com> Wed Oct 02 13:54:09 2019 -0700
committer Igor Razumeiko <igorr@google.com> Thu Oct 03 17:19:19 2019 +0000
tree 33ade930450a0dec84eeef77bbae1169564efd30
parent 5a4578fd09c2337720588b6e2a671ae0210469f2

Keep layout param height onGlobalLayout

Changing the height here causes the height to be affected
when the config changes occur. For example when keyboard
is brought up and config changes happens then the height
of PRV is affected.

Bug: 141886958
Test: Manual, robolectric

Change-Id: Iebe51534df87ac2738209fc6cbff72ad1a1cd5b1

car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java

diff --git a/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java b/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java
index 1091b90..b816f64 100644
--- a/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java
+++ b/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java
@@ -28,7 +28,6 @@
 import android.util.SparseArray;
 import android.view.ContextThemeWrapper;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 
 import androidx.annotation.IntDef;
@@ -391,10 +390,6 @@
                                                         mNestedRecyclerView
                                                                 .getViewTreeObserver()
                                                                 .removeOnGlobalLayoutListener(this);
-                                                        ViewGroup.LayoutParams params =
-                                                                getLayoutParams();
-                                                        params.height = getMeasuredHeight();
-                                                        setLayoutParams(params);
                                                         createScrollBarFromConfig();
                                                         if (mInitialTopPadding == 0) {
                                                             mInitialTopPadding = getPaddingTop();
@@ -453,11 +448,11 @@
         return super.getLayoutManager();
     }
 
+    /**
+     * Refer to {@link PagedRecyclerView#getEffectiveLayoutManager()} for usage in applications.
+     */
     @Override
     public LayoutManager getLayoutManager() {
-        if (mScrollBarEnabled) {
-            return mNestedRecyclerView.getLayoutManager();
-        }
         return super.getLayoutManager();
     }