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

Commit 9e3fe0c5 authored by Peter_Liang's avatar Peter_Liang
Browse files

Add clickable attribute into list item view version 2. 

Root cause: can't click item to trigger function.
Goal: set clickable to true when legacy type service item is disabled status.

Bug: 148834576
Test: manual test
Change-Id: I4788711e49e507bdc50e3c29681d8461d3f5e1ef
parent 1f0cb0ac

core/java/com/android/internal/app/AccessibilityButtonChooserActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -471,6 +471,7 @@ public class AccessibilityButtonChooserActivity extends Activity { 
            holder.mSwitchItem.setVisibility(View.GONE);

            holder.mItemContainer.setVisibility(isLaunchMenuMode ? View.GONE : View.VISIBLE);

            holder.mItemView.setEnabled(enabledState);

            holder.mItemView.setClickable(!enabledState);

        }



        private void updateInvisibleActionItemVisibility(@NonNull Context context,
@@ -485,6 +486,7 @@ public class AccessibilityButtonChooserActivity extends Activity { 
            holder.mItemContainer.setVisibility((mShortcutMenuMode == ShortcutMenuMode.EDIT)

                    ? View.VISIBLE : View.GONE);

            holder.mItemView.setEnabled(true);

            holder.mItemView.setClickable(false);

        }



        private void updateIntuitiveActionItemVisibility(@NonNull Context context,
@@ -504,6 +506,7 @@ public class AccessibilityButtonChooserActivity extends Activity { 
            holder.mSwitchItem.setChecked(!isEditMenuMode && isServiceEnabled);

            holder.mItemContainer.setVisibility(View.VISIBLE);

            holder.mItemView.setEnabled(true);

            holder.mItemView.setClickable(false);

        }



        private void updateBounceActionItemVisibility(@NonNull Context context,
@@ -518,6 +521,7 @@ public class AccessibilityButtonChooserActivity extends Activity { 
            holder.mSwitchItem.setVisibility(View.GONE);

            holder.mItemContainer.setVisibility(View.VISIBLE);

            holder.mItemView.setEnabled(true);

            holder.mItemView.setClickable(false);

        }

    }

core/res/res/layout/accessibility_button_chooser_item.xml

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:clickable="true"

    android:gravity="center"

    android:paddingStart="16dp"

    android:paddingEnd="16dp"