Commit Graph

9792 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
76703104a4 Merge "Add a new developer options screen for shared data." into rvc-dev am: 5acd959e9e am: 2da25c7746 am: 2a187c64e6 am: b7bf410542
Change-Id: I9d75124b4d64814b1404b9699ac51fe02e49552f
2020-04-02 21:37:39 +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
Varun Shah
7efe9315ba Add a new developer options screen for shared data.
Add a new Storage section in the developer options menu which has a
new Shared Data preference. This preference screen shows all shared data
blobs on the device. There is also a new screen for each data blob which
shows all of the packages which currently have a leases on it. This
screen also has a button to delete the shared data blob.

Bug: 150626561
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SharedDataPreferenceControllerTest
Test: manual (visual)
Change-Id: Id84a33dc7eeac493b2f81d3996ad24ee70557a07
2020-04-02 10:07:47 -07:00
TreeHugger Robot
542746dadb Merge "Fix SupportDashboardActivityTest" into rvc-dev 2020-04-02 04:31:06 +00:00
TreeHugger Robot
14934ed6e3 Merge "Fix crash when trying to open app info page" into rvc-dev am: a43e978ffb am: 37f7b8e26e am: f979cd94b8 am: bc47ba6807
Change-Id: I2ce5ad73dca56e7f407412c4862d0f7112f3c9ca
2020-04-01 23:07:15 +00:00
kholoud mohamed
f9a03cd415 Fix crash when trying to open app info page
Fixed a crash in App info page that happens when
no work profile exists, also fixed some unit tests.

Fixes: 152933121
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesDetailsTest
Change-Id: I7a1e5857cb1e10b96b33abd64359ba30459b1b13
2020-04-01 17:27:17 +00:00
Yanting Yang
f7b884f59b Fix SupportDashboardActivityTest
Since the screen title of SupportDashboardActivity was changed to
page_tab_title_support string for fixing breadcrumb before.

We need to correct the test case to fix the test function fail.

Bug: 147851992
Test: robotests
Change-Id: I14e30ac2a5210bb2d89657cff5772c06c6e8fe5a
2020-04-01 20:13:59 +08:00
TreeHugger Robot
a2ca682ed8 Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4 am: da8eb18b3d am: 010f812a43 am: c8979ad780
Change-Id: I0aadd8848652c9c0cf7363c3d48e9e2f05e9f4c3
2020-04-01 10:44:34 +00:00
Yi-Ling Chuang
f31d38620c Update permission summary when permission changing.
Some apps have pre-grant permissions, so when they get disabled and then
enabled again, those pre-granted ones will come back automatically. This
CL handles this kind of cases by listening to permission changes and
update the summary accordingly.

Fixes: 142053555
Test: robotests
Change-Id: I75b010139657ec3b4ff875de77573a46387e42c8
2020-04-01 15:27:15 +08:00
Arc Wang
26d3b7dd1b [Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test
Sign in feature is integrated in WifiTraclerLib, change the test cases
to verify if WifiEntry sign in methods is called.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Ia0157f5a96c700e5596c00cef873c8f5016d6442
2020-04-01 15:25:37 +08:00
Goven Liu
8875f3bdf1 Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 15ff53ecfb am: 4b67490445 am: dbc337b4c5
Change-Id: I07c7dde25a3c28f1ac01151103a4fb0f518655bf
2020-04-01 04:15:29 +00:00
Goven Liu
783b0257ad Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev 2020-04-01 03:16:34 +00:00
TreeHugger Robot
53c6bfffae Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: 6e9938cf48 am: 0035707d32 am: 85f940b564
Change-Id: Ia73d18279f72e0eaefe73f0053549a4287a68ffa
2020-03-31 21:48:17 +00:00
TreeHugger Robot
04d64f470e Merge "Disable conversation strip setting." into rvc-dev 2020-03-31 19:21:51 +00:00
TreeHugger Robot
ac9e47e275 Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev am: d0d3873aa7 am: c5507e6665 am: 0aeda894f3 am: 7a5c9cbfb2
Change-Id: Ib9fd01710ccad4d86e671165295543d73aa7e477
2020-03-31 18:38:31 +00:00
TreeHugger Robot
d0d3873aa7 Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev 2020-03-31 17:31:16 +00:00
Steve Elliott
8a575029fc Disable conversation strip setting.
Test: manual, robotests
Fixes: 149070144
Fixes: 149001624
Change-Id: I422872e38f7adead81938c39b6084bbc7ed911ae
2020-03-31 13:24:46 -04:00
Bonian Chen
5b4acedda6 Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154 am: d2fe2c9959 am: fa83a139ca am: c6c4b5def6
Change-Id: I46c047359257ddd5cb3e331add4856b01c5c9739
2020-03-31 17:03:06 +00:00
Bonian Chen
54002ca154 Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev 2020-03-31 16:09:27 +00:00
TreeHugger Robot
2391d48238 Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 37e6acd9a5 am: 4bcd19b296 am: a7e1794024
Change-Id: Ie27c34c685a035f0751488e95e35ee9cebf980ea
2020-03-31 16:00:34 +00:00
TreeHugger Robot
4b45334288 Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev
* changes:
  [Wi-Fi] Wi-Fi picker scrolls to top after a user clicked to connect
  [Wi-Fi] Fix Wi-Fi picker context menu 'Connect' button
2020-03-31 15:01:09 +00:00
Kholoud Mohamed
f638279fae Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: bf7e468f0c am: 3e5e6920eb am: 1910a64cf1
Change-Id: I2b6b7f55b4e3870f54c9f41b360d460c628d638c
2020-03-31 14:26:22 +00:00
Kholoud Mohamed
7fb6f35c3a Merge "Show all apps that requested cross profile permission" into rvc-dev 2020-03-31 13:09:31 +00:00
Alex Kershaw
c364f5d95d Remove policy transparency for cross-profile calendar setting
We will likely deprecate this setting in the next release, to be
replaced by usage of 'connected work and personal apps'. However, we are
keeping it in this release as it's still possible that a lightweight
calendar access API could be useful, if the admin and user approvals are
combined.

For now, the error message that refers to cross-profile calendar when
the setting is disabled is confusing admins, since we're not
recommending usage of this API at this time.

Remove the setting when it is disabled, rather than showing policy
transparency.

Fixes: 143477431
Test: manual
Change-Id: I65573a5ba892e12a4dabcdf23541f33516db0a8a
2020-03-31 11:41:44 +01:00
Arc Wang
3bb3808043 [Wi-Fi] Fix Wi-Fi picker context menu 'Connect' button
1. Display the Wi-Fi dialog with MODE_CONNECT.
2. Connect with the WifiConfiguration from
   WifiConfigController2#getConfig() if it's available.

Bug: 152826354
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2
Change-Id: Ifbe2ac30b1c37c8eab3227ac0561fdd2de5cb706
2020-03-31 17:01:22 +08:00
govenliu
f9651d92bb [Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test
Fix 5 @Ignore unit tests in WifiDetailPreferenceController2Test.

Bug: 151696220
Test: Run make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: I5f64bf455d6a2505f546e2c7a3ba0caddf3f16cc
2020-03-31 16:42:58 +08:00
Bonian Chen
a2411f9c3c Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 am: 9e9597f7d8 am: 3c4dffc470
Change-Id: I45977c850977be84c0dc1f6461e68a1941efc1a2
2020-03-31 07:29:37 +00:00
Bonian Chen
7520adccee [Settings] Apply WifiCallingQueryImsState
Apply design of WifiCallingQueryImsState to source code which accessing
WifiCalling.

Bug:  140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSliceHelperTest

Change-Id: I0db966742d63cfe9a1ef4e1b06f6b5c81f681927
2020-03-31 14:40:18 +08:00
Jason Chang
24b7398a19 Merge "New Settings preference for One Handed mode" 2020-03-31 05:58:30 +00:00
TreeHugger Robot
76d2bd2f1c Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48 am: 2093f0dee4 am: 1e2a313c5a am: ab9a994fcd
Change-Id: I8982dfc9a4ea527f210e5634035e6b391f4c4945
2020-03-31 05:21:32 +00:00
tim peng
85cbce813c Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5 am: 2b47660696 am: f8c57507e2
Change-Id: I4c9eaaf3b244f657bb6cc32a31526b22f535a20a
2020-03-31 05:20:51 +00:00