PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2

Browse Source 
PreferenceGroup in a controller is not in a RecyclerView,
TalkBack loses focus after PreferenceGroup#removeAll.

To fix it, only add/remove the preference if it's necessary.

Bug: 153278854
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SavedAccessPointsPreferenceController2Test
Change-Id: Ie9ad5481c33865dce2b7db04d0f969b1f49b80e1
This commit is contained in:
Arc Wang
2020-04-08 11:19:37 +08:00
parent 68084f39d0
commit 067757f8d9
2 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsPreferenceController2Test.java
View File

@@ -103,4 +103,20 @@ public class SavedAccessPointsPreferenceController2Test {
assertThat(prefs.size()).isEqualTo(1);
assertThat(prefs.get(0).getTitle()).isEqualTo(title);
}
@Test
public void displayPreference_noAccessPoint_shouldRemoveIt() {
final String title = "ssid_title";
final String key = "key";
final WifiEntry mockWifiEntry = mock(WifiEntry.class);
when(mockWifiEntry.getTitle()).thenReturn(title);
when(mockWifiEntry.getKey()).thenReturn(key);
final WifiEntryPreference preference = new WifiEntryPreference(mContext, mockWifiEntry);
preference.setKey(key);
mPreferenceCategory.addPreference(preference);
mController.displayPreference(mPreferenceScreen, new ArrayList<>());
assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(0);
}
}