Merge "Dark-greylists fill() methods in ListView and GridView" (16052222) · Commits · e / os / android_frameworks_base

core/java/android/widget/GridView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -312,7 +312,7 @@ public class GridView extends AbsListView {
		* @return The view that is currently selected, if it happens to be in the
		* range that we draw.
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		private View fillDown(int pos, int nextTop) {
		View selectedView = null;

		@@ -412,7 +412,7 @@ public class GridView extends AbsListView {
		*
		* @return The view that is currently selected
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		private View fillUp(int pos, int nextBottom) {
		View selectedView = null;

+3 −3

Original line number	Diff line number	Diff line
		@@ -782,7 +782,7 @@ public class ListView extends AbsListView {
		* @return The view that is currently selected, if it happens to be in the
		* range that we draw.
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		private View fillDown(int pos, int nextTop) {
		View selectedView = null;

		@@ -817,7 +817,7 @@ public class ListView extends AbsListView {
		*
		* @return The view that is currently selected
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		private View fillUp(int pos, int nextBottom) {
		View selectedView = null;

		@@ -1490,7 +1490,7 @@ public class ListView extends AbsListView {
		* @return The selected view, or null if the selected view is outside the
		* visible area.
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		private View fillSpecific(int position, int top) {
		boolean tempIsSelected = position == mSelectedPosition;
		View temp = makeAndAddView(position, top, true, mListPadding.left, tempIsSelected);