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
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
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
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
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
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
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
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
bf73fdc64a
Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab
am: a5852f43db
...
Change-Id: I3e9efe2798de0f02f5dcafdad82ed889966236ec
2020-03-26 09:05:46 +00:00
Arc Wang
a5852f43db
Merge "Disable metered preference in details page if unable to change" into rvc-dev am: bfcb8058ab
...
Change-Id: I26626866efd6779ef17964b0efff32f2b36bd84b
2020-03-26 08:42:47 +00:00
Arc Wang
bfcb8058ab
Merge "Disable metered preference in details page if unable to change" into rvc-dev
2020-03-26 08:33:39 +00:00
menghanli
250e54cdab
Remove the setSelectable() in ShortcutPrefrence
...
- The title is grey color, not black color as excepted
- The voice access issue is fixed by holder.itemView.setFocusable
Bug: 148989269
Test: manual test
Change-Id: Ie0d8a48cd87e0e28b2833641de265751f2fcfb8c
2020-03-26 06:08:31 +00:00
TreeHugger Robot
fcc478c8af
Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712
am: 0dcef519de
...
Change-Id: I15f3d766f13866805c5cf0bb70c12b6a0a45236b
2020-03-26 05:32:28 +00:00
TreeHugger Robot
0dcef519de
Merge "[Wi-Fi] Remove @Ignore unit tests" into rvc-dev am: ef84083712
...
Change-Id: Ia0a0b185195ac6710b24ff2d4a0e7673bb2b2a58
2020-03-26 05:21:16 +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
f0715dfcbd
Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f
am: 45aa81bc52
...
Change-Id: Ib1b34a836fcd02b625270d2603c2599e09dd1f8d
2020-03-26 03:35:57 +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
Arc Wang
45aa81bc52
Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev am: b3c16d5d4f
...
Change-Id: I6eb5c0ff3e8a2ee6081e501530bffaa43f7ccb8f
2020-03-26 03:19:34 +00:00
Arc Wang
249f629b22
[Wi-Fi] Remove @Ignore unit tests
...
Remove @Ignore in these objects:
ConfigureWifiSettingsTest
TetherServiceTest.java
WifiTetherSecurityPreferenceControllerTest.java
WifiSettings2Test
Bug: 151696220
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I19bdc251d76161218454c1b5f58421efab33cec0
2020-03-26 11:18:27 +08:00
Arc Wang
b3c16d5d4f
Merge "[Wi-Fi] Fix unit test ssidPref_isSubscription_show" into rvc-dev
2020-03-26 03:07:33 +00:00
Quang Luong
b9b09b0474
Disable metered preference in details page if unable to change
...
Wifi networks that cannot change their metered preference (such as
suggested networks) should have their metered preference in the network
details page greyed out and unselectable.
Bug: 151159939
Test: manual - build and visual verification
Change-Id: I8507cd6f39bed5e32884fbf667dffb3f330d8b56
2020-03-25 17:31:44 -07:00
TreeHugger Robot
c7e9a41c3d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0747e57f25
-s ours am: 7b0240898e
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I2b66b94bfbc19e8efb5b28b643ce939aff284d5b
2020-03-26 00:18:05 +00:00
TreeHugger Robot
7b0240898e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0747e57f25
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I5b9ba04e3c149c1162acd9dba49ee1f64d694e0a
2020-03-26 00:03:19 +00:00