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

Commit e63e8e84 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[CDM][A11y] Fix talkback behavior for CDM device discovery dialog." into main

parents 4514c53a a4cc6311

packages/CompanionDeviceManager/res/layout/activity_confirmation.xml

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ 
                        android:layout_width="match_parent"

                        android:layout_height="match_parent"

                        android:visibility="gone"

                        android:accessibilityLiveRegion="polite"

                        style="@style/TimeoutMessage" />



                    <androidx.recyclerview.widget.RecyclerView

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

+4 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ public class CompanionAssociationActivity extends FragmentActivity implements 
    private void onDiscoveryStateChanged(DiscoveryState newState) {

        switch (newState) {

            case IN_PROGRESS: {

                mTimeoutMessage.setText(null);

                mTimeoutMessage.setVisibility(View.GONE);

                mProgressBar.setIndeterminate(true);

                break;

            }
@@ -351,6 +351,7 @@ public class CompanionAssociationActivity extends FragmentActivity implements 
                        R.string.message_discovery_soft_timeout,

                        deviceType, discoveryType, profile);

                mTimeoutMessage.setText(message);

                mTimeoutMessage.setVisibility(View.VISIBLE);

                break;

            }

            case FINISHED_STOPPED: {
@@ -363,6 +364,7 @@ public class CompanionAssociationActivity extends FragmentActivity implements 
                        }

                    }

                    mTimeoutMessage.setText(getString(R.string.message_discovery_hard_timeout));

                    mTimeoutMessage.setVisibility(View.VISIBLE);

                }

                mProgressBar.setIndeterminate(false);

                break;
@@ -528,6 +530,7 @@ public class CompanionAssociationActivity extends FragmentActivity implements 
        mVendorHeader.setVisibility(View.VISIBLE);

        mProfileIcon.setVisibility(View.GONE);

        mDeviceListRecyclerView.setVisibility(View.GONE);

        mTimeoutMessage.setVisibility(View.GONE);

        mProgressBar.setVisibility(View.GONE);

        mBorderBottom.setVisibility(View.GONE);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ class DeviceListAdapter extends RecyclerView.Adapter<DeviceListAdapter.ViewHolde 


    void setDevices(List<DeviceFilterPair<?>> devices) {

        mDevices = devices;

        notifyDataSetChanged();

        notifyItemRangeInserted(devices.size(), mDevices.size());

    }



    static class ViewHolder extends RecyclerView.ViewHolder {