summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author jasonwshsu <jasonwshsu@google.com> 2021-03-23 12:07:33 +0800
committer Jason Hsu <jasonwshsu@google.com> 2021-03-23 06:43:42 +0000
commit5f76adf41b67be268f2362d2082fcc1e386b5b94 (patch)
treed291f148d1f09004bcb6acee9d351e423e8d990e
parent476e44e1f9fbb14254be2c1578cac1cca7abe8e2 (diff)
Avoid static import IntDef value to workaround for Java 8 javac issue
* sysui-stuido will have build error for using @IntDef in Java 8 javac Bug: 152086714 Test: atest AccessibilityTargetAdapterTest Change-Id: I5d877834488803e9209d5929a9f92fd75b14f6f8
-rw-r--r--packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityTargetAdapter.java26
1 files changed, 13 insertions, 13 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityTargetAdapter.java b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityTargetAdapter.java
index b4858f42c25b..fd0c4ef0a5be 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityTargetAdapter.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityTargetAdapter.java
@@ -43,16 +43,16 @@ public class AccessibilityTargetAdapter extends Adapter<ViewHolder> {
private final List<AccessibilityTarget> mTargets;
@IntDef({
- AccessibilityTargetAdapter.FIRST_ITEM,
- AccessibilityTargetAdapter.REGULAR_ITEM,
- AccessibilityTargetAdapter.LAST_ITEM
+ ItemType.FIRST_ITEM,
+ ItemType.REGULAR_ITEM,
+ ItemType.LAST_ITEM
})
@Retention(RetentionPolicy.SOURCE)
- @interface ItemType {}
-
- private static final int FIRST_ITEM = 0;
- private static final int REGULAR_ITEM = 1;
- private static final int LAST_ITEM = 2;
+ @interface ItemType {
+ int FIRST_ITEM = 0;
+ int REGULAR_ITEM = 1;
+ int LAST_ITEM = 2;
+ }
public AccessibilityTargetAdapter(List<AccessibilityTarget> targets) {
mTargets = targets;
@@ -65,11 +65,11 @@ public class AccessibilityTargetAdapter extends Adapter<ViewHolder> {
R.layout.accessibility_floating_menu_item, parent,
/* attachToRoot= */ false);
- if (itemType == FIRST_ITEM) {
+ if (itemType == ItemType.FIRST_ITEM) {
return new TopViewHolder(root);
}
- if (itemType == LAST_ITEM) {
+ if (itemType == ItemType.LAST_ITEM) {
return new BottomViewHolder(root);
}
@@ -87,14 +87,14 @@ public class AccessibilityTargetAdapter extends Adapter<ViewHolder> {
@Override
public int getItemViewType(int position) {
if (position == 0) {
- return FIRST_ITEM;
+ return ItemType.FIRST_ITEM;
}
if (position == (getItemCount() - 1)) {
- return LAST_ITEM;
+ return ItemType.LAST_ITEM;
}
- return REGULAR_ITEM;
+ return ItemType.REGULAR_ITEM;
}
@Override