commit 1a45e4fafd1d31b020477400ef83107489d332c9
author Heemin Seog <hseog@google.com> Tue Jun 18 15:40:22 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 18 15:40:22 2019 -0700
tree 99a575c0fd9edee70ec412d7510d9e5a528ad339
parent 5763e7670e35a3fd0fcf23ad7f318365c64f42c9
parent 659fdb7328c92c5826ec66905f9a3ec79b79ccbd

Merge "Make sure the last item is visible" into pi-car-dev am: 93792f6464
am: 659fdb7328

Change-Id: Id6037f8c29e9eafaf088b09e13601c9145227b7e

src/com/android/car/settings/system/MasterClearFragment.java

diff --git a/src/com/android/car/settings/system/MasterClearFragment.java b/src/com/android/car/settings/system/MasterClearFragment.java
index bba9eae..db246f4 100644
--- a/src/com/android/car/settings/system/MasterClearFragment.java
+++ b/src/com/android/car/settings/system/MasterClearFragment.java
@@ -30,6 +30,7 @@
 import androidx.annotation.XmlRes;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.android.car.apps.common.widget.PagedRecyclerView;
 import com.android.car.settings.R;
 import com.android.car.settings.common.ActivityResultCallback;
 import com.android.car.settings.common.SettingsFragment;
@@ -69,12 +70,16 @@
                         CHECK_LOCK_REQUEST_CODE, /* callback= */ this));
         masterClearButton.setEnabled(false);
 
-        masterClearButton.getViewTreeObserver().addOnGlobalLayoutListener(
+        getListView().getViewTreeObserver().addOnGlobalLayoutListener(
                 new ViewTreeObserver.OnGlobalLayoutListener() {
                     @Override
                     public void onGlobalLayout() {
-                        masterClearButton.setEnabled(isAtEnd());
-                        masterClearButton.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                        PagedRecyclerView pagedRecyclerView = (PagedRecyclerView) getListView();
+                        if (pagedRecyclerView.fullyInitialized()) {
+                            masterClearButton.setEnabled(isAtEnd());
+                            masterClearButton.getViewTreeObserver().removeOnGlobalLayoutListener(
+                                    this);
+                        }
                     }
                 });
         getListView().setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> {