diff options
3 files changed, 6 insertions, 2 deletions
diff --git a/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml b/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml index 0ad7f5f6dfa5..3d011bc00f9f 100644 --- a/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml +++ b/packages/CompanionDeviceManager/res/layout/activity_confirmation.xml @@ -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 diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java index dd77c6153726..b2c1e604db7e 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java @@ -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); } diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceListAdapter.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceListAdapter.java index d8348d1c9218..8f12cb4f99e6 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceListAdapter.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceListAdapter.java @@ -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 { |