commit 30e83c087c23a762be69c595d88d4c189a9f8bbe
author Daniel Xie <dxie@google.com> Wed Jul 15 18:20:57 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 15 18:20:57 2015 +0000
tree 1e30925e087a8ddb672bdddee8d02933c2d57082
parent e167a31376e0c0eb4334af00689204e59c06e463
parent ca0d846b1d8e5a077c93d4cf4d85a07217f9eabd

Merge "Fix bugs regarding AdapterView layout size with large font scale in AdapterViewTest" into jb-mr1.1-cts-dev
automerge: ca0d846

* commit 'ca0d846b1d8e5a077c93d4cf4d85a07217f9eabd':
  Fix bugs regarding AdapterView layout size with large font scale in AdapterViewTest

tests/tests/widget/src/android/widget/cts/AdapterViewTest.java

diff --git a/tests/tests/widget/src/android/widget/cts/AdapterViewTest.java b/tests/tests/widget/src/android/widget/cts/AdapterViewTest.java
index b91ca73..50b53a0 100755
--- a/tests/tests/widget/src/android/widget/cts/AdapterViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AdapterViewTest.java
@@ -37,6 +37,7 @@
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemLongClickListener;
 import android.widget.AdapterView.OnItemSelectedListener;
+import android.provider.Settings;
 
 import com.android.cts.stub.R;
 
@@ -211,8 +212,12 @@
         setArrayAdapter(mAdapterView);
 
         // LastVisiblePosition should be adapter's getCount - 1,by mocking method
+        float fontScale = Settings.System.getFloat(mActivity.getContentResolver(), Settings.System.FONT_SCALE, 1);
+        if (fontScale < 1) {
+            fontScale = 1;
+        }
         float density = mActivity.getResources().getDisplayMetrics().density;
-        int bottom = (int) (LAYOUT_HEIGHT * density);
+        int bottom = (int) (LAYOUT_HEIGHT * density * fontScale);
         mAdapterView.layout(0, 0, LAYOUT_WIDTH, bottom);
         assertEquals(FRUIT.length - 1, mAdapterView.getLastVisiblePosition());
     }