Commit Graph

11447 Commits

Author SHA1 Message Date
Fabian Kozynski
553666ff75 Merge "Added settings screens for Power Menu" into rvc-dev am: 4d02f7b2e2 am: 03fcf4849a
Change-Id: I810a8cc02159bb87d0f0c4997c1610cc0b9dcf8f
2020-04-09 18:04:49 +00:00
Fabian Kozynski
4d02f7b2e2 Merge "Added settings screens for Power Menu" into rvc-dev 2020-04-09 17:58:44 +00:00
Oscar Shu
92a71c6591 Merge "Add dev option for enhanced mac randomization" into rvc-dev am: a6eedbf350 am: b210bd43fc
Change-Id: I5e0ec5a4f0d3d789d941a9077bab691b80196b3f
2020-04-09 17:58:44 +00:00
Oscar Shu
87d4a7d593 Merge "Add dev option for enhanced mac randomization" into rvc-dev am: a6eedbf350
Change-Id: I1a6c49d9ba076a474ad99cfc9231e0eb5eecaf1c
2020-04-09 17:57:02 +00:00
Oscar Shu
a6eedbf350 Merge "Add dev option for enhanced mac randomization" into rvc-dev 2020-04-09 17:50:58 +00:00
Minche Li
3dfc187e33 Merge "Applies magnification capability settings key" 2020-04-09 04:37:41 +00:00
mincheli
c419cc6804 Applies magnification capability settings key
Bug: 144327603
Test: make RunSettingsRoboTests
Change-Id: I45cfc9ce646c8d0c9aaaeaa1cb073fb2ae1ec3de
2020-04-09 01:25:26 +00:00
Goven Liu
c8cc5d0bbe Merge "[Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need." into rvc-dev am: 5a8e9e452a am: e5153b50f6 am: 67f7f28b2b am: 46b44a95c7
Change-Id: Ib7291dd2b494b9426fd60c446d9f3162628268d5
2020-04-08 23:23:39 +00:00
Goven Liu
67f7f28b2b Merge "[Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need." into rvc-dev am: 5a8e9e452a am: e5153b50f6
Change-Id: Ia32ef3337b59ba5207182d1e15c717fa0ded012d
2020-04-08 22:42:49 +00:00
Goven Liu
c23f06f079 Merge "[Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need." into rvc-dev am: 5a8e9e452a
Change-Id: Id1c48c08e3e141b207488e3a86e9a7542ed53e6a
2020-04-08 22:42:34 +00:00
Goven Liu
5a8e9e452a Merge "[Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need." into rvc-dev 2020-04-08 22:37:35 +00:00
TreeHugger Robot
d2774334aa Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a am: b0171b6a58 am: b7c70e141a am: 3803f40c26
Change-Id: If8e743b89bcfee32ab087fd0a0514aa7afe17c19
2020-04-08 16:07:22 +00:00
TreeHugger Robot
b7c70e141a Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a am: b0171b6a58
Change-Id: Ia9861edf1808b7fa5fa1eab0ab67fc2c81cf91d4
2020-04-08 15:34:25 +00:00
TreeHugger Robot
bc7986e92b Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a
Change-Id: I95e826289036439674c19c52b1871d1820d06cac
2020-04-08 15:21:41 +00:00
TreeHugger Robot
e886ef9e9a Merge "Update display logic for no shared data." into rvc-dev 2020-04-08 15:11:37 +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
Bonian Chen
f1b3461c3e Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a am: 18997b6dae am: 2bf2b760dc am: 36fe9c2169
Change-Id: Ibb047e96a4396c9140937d879e96a3d7123b6e5b
2020-04-08 12:59:59 +00:00
Bonian Chen
2bf2b760dc Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a am: 18997b6dae
Change-Id: I8675ee0929257cfa817ad3c15f88cc973dfd1d07
2020-04-08 12:38:17 +00: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
acf8fc5939 Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 800cc2c277 am: 506a2394d0 am: 4621014df5
Change-Id: I58a4484659736ed5541ee26fc7fc794436c590e3
2020-04-08 08:17:51 +00:00
TreeHugger Robot
506a2394d0 Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7 am: 800cc2c277
Change-Id: I00572d5c7dd3905f094fdd052ebf76aea7fcb774
2020-04-08 07:45:52 +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
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
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
tim peng
e1c7ec38a9 Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e am: 3ffe34a48b am: 91c389b9a2 am: 100703a82b
Change-Id: Iac371239bf42a390ab76143bbbc6765a0d9bf03c
2020-04-08 04:24:40 +00:00
tim peng
60aa5b2569 Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9 am: f8d7c09e36 am: 38315ae8af am: 4aa0d4d13a
Change-Id: I660e65161451a83241c9d67d66ff7dc626860194
2020-04-08 04:24:20 +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
tim peng
91c389b9a2 Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e am: 3ffe34a48b
Change-Id: I9dbde9d6bee32a137a41a7b39d16be0218f32df6
2020-04-08 03:50:27 +00:00
tim peng
38315ae8af Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9 am: f8d7c09e36
Change-Id: Ie51e102e2db56157da8723de911d4fc33cac43ef
2020-04-08 03:50:13 +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
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
191ed35ee6 Merge "Refine metrics log in infrastructure" into rvc-dev am: 4edb83b260 am: 664adc4691 am: 33f64102b4 am: 6d921190fd
Change-Id: I40b519f1950f5053bade9df2b2daa44291ac4863
2020-04-07 07:27:18 +00:00
Jason Chiu
33f64102b4 Merge "Refine metrics log in infrastructure" into rvc-dev am: 4edb83b260 am: 664adc4691
Change-Id: I6adfac997388c81520bb9cbd540ef820c7ca27f1
2020-04-07 06:58:58 +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
Automerger Merge Worker
2e4a95b227 Merge "Merge "Add a developer setting for conversation enforcement" into rvc-dev am: 76b55e0b0a am: 7008d7a192" into rvc-d1-dev-plus-aosp am: 875b001eb3 am: 88171420fe
Change-Id: I8ba0367c9bc155e9968d31440df2d29731d88c1f
2020-04-07 04:48:36 +00:00
Zhen Zhang
dfed682e47 Fix advanced preferences behavior in AllInOneTetherSettings am: b1d19a8b35 am: 0ea7803c18 am: 8e541c6272 am: 77f2676d44
Change-Id: I31ac25ad4dd95ee19904c628b79811a9d87ec871
2020-04-07 04:40:53 +00:00
TreeHugger Robot
9f3968f2ae Merge "Add a developer setting for conversation enforcement" into rvc-dev am: 76b55e0b0a am: 7008d7a192
Change-Id: Iddc4a0b03d26b553cc8a4e7fe9a0410a47ff146d
2020-04-07 04:08:32 +00:00
Zhen Zhang
8e541c6272 Fix advanced preferences behavior in AllInOneTetherSettings am: b1d19a8b35 am: 0ea7803c18
Change-Id: Ib5a5d84cc16fdc3744b1f15a60699694cc15673a
2020-04-07 04:07:33 +00: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