Commit Graph

9726 Commits

Author SHA1 Message Date
Yanting Yang
7cfc3a4212 Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev am: ad4405d0f8 am: d8f14f11b0 am: 6b42c0780e am: c3716819c6 am: 126b9e9a44
Change-Id: I61ab316ad024e9fe8b143e24f6e5ea24ae85418b
2020-03-30 19:04:41 +00:00
Bonian Chen
a326e2ebf7 [Settings] Replace ImsManager#isVtEnabledByPlatform() am: fb7274a308 am: a6d6285b57 am: 4b42ba7807 am: f667a40821 am: 1de29efee7
Change-Id: I29cc7573f5082a777e7091e5eaf38f2ea77362b2
2020-03-30 19:01:22 +00:00
tim peng
486d40c058 Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev am: ecea133904 am: 15ac2b2c8e am: 0f89b27f0b am: 2f01748123 am: d609a20248
Change-Id: I3c352f9594780c78fed46b23824b951ab33977ef
2020-03-30 19:01:05 +00:00
Bonian Chen
81ba423323 [Settings] Replace ImsManager#isWfcEnabledByPlatform() am: c134ef08d4 am: 9c4d1190d9 am: 712c3aa944 am: 7fe5ab1aea am: 65697d3d0e
Change-Id: I0d5dcfc33b0bddacf059d1fb9af559646e32e68a
2020-03-30 19:00:47 +00:00
tim peng
c78d096058 Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92 am: 3e73d0f92c am: d5bdc55390 am: 18d42df80b am: 15e38e66ac
Change-Id: I51152fb023e63d1ad795d095e26434cb35cacee4
2020-03-30 19:00:24 +00:00
Yanting Yang
ad4405d0f8 Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev 2020-03-30 15:15:06 +00: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
ecea133904 Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev 2020-03-30 06:56:16 +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
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
ddd8a8fa92 Merge "Add zero state in output switcher" into rvc-dev 2020-03-30 02:54:33 +00:00
Julia Reynolds
d9fe7b36d3 Merge "Fix broken test" into rvc-dev am: 5a950b763f am: 275f372a72 am: ade39e479f am: 364690d789
Change-Id: I0afef276606a4784d0d33bc09f8c133478185e66
2020-03-27 16:50:57 +00:00
TreeHugger Robot
c9d59be7f2 Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56 am: 98d770345d am: a4a23c4bb8 am: c2864a8d25
Change-Id: Iecd9bdb47eb40c375fae2b6c0cf5145d7cd1525b
2020-03-27 15:54:27 +00:00
Julia Reynolds
5a950b763f Merge "Fix broken test" into rvc-dev 2020-03-27 15:40:47 +00:00
TreeHugger Robot
0821ce8e47 Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406 am: b22f48ea5d am: 0e6dbd0440 am: d86bbbacb7
Change-Id: I0daa3347a2ec6a0a704da492ebba54e9d5020b0e
2020-03-27 15:03:57 +00:00
TreeHugger Robot
50aeb48c56 Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev 2020-03-27 14:43:57 +00:00
TreeHugger Robot
5f886e7406 Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev 2020-03-27 13:53:22 +00:00
TreeHugger Robot
9d0098bcc2 Merge "Add mocked main looper to test" into rvc-dev am: 493bf6697f am: 857392d25b am: 063208c56c am: 8ad2e1dd29
Change-Id: I8210b58e009bc10c82e34ecfc898c633f9aa6ea3
2020-03-27 13:52:23 +00:00
Julia Reynolds
83d0de8d07 Fix broken test
Test: this
Fixes: 152374833
Change-Id: I9065f6b3700fa288cb3fd65ef2b24c2821325e51
2020-03-27 09:36:18 -04:00
Alic Tsai
94a964df39 Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev am: df8b9acc69 am: 4d7db64de0 am: d4ad3f6843 am: b2427ccab5
Change-Id: If3f2ff47dc1d4134ea0190b236f2589d316c79cf
2020-03-27 13:19:20 +00:00
TreeHugger Robot
493bf6697f Merge "Add mocked main looper to test" into rvc-dev 2020-03-27 13:00:21 +00:00
Arc Wang
ebf8ffd8fd [Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib
Bug: 152582093
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConnectionPreferenceControllerTest
Change-Id: I9c0ab0edf5a8e935a2c1afee865bd04304ae6f0f
2020-03-27 20:34:04 +08:00
Tim Peng
9d3092cb7f Add zero state in output switcher
-Update visibility of switcher preference in SoundSetting
-Update visibility of indicator slice in Volume Panel
-Add test case

Bug: 152357002
Test: make -j50 RunSettingsRoboTests
Change-Id: I8aa4e960b72f2c3c26ced78153c4ff620a123f40
2020-03-27 12:31:26 +00:00
Alic Tsai
df8b9acc69 Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev 2020-03-27 12:20:35 +00:00
govenliu
a009e44654 [Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test
Fix 3 unit tests fail in WifiMeteredPreferenceController2Test.

Bug: 151696220
Test: Run make RunSettingsRoboTests ROBOTEST_FILTER=WifiMeteredPreferenceController2Test
Change-Id: I1db81c790929387c4fe74f5adb1d323c23b40546
2020-03-27 19:44:14 +08:00
alictsai
6b76eb0ab6 Device details LCR should be show up " ! " with low battery.
screenshot:
https://screenshot.googleplex.com/f72YS3THutW.png
https://screenshot.googleplex.com/v6uw7XsOs9x.png

Bug: 151187813
Test: make -j42 RunSettingsRoboTests
Change-Id: Iabb4ac54e6f827f54cd7c5512995f185875e4a06
2020-03-27 13:14:01 +08:00
TreeHugger Robot
b137f1af65 Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5 am: 35adcca607 am: 97ac18af4e am: 903b61333c
Change-Id: I8a511744142be14f97f5aa24e685f0e5a9792d4b
2020-03-27 04:22:06 +00:00
TreeHugger Robot
b11a46cfd5 Merge "Update customize button title when state changed" into rvc-dev 2020-03-27 03:17:25 +00:00
Xiangyu/Malcolm Chen
2fab5e95ec Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb am: 90f9b73775 am: e9b0810465
Change-Id: I8afa4b655a8a1096d93828b6854c72979699f8d7
2020-03-27 01:33:28 +00:00
Xiangyu/Malcolm Chen
b0a5905d08 Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev 2020-03-27 00:24:23 +00:00
TreeHugger Robot
ebe03ee645 Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 300b3742fd am: 23188466eb am: ea2948eaaa
Change-Id: I844e7151e9f23a0d1ce6cb6b04432d80bb3a1cbe
2020-03-26 22:10:28 +00:00
TreeHugger Robot
7440bf7034 Merge "DND Bypassing Apps redesign" into rvc-dev 2020-03-26 20:54:33 +00:00
Beverly
37462ff959 Add mocked main looper to test
Toasts were updated in frameworks/base and now will try to get
the main looper when trying to create an AccesssibilityManager. Add this
mock to avoid a null pointer when trying to post a ShadowToast.

Fixes: 151844983
Test: atest make RunSettingsRoboTests7
Change-Id: I4cb6fe44506097b52ce1bb0c8ae7a502d0901f64
2020-03-26 16:26:44 -04:00
Malcolm Chen
b5e7565175 Show footer to notify user no 5G in DSDS mode.
Bug: 151657272
Test: manual and robotests
Change-Id: I5df95528aae12b43a15389b8048f14d9508272f3
2020-03-26 10:31:42 -07:00
Beverly
f707950ee7 DND Bypassing Apps redesign
- Add link in DND Conversations Page to the overall conversations list
Settings page
- Add custom_rule xml pages for custom schedule rule settings for
messages and calls (so the UI is the same as before the message/calls
redesign)
- Change app exceptions to display apps with subtext indicating which
notitfication channels are allowed to bypass dnd (previously, would
display each channel individually)
- Add individual AppBypassDnd channel pages where users can decide which
channels will bypass DND for an app on a single page
(AppChannelsBypassingDndSettings)
- Only remove dnd bypassing apps preferences from the preference list if the list changed,
else just update the preference itself to avoid the list from flashing

Test: make RunSettingsRoboTests7
Bug: 151845457
Change-Id: If12d8921e1405aefb1066acc2ef5c55d216fe47a
2020-03-26 16:49:17 +00:00
TreeHugger Robot
70d4ea36b6 Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: a3368c723d am: 71791d7e02 am: d0ff75aefa
Change-Id: Iff645fdb71c160abb7d38f4fcc56076fc10addc5
2020-03-26 16:02:43 +00:00
Yanting Yang
c54002e192 Add custom site map pairs into SettingsSearchIndexablesProvider
Settings Search need Settings to provide custom site map pairs to build
up full breadcrumb for the search results from ScreenLockSettings,
WallpaperSuggestionActivity and WifiSettings2.

Bug: 147851992
Bug: 151206664
Test: manual test with Settings Search, robotests
Change-Id: Ide6e69b3336af255a388737d46147f2fc2ef9790
2020-03-26 23:04:33 +08:00
TreeHugger Robot
6f16992d3c Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev 2020-03-26 14:57:44 +00:00
Alex Johnston
40417d3efe Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983 am: cf38af6de6 am: bd706ef24f
Change-Id: If66284619518916e18d867a10cbc42a635d69317
2020-03-26 14:10:31 +00:00
Alex Johnston
7bc50ac2ef Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev 2020-03-26 12:58:49 +00:00
TreeHugger Robot
4b341e15ce Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 706a7f19c2 am: c228661d69 am: 4fdff5e5a4
Change-Id: I35263c6eb6521805c542c83664596cc3502fdbea
2020-03-26 12:35:18 +00:00
govenliu
0fc956bc57 [Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint.
Because WifiTracker2 refactoring in framework side is done, Settings App need to refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint.

Bug: 152454787
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest
Change-Id: Ica2fb7e7fcac112140e5d64f3e4193222c974352
2020-03-26 19:48:51 +08:00
TreeHugger Robot
cb90ffafbb Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev 2020-03-26 11:47:07 +00:00
Automerger Merge Worker
987441d843 Merge "Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe" into rvc-d1-dev-plus-aosp am: 6217097f81 am: 3773751627
Change-Id: If7607352a3d7441d357e8fc6b457f1546c16bd04
2020-03-26 10:41:03 +00:00
Alex Johnston
74260a733f Retain FRP data when FR is invoked in Settings
* If the device is an organization-owned managed
  profile device and a FRP policy is set, the
  factory reset protection data is no longer
  erased from factory reset in Settings.

Bug: 148847767
Test: manual testing
Change-Id: Iebaf2446f23626b24db37f5173dc77f9dee25ba9
2020-03-26 10:29:52 +00:00
Jason Chiu
1a9e99b2b1 Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev 2020-03-26 09:47:18 +00:00
TreeHugger Robot
778f3de13f Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712 am: 0dcef519de am: 525a986b38 am: b7ce9d8e3b
Change-Id: Ib260e880248afc3086468b752eddcf9fee951e3a
2020-03-26 06:08:24 +00:00
TreeHugger Robot
ef84083712 Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev 2020-03-26 05:03:03 +00:00
Arc Wang
76740afba2 Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f am: 45aa81bc52 am: 1beb4afce7 am: 2dba198a1b
Change-Id: I65cd00ac3768263d283b7691f1e392eaebeff66b
2020-03-26 04:03:32 +00:00
Jason Chiu
26343b82ee Add metric logs for special cases in Display and Battery page
Bug: 137559984
Test: robotest
Change-Id: I60f6237ac2c533306879f46ee4c25d54002cf0e9
2020-03-26 11:31:39 +08:00