Merge "Add clickable attribute into list item view version 2." (9027588e) · Commits · e / os / android_frameworks_base

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);
		}
		}

+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"