Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f76adf4 authored by jasonwshsu's avatar jasonwshsu Committed by Jason Hsu
Browse files

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
parent 476e44e1

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/AccessibilityTargetAdapter.java

+13 −13
Original line number Original line Diff line number Diff line
@@ -43,16 +43,16 @@ public class AccessibilityTargetAdapter extends Adapter<ViewHolder> { 
    private final List<AccessibilityTarget> mTargets;

    private final List<AccessibilityTarget> mTargets;





    @IntDef({

    @IntDef({

            AccessibilityTargetAdapter.FIRST_ITEM,

            ItemType.FIRST_ITEM,

            AccessibilityTargetAdapter.REGULAR_ITEM,

            ItemType.REGULAR_ITEM,

            AccessibilityTargetAdapter.LAST_ITEM

            ItemType.LAST_ITEM

    })

    })

    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    @interface ItemType {}

    @interface ItemType {



        int FIRST_ITEM = 0;

    private static final int FIRST_ITEM = 0;

        int REGULAR_ITEM = 1;

    private static final int REGULAR_ITEM = 1;

        int LAST_ITEM = 2;

    private static final int LAST_ITEM = 2;

    }





    public AccessibilityTargetAdapter(List<AccessibilityTarget> targets) {

    public AccessibilityTargetAdapter(List<AccessibilityTarget> targets) {

        mTargets = targets;

        mTargets = targets;
@@ -65,11 +65,11 @@ public class AccessibilityTargetAdapter extends Adapter<ViewHolder> { 
                R.layout.accessibility_floating_menu_item, parent,

                R.layout.accessibility_floating_menu_item, parent,

                /* attachToRoot= */ false);

                /* attachToRoot= */ false);





        if (itemType == FIRST_ITEM) {

        if (itemType == ItemType.FIRST_ITEM) {

            return new TopViewHolder(root);

            return new TopViewHolder(root);

        }

        }





        if (itemType == LAST_ITEM) {

        if (itemType == ItemType.LAST_ITEM) {

            return new BottomViewHolder(root);

            return new BottomViewHolder(root);

        }

        }
@@ -87,14 +87,14 @@ public class AccessibilityTargetAdapter extends Adapter<ViewHolder> { 
    @Override

    @Override

    public int getItemViewType(int position) {

    public int getItemViewType(int position) {

        if (position == 0) {

        if (position == 0) {

            return FIRST_ITEM;

            return ItemType.FIRST_ITEM;

        }

        }





        if (position == (getItemCount() - 1)) {

        if (position == (getItemCount() - 1)) {

            return LAST_ITEM;

            return ItemType.LAST_ITEM;

        }

        }





        return REGULAR_ITEM;

        return ItemType.REGULAR_ITEM;

    }

    }





    @Override

    @Override