Commit Graph

11498 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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