Commit Graph

31639 Commits

Author SHA1 Message Date
Beverly
56a7e26e90 Add ellipsis to dnd notification settings
To indicate there's more text than showing.

Test: manual
Fixes: 152901378
Change-Id: Iefb688b07a301be09e0ab747429d2b99b49ea1a6
2020-04-08 14:38:26 +00:00
Rubin Xu
f535e87e51 Improve work profile unification flow
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
2020-04-08 14:43:48 +01:00
calvinpan
a971c458ba Check is5gEntryDisplayed in NETWORK_MODE_LTE_GSM_WCDMA mode
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
2020-04-08 16:58:56 +08:00
TreeHugger Robot
02ba3d1e30 Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7
Change-Id: I376352c94fac2b8fcf9f20e0d176e17efdfdbdfc
2020-04-08 07:38:19 +00:00
TreeHugger Robot
1e49ff8ba7 Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev 2020-04-08 07:23:53 +00:00
Bonian Chen
df97bbbdd5 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b am: 733530e086
Change-Id: I5a1a3d423103971c0978e9e7dbdad216b398a159
2020-04-08 07:11:00 +00:00
Bonian Chen
733530e086 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b
Change-Id: If4f0e4b0c0d44ee6b7387a4a94c44d949706c557
2020-04-08 06:56:14 +00:00
Bonian Chen
fe22ecad9b Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" 2020-04-08 06:40:10 +00:00
Bonian Chen
d9957643d9 [Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API
Replace SubscriptionManager#addOnSubscriptionsChangedListener API in
order to compatible with legacy design.

Bug: 151838951
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SubscriptionsChangeListenerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=ActiveSubsciptionsListenerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SimStatusDialogControllerTest
Merged-In: Ib98ce0dcbf18b6f48a6f267dd9e7be017d571157
Merged-In: I350604a64a56151195f52d38bd258e34c76e40c5
Change-Id: I4fc89e91381b1562ee7e2f48cfc159949c81a414
2020-04-08 06:38:10 +00:00
Xin Li
ad360f14a6 Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" 2020-04-08 06:26:03 +00:00
govenliu
a82d2c8a88 [Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need.
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
2020-04-08 13:41:15 +08:00
Bonian Chen
9d1b047e4c Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b am: c034169ccd
Change-Id: I928f1223c983a6ffcfae75cdf193779a7e688a60
2020-04-08 05:21:31 +00:00
Bonian Chen
c034169ccd Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b
Change-Id: I36f17b8206bd397306dca9d37e2bd3cf48700321
2020-04-08 05:08:49 +00:00
Bonian Chen
a93ddbc42f Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258
Change-Id: I793ec6eca3bab04122ebcd5e6a957d16fe14f5e0
2020-04-08 05:03:17 +00:00
Bonian Chen
4e8786c09b Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." 2020-04-08 04:57:12 +00:00
Bonian Chen
05cb60b258 Merge "[Settings] Code refactor" into rvc-dev 2020-04-08 04:52:23 +00:00
Arc Wang
067757f8d9 [Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2
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
2020-04-08 11:58:27 +08:00
Bonian Chen
f479860538 Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c am: b35536dda8
Change-Id: Ibe3343a47e156e632b4271bf50bd5773c7c3cbf9
2020-04-08 03:54:35 +00:00
Bonian Chen
b35536dda8 Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c
Change-Id: I3c8fb5dc82165f42e6bee5742cddc48d934684ed
2020-04-08 03:41:01 +00:00
tim peng
fa54aab4d1 Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e
Change-Id: Ia747117acf1a8d2e7a77049a013fb777e1ab64b9
2020-04-08 03:36:11 +00:00
tim peng
778317679a Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9
Change-Id: I5cd836d2390ad92e2c7a1afb7973186327bfc98b
2020-04-08 03:36:04 +00:00
Bonian Chen
bb9fbb60f0 Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6" into rvc-dev 2020-04-08 03:23:09 +00:00
Bonian Chen
449f76d55c Merge "[Settings] Changes for supporting replacing ImsManager" 2020-04-08 03:20:43 +00:00
tim peng
e189ac522e Merge "Settings crashed by a null worker" into rvc-dev 2020-04-08 03:18:31 +00:00
tim peng
f1f7b861d9 Merge "Transferring to a cast device should not close the output switcher" into rvc-dev 2020-04-08 03:18:09 +00:00
Menghan Li
231b8ae707 Merge "Fix gesture navigation popup is displaying inconsistently on the System navigation page." into rvc-dev am: a43f842c56
Change-Id: Id8ee5d83613b1e8c22f757781799aa4a18bcae98
2020-04-07 23:50:16 +00:00
Menghan Li
a43f842c56 Merge "Fix gesture navigation popup is displaying inconsistently on the System navigation page." into rvc-dev 2020-04-07 23:40:09 +00:00
Benedict Wong
1c69a8282c Fix VPN settings UI to validate IPsec Identifier
This change ensures that the updateUiControls() (and validate()
transitively) is called whenever the IPsec identifier is updated.

Bug: 152811464
Test: Manual testing with settings UI
Change-Id: I6536652a60244c3fde3f65211f9d0709145c6cd9
2020-04-07 11:34:46 -07:00
Xin Li
9dc49223ab DO NOT MERGE - Merge QQ2A.200405.005 into master
Bug: 150877681
Merged-In: I1dd83ba55b34433b2b600b8a998000347b6ae5e8
Change-Id: Ia97ace340fa53229dd3ebbe0caa09ab996755b5a
2020-04-07 11:29:38 -07:00
Joshua Duong
9ca30c00b2 Merge "[a11y] Fix TalkBack readback on adb qrcode fragment." into rvc-dev am: 23040a3b2b
Change-Id: I1bb852b94007710de67876ee0a5e7300603d694a
2020-04-07 18:09:02 +00:00
Joshua Duong
7c6cf5a537 [a11y] Set focus on "Pairing device" text once QR code is scanned. am: 2a85924977
Change-Id: If361d8c9e48f81a38f7745a8377fa3ea488fcf99
2020-04-07 18:09:00 +00:00
Joshua Duong
23040a3b2b Merge "[a11y] Fix TalkBack readback on adb qrcode fragment." into rvc-dev 2020-04-07 18:07:16 +00:00
Joshua Duong
5866463e16 [a11y] Fix TalkBack readback on adb qrcode fragment.
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
2020-04-07 18:06:37 +00:00
Joshua Duong
2a85924977 [a11y] Set focus on "Pairing device" text once QR code is scanned.
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
2020-04-07 18:06:25 +00:00
menghanli
be11a370e6 Fix gesture navigation popup is displaying inconsistently on the System navigation page.
- Need to use new api to get the accessibility service list.

Bug: 149665916
Test: local test
Change-Id: Ib712769436bf7be5fbea34ba2251bdbe6bcefb95
2020-04-07 22:42:20 +08:00
TreeHugger Robot
1f80709343 Merge "Adjust tap targets in history" into rvc-dev am: 7c4557bec8
Change-Id: Ic3ffd4305548bab9d15196cdccea795417566060
2020-04-07 14:24:39 +00:00
TreeHugger Robot
7c4557bec8 Merge "Adjust tap targets in history" into rvc-dev 2020-04-07 14:12:35 +00:00
Bonian Chen
5a31b13971 [Settings] "Data during calls" in DDS SUB is still in advanced option.
The DataDuringCallsPreferenceController didn't listen the mobile data changed and update the preference.

Bug: 149344454
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataDuringCallsPreferenceControllerTest

Merged-In: I0121f06efb5257dccc05ad06b93a9db263f012b5
Change-Id: I6c8802aeb7b4f4850cb143e70a9e06de9fd93902
2020-04-07 20:11:09 +08:00
Automerger Merge Worker
7ab0499a38 Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6
Bug: 146057372

Change-Id: If80a964d28950288f042d4a1ccfc183b9c4f0067
(cherry picked from commit 0577514d0d)
2020-04-07 11:49:41 +00:00
TreeHugger Robot
2bf987e586 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev am: 9a84a2d544
Change-Id: I84afaeb5920c87dce64be375657d769f4770d876
2020-04-07 11:39:56 +00:00
Bonian Chen
1df6c9cdd4 [Settings] Code refactor
Remove unused import

Bug: 10956255
Test: build pass
Change-Id: I256870483d85bf7000556357071834cad24884d1
2020-04-07 19:29:49 +08:00
TreeHugger Robot
9a84a2d544 Merge "The text on toast should be changed when remains 1 time for SIM lock input" into rvc-dev 2020-04-07 11:23:32 +00:00
Tsung-Mao Fang
9c69ded434 The text on toast should be changed when remains 1 time for SIM lock input
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
2020-04-07 16:54:06 +08:00
Jason Chiu
b12e3b96c9 Support click metrics logs in several pages
- Assign metrics category to perferences at an earlier stage in
  DashboardFragment for better usability.

Bug: 137559984
Test: robotest
Change-Id: Icd4185efa0e655be20c4b673a1380fa42140923f
2020-04-07 16:44:53 +08:00
Bonian Chen
d6879ac38e Merge "[Settings] Refactor TelephonyConstants" am: 9371311309 am: d998b07a01
Change-Id: Ic323de2fbac45591c80d727b86aadad292c3dc8b
2020-04-07 08:30:59 +00:00
Bonian Chen
d998b07a01 Merge "[Settings] Refactor TelephonyConstants" am: 9371311309
Change-Id: I58dad89c087419ff07438ba02d08cde9d0e874ca
2020-04-07 08:15:41 +00:00
Treehugger Robot
e50b81128d Merge "Button text for app space management is overwritten" am: 1d47b76cb5 am: 41087780ee
Change-Id: Id76cad599bfd29182de1b018e708f3beb7089227
2020-04-07 08:10:43 +00:00
Treehugger Robot
a801eee2e9 Merge "Button text for app space management is overwritten" am: 1d47b76cb5 am: 41087780ee
Change-Id: I526f17f1ba6f6c2502ce8691f38319828c3dc378
2020-04-07 08:10:22 +00:00
Bonian Chen
9371311309 Merge "[Settings] Refactor TelephonyConstants" 2020-04-07 08:05:32 +00:00
Tim Peng
6fb4059944 Transferring to a cast device should not close the output switcher
-Close panel only when on pause and stop
-Transfer device would set the play state to "STATE_NONE"
-Add test case

Bug: 152632226
Test: make -j42 RunSettingsRoboTests
Change-Id: Ibf6ce1454b1d5bf3facc07abec15b8735029f2cf
2020-04-07 08:02:30 +00:00