Commit Graph

61864 Commits

Author SHA1 Message Date
Yanting Yang
d8f14f11b0 Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev am: ad4405d0f8
Change-Id: Ibcd672023ec7cceef0e41bf1501fc28ade481430
2020-03-30 15:32:46 +00:00
Yanting Yang
ad4405d0f8 Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev 2020-03-30 15:15:06 +00:00
Tsung-Mao Fang
61e352bba7 Fix the ringtone subtext is empty
Because ag/10750991 change the controller key in xml,
the controller can get a correct preference.

In order to fix this problem, change the key to correct one.

Test: Rebuilt rom, and see the subext
Fix: 162593762
Change-Id: I0226ece059944655a25af48a603916a14cede2e0
2020-03-30 22:48:05 +08:00
Arc Wang
3aee35a882 [Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest
In ag/10785119, WifiStatusTracker#setListening calls
ConnectivityManager#unregisterNetworkCallback twice.
Modify the fail test to match it.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiMasterSwitchPreferenceControllerTest
Change-Id: Idd9917ce204e2abbc4bfbf760222191adadf4afa
2020-03-30 22:07:21 +08:00
TreeHugger Robot
dc5550102b Merge "Only request focus if change was self-triggered" into rvc-dev am: c22d90cb1b
Change-Id: I655e9a021962845e2bb1297f7b2469aaed1d80cb
2020-03-30 13:37:57 +00:00
TreeHugger Robot
5093ea158d Merge "Only request focus if change was self-triggered" into rvc-dev am: c22d90cb1b
Change-Id: I8ff4e678ac5391f395ac7bf4cf06f3ce7a2c649e
2020-03-30 13:37:47 +00:00
TreeHugger Robot
c22d90cb1b Merge "Only request focus if change was self-triggered" into rvc-dev 2020-03-30 13:35:23 +00:00
Julia Reynolds
1819365216 Merge "Remove items from the 'last 24 hours' history on swipe" into rvc-dev am: dad135f4ed
Change-Id: Ifbcb4f892430f6d8e43954b62a0aaf8cc2375d1e
2020-03-30 13:32:19 +00:00
TreeHugger Robot
9c129157d0 Merge "Add tap targets to top 2 sections" into rvc-dev am: 9db658bfe0
Change-Id: I1ece8e10f441202da306a14a1917313b412c83f1
2020-03-30 13:32:03 +00:00
Julia Reynolds
fe8ad05005 Merge "Remove items from the 'last 24 hours' history on swipe" into rvc-dev am: dad135f4ed
Change-Id: I76382dd6050ed5c913feaab485ce3c17c4a80328
2020-03-30 13:31:43 +00:00
TreeHugger Robot
9d9504f951 Merge "Add tap targets to top 2 sections" into rvc-dev am: 9db658bfe0
Change-Id: Id7a163a59b9a10291fcfbbd9d8c39e1d0b28488e
2020-03-30 13:30:59 +00:00
Arc Wang
fd3360d28b [Wi-Fi] Index Wi-Fi preferences.
This is a WifiTracker2 version of partial part of ag/9980423

- Disable the "Saved network" if the access points is empty.
- Disable the "Wifi data usage" if there is no wifi radio.

Bug: 146823365
Test: manual
      Search 'Saved networks' when there is a saved Wi-Fi network
      and when there is no saved Wi-Fi network.
      Search 'data usage' on the device which supports Wi-Fi and
      on the device which does not supports Wi-Fi.
Change-Id: If46e65585f1b272401666f78fd5e3a4cf49bef6e
2020-03-30 21:30:00 +08:00
Julia Reynolds
dad135f4ed Merge "Remove items from the 'last 24 hours' history on swipe" into rvc-dev 2020-03-30 13:23:42 +00:00
TreeHugger Robot
9db658bfe0 Merge "Add tap targets to top 2 sections" into rvc-dev 2020-03-30 13:17:23 +00:00
Rubin Xu
fbfba7a078 Set face unlock toggle to unchecked when disabled by admin
Bug: 135747161
Test: make RunSettingsRoboTests
    ROBOTEST_FILTER=FaceSettingsLockscreenBypassPreferenceControllerTest
Change-Id: I1e3d105184a14bfece972abb096eac44bd186273
2020-03-30 12:33:57 +01:00
TreeHugger Robot
c2a4b3bfd0 Merge "Update App storage usage summary" into rvc-dev am: 9c32d89aaa
Change-Id: I9b2243a5baa47c12e86caffbf47b56cd825ff4c6
2020-03-30 08:31:34 +00:00
Bonian Chen
89440ab287 [Settings] Replace ImsManager#isVtEnabledByPlatform() am: fb7274a308
Change-Id: Icd17e13882d838ca7629474d5abd29ac27c5c9d9
2020-03-30 08:31:19 +00:00
TreeHugger Robot
0d761a25bd Merge "Update App storage usage summary" into rvc-dev am: 9c32d89aaa
Change-Id: Ia02627cb75d8a261644f2343d313e261c8e532f1
2020-03-30 08:31:08 +00:00
Bonian Chen
a6d6285b57 [Settings] Replace ImsManager#isVtEnabledByPlatform() am: fb7274a308
Change-Id: I3e2196c85d029d9ad67edf589e18df1ba2e4456b
2020-03-30 08:31:03 +00:00
TreeHugger Robot
9c32d89aaa Merge "Update App storage usage summary" into rvc-dev 2020-03-30 08:22:16 +00:00
Tim Peng
3ac144163e No media status is visible in Output Switcher
-Reflash header when get latest media controller

Bug: 152606491
Test: make -j42 RunSettingsRoboTests
Change-Id: I14542a7f8ba921c9d1dbaacf7e01c3ee673527b2
2020-03-30 16:20:14 +08:00
Bonian Chen
fb7274a308 [Settings] Replace ImsManager#isVtEnabledByPlatform()
Replace ImsManager#isVtEnabledByPlatform() by
ImsMmTelManager.isSupported().

Bug:  140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=VideoCallingPreferenceControllerTest

Change-Id: Ife5100ef288fbad6fc818e8fbdf8192c42d495b2
2020-03-30 07:41:29 +00:00
tim peng
58baac0cbd Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev am: ecea133904
Change-Id: Ie5c4012e64d59ca64288228a6ff4d83b91fef34e
2020-03-30 07:06:55 +00:00
tim peng
15ac2b2c8e Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev am: ecea133904
Change-Id: I24db3f5f2be14d1a63bef9327a828d93b3f50263
2020-03-30 07:06:11 +00:00
tim peng
ecea133904 Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev 2020-03-30 06:56:16 +00:00
Robert Luo
2f4ebf9475 Refine NFC payment wording for "Set default" and "Update" scenarios.
Fixes: 149270345
Test: manual and check if new string is applied
Change-Id: I4d7591882489d3892020f8fa2f963f7c90ec79e4
2020-03-30 13:25:39 +08:00
Bonian Chen
9c4d1190d9 [Settings] Replace ImsManager#isWfcEnabledByPlatform() am: c134ef08d4
Change-Id: Ia5b8007cd0dc6b201493a1b88f277a1c10500bbb
2020-03-30 04:25:20 +00:00
Bonian Chen
89e418e12f [Settings] Replace ImsManager#isWfcEnabledByPlatform() am: c134ef08d4
Change-Id: I5423d09d50bf76947e41927f9138e7db34f963a7
2020-03-30 04:23:47 +00:00
Tim Peng
e4ccbbec67 PendingIntent in MediaOutputIndicatorSlice could be Hijacked
-Add setPackage() to prevent local information disclosure

Bug: 151645695
Test: make -j42 RunSettingsRoboTests
Change-Id: I74c058a381fceb85695dd76d354fb49f878f9142
2020-03-30 03:53:02 +00:00
Remi NGUYEN VAN
57fbcec933 [automerger skipped] Merge "Adjust code for API council feedback" am: aab7aca759 am: 85f97bf02a -s ours
am skip reason: Change-Id I5ff389f3f707e5538979830c2252455bea5bbb88 with SHA-1 e0b336d7a4 is in history

Change-Id: Ifefcbf2672b32a405be4ff6a59f280f8e90b7aa8
2020-03-30 03:40:28 +00:00
Bonian Chen
c134ef08d4 [Settings] Replace ImsManager#isWfcEnabledByPlatform()
Replace ImsManager#isWfcEnabledByPlatform().

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

Change-Id: I85907efb39aecdb3fb18cacf11ce4510b898edc4
2020-03-30 03:34:01 +00:00
tim peng
668e370bbd Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92
Change-Id: I9a361f1a4c3157666237829408244c908a230ca7
2020-03-30 03:14:50 +00:00
tim peng
3e73d0f92c Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92
Change-Id: Ic593ca5ddc1774b7b6895fee106dba8c595ff8a0
2020-03-30 03:14:35 +00:00
Remi NGUYEN VAN
85f97bf02a Merge "Adjust code for API council feedback" am: aab7aca759
Change-Id: Idd49347f191f75bbe05b45fcfa47856d87c983bb
2020-03-30 03:06:07 +00:00
Remi NGUYEN VAN
aab7aca759 Merge "Adjust code for API council feedback" 2020-03-30 02:58:45 +00:00
tim peng
ddd8a8fa92 Merge "Add zero state in output switcher" into rvc-dev 2020-03-30 02:54:33 +00:00
Artur Satayev
f4ddb539ea Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev am: 836dcbaf91
Change-Id: Ia152eba38febb9ae5f7321de77a1b5d198d9cf74
2020-03-29 18:22:34 +00:00
Artur Satayev
a14ed2a8ac Do not exlicitly declare dependency on changeid processor. am: 772243ca06
Change-Id: I367517c904a8bcb97df844af9c8f06c9870e198f
2020-03-29 18:22:20 +00:00
Artur Satayev
44b344abc1 [automerger skipped] Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev am: 836dcbaf91 -s ours
am skip reason: Change-Id Icab88938f1a49a892e0d62b2a833b659d6725267 with SHA-1 772243ca06 is in history

Change-Id: Id9da9d74dc0af42e6521dfebb4a6e9a2d71d95cf
2020-03-29 18:22:19 +00:00
Artur Satayev
836dcbaf91 Merge "Do not exlicitly declare dependency on changeid processor." into rvc-dev 2020-03-29 18:07:37 +00:00
Artur Satayev
f9cc52d670 Do not exlicitly declare dependency on changeid processor.
Annotation processor is exported via app-compat-annotations library.

Bug: 152220864
Test: m && diff merged_compat_config.xml
Change-Id: Icab88938f1a49a892e0d62b2a833b659d6725267
Merged-In: Icab88938f1a49a892e0d62b2a833b659d6725267
Exempt-From-Owner-Approval: clean up
(cherry picked from commit b4924c2828)
2020-03-28 16:34:10 +00:00
Artur Satayev
772243ca06 Do not exlicitly declare dependency on changeid processor.
Annotation processor is exported via app-compat-annotations library.

Bug: 152220864
Test: m && diff merged_compat_config.xml
Change-Id: Icab88938f1a49a892e0d62b2a833b659d6725267
Merged-In: Icab88938f1a49a892e0d62b2a833b659d6725267
Exempt-From-Owner-Approval: clean up
(cherry picked from commit b4924c2828)
2020-03-28 16:30:47 +00:00
Kevin Chyn
38c724f4f8 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f am: 36359c9e96
Change-Id: Iadea914ac19e929d4020142736bb0dc959d824f0
2020-03-28 00:19:26 +00:00
Kevin Chyn
36359c9e96 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f
Change-Id: Ib1da534f9cdd0e1f9a1739b9be9d7669f1ec3ca6
2020-03-28 00:12:30 +00:00
Kevin Chyn
ef02804952 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f am: 87723f3db7
Change-Id: I4d0fd4de66f85adc86829b4b63dbaa19e5c52e02
2020-03-28 00:07:04 +00:00
Kevin Chyn
87723f3db7 Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev am: ef28e9b75f
Change-Id: Ic3aeaa4cfdee235a0cd5448d8cb2b31fe47f14cc
2020-03-28 00:06:44 +00:00
Kevin Chyn
ef28e9b75f Merge "Adjust ConfirmDeviceCredentialActivity system bars" into rvc-dev 2020-03-28 00:06:00 +00:00
Curtis Belmonte
1e510e6ac1 Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 6654372fde
Change-Id: I5acfdaf6398efb09a0813c8b30ad98bb62badaa2
2020-03-27 23:02:04 +00:00
Curtis Belmonte
c68465f024 Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 33851b108f
Change-Id: I789fafe027e1b105abc7dd59d65bbbad1a979010
2020-03-27 22:55:51 +00:00
Curtis Belmonte
6654372fde Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27
Change-Id: Ifa42922dfc21fadf3ff3dbdc32e6f4314f5846cb
2020-03-27 22:48:07 +00:00