Commit Graph

11304 Commits

Author SHA1 Message Date
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
Bonian Chen
cc225237ed Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a
Change-Id: I9258611ddac1431abd0093372331c04616e0a6ca
2020-04-08 12:19:32 +00:00
Bonian Chen
c1b20e631a Merge "[Settings] Code refactor" into rvc-dev 2020-04-08 12:12:04 +00: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
Bonian Chen
6ce37e3f53 [Settings] Code refactor
Remove unused inport and adjust the import sequence.

Bug: 150352656
Test: build pass
Change-Id: Ifd1e37e56d0b0ae1d5b31723b8545ae95e707a66
2020-04-08 14:26:46 +08: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
4e8786c09b Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." 2020-04-08 04:57:12 +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
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
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
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
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
Tim Peng
2f87c336da Settings crashed by a null worker
-Add worker checker
-Add test case

Bug: 153356562
Test: make -j42 RunSettingsRoboTests
Change-Id: I129ff63a48b3785aacc846fe1dd67a926a8e5e1f
2020-04-07 07:48:38 +00:00
Jason Chiu
09034d2361 Merge "Refine metrics log in infrastructure" into rvc-dev am: 4edb83b260
Change-Id: I03a69d76c034e9973fecc47800cdbaa97738c314
2020-04-07 06:46:48 +00:00
Jason Chiu
4edb83b260 Merge "Refine metrics log in infrastructure" into rvc-dev 2020-04-07 06:33:30 +00:00
Jason Chiu
819abf7f87 Refine metrics log in infrastructure
- Add interfaces to set/get metrics category in BasePreferenceController
  for descendants having a chance to get it.
- Set metrics category in DashboardFragment
- Automatically log metrics in onPreferenceChange of
  TogglePreferenceController
- Add support for TwoStateButtonPreference in TogglePreferenceController
  to make the preference generic

Bug: 137559984
Test: robotest
Change-Id: Ia7e0d24a3db1991b18e0286d9894570fa71247a3
2020-04-07 14:08:39 +08:00
TreeHugger Robot
3c88fb72ff Merge "Add a developer setting for conversation enforcement" into rvc-dev am: 76b55e0b0a
Change-Id: Iaeb8ef59b9e675dcea137525c1b197b7f7512852
2020-04-07 03:58:21 +00:00
Varun Shah
2aeedcde21 Update display logic for no shared data.
When there is no shared data, instead of showing an empty list view,
the developer option's summary is updated.

Additionally, for the two shared data screens, added the back button to
the action bar so that it matches the other screens in the Settings app.

Also, implemented PreferenceControllerMixin for the
SharedDataPreferenceController so that the dev option shows up in
settings search.

Bug: 153079829
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SharedDataPreferenceControllerTest
Test: manual (visual)
Change-Id: I6ec5c35fc262dc27a383af8e2593be5b349ee85f
2020-04-06 20:58:11 -07:00
Zhen Zhang
8e89b0e182 Fix advanced preferences behavior in AllInOneTetherSettings am: b1d19a8b35
Change-Id: I7b92f3680c07402b73f073df5f346f15804195dc
2020-04-07 03:57:10 +00:00
TreeHugger Robot
76b55e0b0a Merge "Add a developer setting for conversation enforcement" into rvc-dev 2020-04-07 03:47:02 +00:00
Zhen Zhang
b1d19a8b35 Fix advanced preferences behavior in AllInOneTetherSettings
In AllInOneTetherSettings, advanced preferences should not be hidden
again after user have expanded them.

Bug: 151954343
Test: CodeInspectionTest; AllInOneTetherSettingsTest; manually test oberved advanced preferences won't be hidden.
Change-Id: If2c7d99b7dcac4149f065eca73022a582924c90b
2020-04-06 19:14:41 +00:00
Fabian Kozynski
83df54b007 Added settings screens for Power Menu
This CL adds a new Preference in Gestures (Power Menu), moves Global
Actions to it (now renamed Cards & passes) and adds a new Preference for
Device controls.

Missing:
* Explanation video for Device controls
* Privacy settings

Test: robotests
Test: manual change settings
Bug: 152212779
Bug: 152329723
Change-Id: Ia8f69565307a5961c8435bc1f441abeb389acf8b
2020-04-06 13:06:52 -04:00
Julia Reynolds
ae9060246b Add a developer setting for conversation enforcement
Test: Robo tests
Fixes: 152907434
Change-Id: I4e16faf817349993a98955601829d1ad22fa3921
2020-04-06 09:53:31 -04:00
Bonian Chen
5ab1c6cb61 [Settings] Changes for supporting replacing ImsManager
Wrap IMS related APIs in order to support replacing ImsManager.

Bug: 140542283
Test: build pass
Merged-In: I10aff50b6f3fc50b2f336ee320740f9f4a81e256
Change-Id: Ibc8c1c36fe031a3d845b99f878ef45ce5db7de28
2020-04-06 21:43:05 +08:00
Toby Chuang
3283bf4c82 Merge "[NFC] Add a picture under NFC settings to show NFC detection point." into rvc-dev am: 36b00c5e4f
Change-Id: Ifd7e71e8dfe85c1e81780e59380041888f95559b
2020-04-06 07:43:13 +00:00
Toby Chuang
36b00c5e4f Merge "[NFC] Add a picture under NFC settings to show NFC detection point." into rvc-dev 2020-04-06 07:28:00 +00:00
tim peng
cbf16337f4 Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev am: 75c84f8e64
Change-Id: I2167996ca2d0fac7aafc664d5a45dfcb0c2c752e
2020-04-06 07:06:57 +00:00
tim peng
75c84f8e64 Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev 2020-04-06 07:06:03 +00:00
TreeHugger Robot
8482a5396a Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4
Change-Id: Icbba62d578e37990f69b319c689365aea14527d4
2020-04-06 05:38:51 +00:00
Toby Chuang
204fa8a420 [NFC] Add a picture under NFC settings to show NFC detection point.
Each smartphone has a different NFC antenna detection point,
users would confuse where the NFC antenna is and how to place the
smartphone close to the card reader/equipment.

Starting from Android R device, we move NFC antenna position from
top area to middle center of the phone.

From the OEMs perspective, they could implement their own picture
to indicate the best NFC detection point.Hence, we propose to
show NFC antenna position under NFC setting.

Bug: 142230563
Test: build pass
Change-Id: Ib3cd7fc3ea299be1667aba0aeebaa148fb49015f
2020-04-06 13:37:31 +08:00
TreeHugger Robot
d81224b7d4 Merge "Update permission summary when permission changing." into rvc-dev 2020-04-06 05:22:01 +00:00
Tim Peng
85055801fe No feedback when attempting to transfer to an unpowered BT device
-Set title and subtitle when connecting state changes
-Add test cases

Bug: 152606143
Test: make -j42 RunSettingsRoboTests
Change-Id: I1c482e8f45752d658d7898de760594fd3ec7164d
2020-04-06 01:19:28 +00:00
TreeHugger Robot
8941f5395d Merge "Turn on location dialog when using twilight scheduling" into rvc-dev am: 710fd22f81
Change-Id: I0ba38f391e31867cf29c36f40c02dd7b7e3d16b8
2020-04-03 08:16:38 +00:00
TreeHugger Robot
710fd22f81 Merge "Turn on location dialog when using twilight scheduling" into rvc-dev 2020-04-03 08:03:41 +00:00
Jay Aliomer
59c03c23b7 Turn on location dialog when using twilight scheduling
Night light and Dark theme scheduling does not work when in
twiligth mode. For the reason, we added a dialog to inform the user
that they need to turn on location services first.

Fixes: 153115618
Fixes: 153115261
Test: manual
Change-Id: Iea51018a7caba5c0ec93e058ee047d067bc03867
2020-04-03 03:45:20 +00:00
TreeHugger Robot
5322a51734 Merge "Add a new developer options screen for shared data." into rvc-dev am: 5acd959e9e
Change-Id: Id5eac250f0e8e67adbccfda3a78a78d85e08cb1e
2020-04-02 20:40:29 +00:00
TreeHugger Robot
5acd959e9e Merge "Add a new developer options screen for shared data." into rvc-dev 2020-04-02 20:13:28 +00:00