Commit Graph

60852 Commits

Author SHA1 Message Date
James.cf Lin
9f8edf2b67 Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type
After setting the network to telephony framework, Setting UI didn't check this network type when show on the UI and show the invalid string.

Bug: 152373426
Test: manual
Change-Id: Ibf280a9905edcb7bd241a1505e85ac5e83993634
2020-03-27 09:54:08 +08:00
Philip P. Moltmann
211c103a2a Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d am: 370b7006f2
Change-Id: I2e23ce74d9a69d7f0f1bc55cda579288c222795f
2020-03-27 01:22:23 +00:00
Xiangyu/Malcolm Chen
7ddf390f0f Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb am: 7dd9a37fab
Change-Id: If3589146aa20756db9696b98e12e1ba68ba68d5c
2020-03-27 01:21:04 +00:00
Philip P. Moltmann
370b7006f2 Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d
Change-Id: I438f78f5935a60fc32bc620cde6b5591e4b12c26
2020-03-27 01:10:08 +00:00
Xiangyu/Malcolm Chen
7dd9a37fab Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb
Change-Id: I66bd7594261e21af7bbc235c70cabb7d327e0a3f
2020-03-27 01:07:14 +00:00
Philip P. Moltmann
d96297e82d Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4
Change-Id: If69c166859f3f8869154c457a6ae8d5985716de5
2020-03-27 00:46:56 +00:00
Xiangyu/Malcolm Chen
0358e150fb Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08
Change-Id: Ib32c94a0f464aa0f95a73611b833664313c48b16
2020-03-27 00:44:04 +00:00
Philip P. Moltmann
1e812204e4 Merge "Only check op in Settings UI" into rvc-dev 2020-03-27 00:25:38 +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
0192f27094 Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 300b3742fd am: 9c7c2f8187
Change-Id: Iaecb9b15a4cb3b754081f856a3203d793323cb4a
2020-03-26 21:58:27 +00:00
TreeHugger Robot
9c7c2f8187 Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 300b3742fd
Change-Id: I437c5ad834486bfe720bfe67cf2c05b844ef3e45
2020-03-26 21:18:23 +00:00
TreeHugger Robot
300b3742fd Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034
Change-Id: If875b3ad36863daff5e408a142caade2b44a3f18
2020-03-26 21:06:31 +00:00
TreeHugger Robot
7440bf7034 Merge "DND Bypassing Apps redesign" into rvc-dev 2020-03-26 20:54:33 +00:00
Curtis Belmonte
66090dce59 Set CDC detail string as subtitle, not description
With an associated change to the UI of the BiometricPrompt credential
view, this commit preserves the current appearance of the CDC auth flow
by promoting the "details" string from the description to the subtitle
field of the prompt.

Test: Manually, using the TestDPC app

Bug: 152053691
Change-Id: If1d773f7f9a7b141520eac70a6cd64c09eb27f20
2020-03-26 13:49:27 -07: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
b1fffc6071 Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: a3368c723d am: cff829902d
Change-Id: I195c78382e551f15deb40c036e21aa5f202a9faa
2020-03-26 15:46:27 +00:00
TreeHugger Robot
cff829902d Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: a3368c723d
Change-Id: Ib7093bc6fff9123f7a0b8eba8b74e8ae399371e8
2020-03-26 15:28:46 +00:00
TreeHugger Robot
a3368c723d Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c
Change-Id: I7fd91faca77022aa748fbfbc41a645260f31aedf
2020-03-26 15:05:35 +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
eb0d29514c Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983 am: 1f95535ead
Change-Id: I2cdc37710191188b232439acfb38bf7a7afb8327
2020-03-26 13:51:57 +00:00
Alex Johnston
1f95535ead Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983
Change-Id: I9345f04b8ca27b370abd74e460e8f63b04b11888
2020-03-26 13:38:56 +00:00
Alex Johnston
bbd65ff983 Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef
Change-Id: I259abdec68097485aa875e802a3e39b6098fba9c
2020-03-26 13:19:57 +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
b3721664fb Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 706a7f19c2 am: 0a6e14020a
Change-Id: If511a167927c7fd19e7a6bd282b5c3c01b813177
2020-03-26 12:20:39 +00:00
TreeHugger Robot
0a6e14020a Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 706a7f19c2
Change-Id: Iee2744338f3f022e8c56a1e548443bd6f055e136
2020-03-26 12:13:28 +00:00
TreeHugger Robot
706a7f19c2 Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb
Change-Id: I42908a919e7d1e5cf3730a3be9ed5005f3dc29a8
2020-03-26 12:00:53 +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
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
Bonian Chen
c28f3e7ac0 Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: ada7e519fd am: 10db7d421b
Change-Id: I93ab595816d0f4ff04da81b3b4563bc92ff71365
2020-03-26 10:24:37 +00:00
Jason Chiu
bdf001ac9c Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe am: defd3892ce
Change-Id: Ib6ae8f9e79a709c50748381f4e599328df0de2f2
2020-03-26 10:24:27 +00:00
Alex Johnston
8d5a0d9e65 Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 5ccaa7e741 am: 8f02175692
Change-Id: Iaf224c87649b15d69a88a8f03be3371270d7a67f
2020-03-26 10:24:16 +00:00
Menghan Li
0793221e42 Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cfbd58ecc6 am: 6292c9bb58
Change-Id: Ie873d921878d46933321356d3f83bbb005dac99a
2020-03-26 10:24:03 +00:00
Bonian Chen
10db7d421b Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3 am: ada7e519fd
Change-Id: I849faf4ef5cc71dafdb04f1c06dac8bd91f33c57
2020-03-26 09:59:17 +00:00
Jason Chiu
defd3892ce Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe
Change-Id: Ia494aa972af088cc2d77091ace9408e79ac6f1d5
2020-03-26 09:59:08 +00:00
Alex Johnston
8f02175692 Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 5ccaa7e741
Change-Id: I52dbe23cbaf8f9b854e16f0e0b540eb8bb193987
2020-03-26 09:59:03 +00:00
Menghan Li
6292c9bb58 Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c am: cfbd58ecc6
Change-Id: Id412d26d34fa35efea678ab1d7b89c18c4fe770b
2020-03-26 09:58:57 +00:00
Bonian Chen
ada7e519fd Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev am: fbe5a997d3
Change-Id: Ibb1ccf9625f7aa7d644bd5f4071068af007507ec
2020-03-26 09:53:41 +00:00
Jason Chiu
920924f5fe Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1
Change-Id: Ib03b1c15256365b1b18f3d0b76e4d567fb3880d0
2020-03-26 09:53:28 +00:00
Bonian Chen
fbe5a997d3 Merge "[Settings] Change the restart policy for MobileNetworkActivity" into rvc-dev 2020-03-26 09:47:54 +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
Bonian Chen
d412e06c39 [Settings] Change the restart policy for MobileNetworkActivity
Prevent recreating the fragment in MobileNetworkActivity when the
subId is the same.

Bug: 141833767
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: I8167781fb462efa310a5d6bac76d880dbc9b6bfc
2020-03-26 17:44:17 +08:00
Alex Johnston
5ccaa7e741 Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983
Change-Id: Ieeff9f5cd40716539fc9d13fb81701d1bcd7b3d9
2020-03-26 09:42:05 +00:00
Menghan Li
cfbd58ecc6 Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev am: b751a12a1c
Change-Id: I7656da884d4d656b7d4cba9b12bcf017b3e5edcb
2020-03-26 09:41:57 +00:00
Alex Johnston
a9bd149983 Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev 2020-03-26 09:40:20 +00:00
Menghan Li
b751a12a1c Merge "Remove the setSelectable() in ShortcutPrefrence" into rvc-dev 2020-03-26 09:32:14 +00:00
Arc Wang
e919405e1d Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab am: a5852f43db am: bf73fdc64a
Change-Id: I99c1eb5d132302d8e9bb445b3b85c791f284bc88
2020-03-26 09:19:14 +00:00