commit 817e9e6fdd5603250ea7aca1c1cbd73859350dcc
author Walter Jang <wjang@google.com> Wed Nov 02 22:05:30 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 02 22:05:31 2016 +0000
tree 5db97910e7d7c43d7cdcd2943fa7f3b58a044798
parent d0b2132f331fef85a06c441f3ed3a70c71fe4ff6
parent 80fc409de2cd035f3982e5a421ab09a5254d35bc

Merge "Force children to layout after listview layout." into ub-contactsdialer-h-dev

src/com/android/contacts/common/list/AutoScrollListView.java

diff --git a/src/com/android/contacts/common/list/AutoScrollListView.java b/src/com/android/contacts/common/list/AutoScrollListView.java
index ae7ca17..d0070b5 100644
--- a/src/com/android/contacts/common/list/AutoScrollListView.java
+++ b/src/com/android/contacts/common/list/AutoScrollListView.java
@@ -17,6 +17,7 @@
 package com.android.contacts.common.list;
 
 import android.content.Context;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.widget.ListView;
 
@@ -114,4 +115,15 @@
             smoothScrollToPositionFromTop(position, offset);
         }
     }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        super.onLayout(changed, l, t, r, b);
+
+        // Workaround for b/31160338.
+        if (android.os.Build.VERSION.SDK_INT == Build.VERSION_CODES.N
+            || android.os.Build.VERSION.SDK_INT == Build.VERSION_CODES.N_MR1) {
+            layoutChildren();
+        }
+    }
 }