Commit Graph

11003 Commits

Author SHA1 Message Date
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
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
e886ef9e9a Merge "Update display logic for no shared data." into rvc-dev 2020-04-08 15:11:37 +00: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
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
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
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
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
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
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
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
Toby Chuang
5ec6cffae2 Merge "[NFC] Add a picture under NFC settings to show NFC detection point." into rvc-dev am: 36b00c5e4f am: 88fd6fb1ae am: 925f3c4876 am: acdd0b7227
Change-Id: Ia1a28427bc571a89474640f689591a4955d1e2bc
2020-04-06 08:52:11 +00:00
Toby Chuang
925f3c4876 Merge "[NFC] Add a picture under NFC settings to show NFC detection point." into rvc-dev am: 36b00c5e4f am: 88fd6fb1ae
Change-Id: I5a6e97de416b0b1bf41846ec7b7ccfdcb0161079
2020-04-06 08:33:29 +00:00
tim peng
aa4de0dc52 Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev am: 75c84f8e64 am: 030845ee3a am: 6dd7b682ea am: 43ea067e3f
Change-Id: I6e594f39c29dbfa1f17459356f16ebbde0a1706f
2020-04-06 07:56:10 +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
6dd7b682ea Merge "No feedback when attempting to transfer to an unpowered BT device" into rvc-dev am: 75c84f8e64 am: 030845ee3a
Change-Id: Ibe89b323ea16390164611b587b42e90886c8f087
2020-04-06 07:26:58 +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
4af2946272 Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4 am: bf57fc64e2 am: feb1b3547a am: a9e7353473
Change-Id: I7949f81b65919939f4cc8c63bc3d68a6c4bfc636
2020-04-06 06:17:15 +00:00
TreeHugger Robot
feb1b3547a Merge "Update permission summary when permission changing." into rvc-dev am: d81224b7d4 am: bf57fc64e2
Change-Id: I11ae2175b744ad2dcf33164bfae8b9c99ec6cf5d
2020-04-06 05:49:50 +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
7874b1f51a Merge "Turn on location dialog when using twilight scheduling" into rvc-dev am: 710fd22f81 am: b217fab040 am: 2fabcc4cde am: 5f80453992
Change-Id: Id3af3aae3a78d02fd90a5fdf587a39852be331db
2020-04-03 09:11:45 +00:00
TreeHugger Robot
2fabcc4cde Merge "Turn on location dialog when using twilight scheduling" into rvc-dev am: 710fd22f81 am: b217fab040
Change-Id: Ie667783e8eab8b9940f3d445545d9642754a7fae
2020-04-03 08:41:03 +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