commit 852cdeabfd6ef71f8276f9a1967609074991198a
author Pierre-Laurent Coirier <plcoirier@google.com> Thu Aug 24 12:04:06 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 24 12:04:06 2017 +0000
tree 722f719b1ccf27ee71f853a9e2d503c6f4d3bf23
parent 0c1c11253f5d9d57cf204bbc354c9409b8d0bdc7
parent 3a91a9a454af37991cf1eda77369886328c00d3e

Merge "Scroll to bottom of screen when adding preferences via code" into oc-dev

tests/tests/preference2/src/android/preference2/cts/PreferenceRecycleTest.java

diff --git a/tests/tests/preference2/src/android/preference2/cts/PreferenceRecycleTest.java b/tests/tests/preference2/src/android/preference2/cts/PreferenceRecycleTest.java
index 9d0242d..598780ce 100644
--- a/tests/tests/preference2/src/android/preference2/cts/PreferenceRecycleTest.java
+++ b/tests/tests/preference2/src/android/preference2/cts/PreferenceRecycleTest.java
@@ -127,6 +127,12 @@
             screen.addPreference(noRecyclePref);
         });
 
+        // Select the last item in the list to make sure the newly added prefs is actually
+        // displayed even on small screen like watches.
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.getListView().setSelection(mActivity.getListView().getCount() - 1);
+        });
+
         // Grab the preferences we just created on the Ui thread.
         RecycleCheckPreference recyclePref =
                 (RecycleCheckPreference)screen.findPreference("recyclePref");