When unifying work profile challenge, keep the device lock
as long as it will still meet password requirement after unification.
If not, prompt the user to set a new device lock and only unify
work challenge after a compliant device lock is set.
Bug: 148630506
Fix: 149682344
Test: make RunSettingsRoboTests
ROBOTEST_FILTER='ChooseLockGenericTest|ChooseLockPasswordTest|ChooseLockPatternTest|LockUnificationPreferenceControllerTest'
Change-Id: I99cde2650902927f6a4cc7c0cc7c6016e0dc283f
For consistency with Mainline, we changed the string from Android
security patch level to Android security update.
Fixes: 151841551
Test: robotests
Change-Id: I6e53cef54add7f5f00b9766a5f2e9fdea9a62dd5
Add is5gEntryDisplayed() check in in NETWORK_MODE_LTE_GSM_WCDMA mode to
prevent that show "LTE(recommand)" everytime.
Bug: 153301072
Test: By manual
1. Reproduce issue
2. Verify the patch
Change-Id: I96311a1e399efd160a3f7290f85df778b2d6f0c4
The Openroaming help button should show only when the getHelpUriString() value is not null, and need to handle the click event in Settings APP.
Bug: 146669261
Test: Adjust unit test cases:
1. make RunSettingsRoboTests ROBOTEST_FILTER=WifiEntryPreferenceTest
2. make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2Test
Change-Id: I27a717c3014b01cc464908bac56f64bd08aa5da3
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
TalkBack was picking up the text in the action bar, so if we hide it,
it will read the first body of text it encounters which would be "Scan
QR code. Pair device over Wi-Fi by scanning a QR code."
Bug: 152461605
Test: Manual. Enable TalkBack in Settings > Accessibility > TalkBack.
Navigate to Developer options > Wireless debugging > Pair by QR code.
When QR code scanner fragment opens, it should say "Scan QR code. Pair
device over Wi-Fi by scanning a QR code."
Change-Id: Ia91bf4ea215e6a377335f2b9dcf2acf10afd268e
(cherry picked from commit bfd73c0d78)
Exempt-From-Owner-Approval: cherry-pick
Bug: 152462657
Test: Manual. Enable TalkBack in Settings > Accessibility. Navigate to
Developer options > Wireless debugging > Pairing device with QR code.
Scan a valid QR code, which should change to "Pairing device..." and
screen reader should say "Pairing device".
Change-Id: If467b56f787bda765fce1e5d46f8ab3c6210dc76
(cherry picked from commit 07ad841e2d)
Exempt-From-Owner-Approval: cherry-pick
This cl was cherry-picked from aosp/585306
The behavior of getQuantityString() is different according to language, it gets
both "other" and "one" string if English is system language. But it always gets
"other" string if non-English, then the "other" string of wrong_pin_code is
shown even if remains 1 time of SIM lock input.
In order to change the string in any language, we add new string for
remains 1 time.
Test: Rebuild rom
Fix: 71783850
Change-Id: If4b53bbbc6b51582bc0837abf4497d9a75ebbaad
