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

Commit fa77f60e authored by Evan Chen's avatar Evan Chen Committed by Automerger Merge Worker
Browse files

Merge "Do not annouce Collapse/Expand if there are less or equal to 2... 

Merge "Do not annouce Collapse/Expand if there are less or equal to 2 permissions in the list" into udc-dev am: 0bd4117a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22973017



Change-Id: Iee553bca174cf52ce88cf57444c7009ddf69f967
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 73c5e080 0bd4117a

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/PermissionListAdapter.java

+2 −3
Original line number Diff line number Diff line
@@ -123,12 +123,11 @@ class PermissionListAdapter extends RecyclerView.Adapter<PermissionListAdapter.V 
            viewHolder.mExpandButton.setTag(R.drawable.btn_expand_more);

        }



        setAccessibility(view, viewType,

                AccessibilityNodeInfo.ACTION_CLICK, R.string.permission_expand, 0);



        // Add expand buttons if the permissions are more than PERMISSION_SIZE in this list also

        // make the summary invisible by default.

        if (mPermissions.size() > PERMISSION_SIZE) {

            setAccessibility(view, viewType,

                    AccessibilityNodeInfo.ACTION_CLICK, R.string.permission_expand, 0);



            viewHolder.mPermissionSummary.setVisibility(View.GONE);