diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-02-08 18:14:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-08 18:14:50 +0000 |
| commit | 9e99b9ee45ebf0fb0d8e617f8a12c28b890e2ef9 (patch) | |
| tree | 5f5cd34172b211f7138e1499b39628b22141bd9a /core/java/android/widget | |
| parent | 1201ce98dd33c90325c917d699164fa5aade04dc (diff) | |
| parent | 78a20be77acb6595ed112f2a2642ed569f6082b5 (diff) | |
Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate"
am: 78a20be77a
Change-Id: I6f32dc27f70e4c22d25ec6bd2eec715700ebbd89
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/DayPickerViewPager.java | 4 | ||||
| -rw-r--r-- | core/java/android/widget/ListView.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/widget/DayPickerViewPager.java b/core/java/android/widget/DayPickerViewPager.java index 5f0ae29bb96d..07b3c9507cd2 100644 --- a/core/java/android/widget/DayPickerViewPager.java +++ b/core/java/android/widget/DayPickerViewPager.java @@ -25,11 +25,11 @@ import android.view.View; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; -import com.android.internal.util.Predicate; import com.android.internal.widget.PagerAdapter; import com.android.internal.widget.ViewPager; import java.util.ArrayList; +import java.util.function.Predicate; /** * This displays a list of months in a calendar format with selectable days. @@ -143,7 +143,7 @@ class DayPickerViewPager extends ViewPager { @Override protected View findViewByPredicateTraversal(Predicate<View> predicate, View childToSkip) { - if (predicate.apply(this)) { + if (predicate.test(this)) { return this; } diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java index b0f19d7a0b49..2e7f0fd22d3a 100644 --- a/core/java/android/widget/ListView.java +++ b/core/java/android/widget/ListView.java @@ -19,7 +19,6 @@ package android.widget; import com.google.android.collect.Lists; import com.android.internal.R; -import com.android.internal.util.Predicate; import android.annotation.IdRes; import android.annotation.NonNull; @@ -55,6 +54,7 @@ import android.widget.RemoteViews.RemoteView; import java.util.ArrayList; import java.util.List; +import java.util.function.Predicate; /* * Implementation Notes: |