Philip P. Moltmann
bd4ef8eb3a
Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d am: 370b7006f2 am: 211c103a2a am: 26551165d3
...
Change-Id: I2876023ccb543cc79b360d2ac312466abd4deb95
2020-03-27 01:41:16 +00:00
Xiangyu/Malcolm Chen
1964cc45e3
Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb am: 7dd9a37fab am: 7ddf390f0f am: 1da1106869
...
Change-Id: Ic11ee65380d65b91c2067ecc57ead1cec224eb09
2020-03-27 01:39:51 +00:00
Philip P. Moltmann
4749e591dd
Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: e7466934b7 am: 6ce4efc2a1 am: 6ed0278e1f
...
Change-Id: Iac5d2c12e453f463ff896f5f67742525496aced1
2020-03-27 01:39:02 +00:00
Philip P. Moltmann
5f242c05e3
Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d am: 716ff8c256 am: b8e47e2ad5
...
Change-Id: Ibb897c94ae09966c3c9983e504b14c2c983ab04e
2020-03-27 01:37:05 +00:00
Automerger Merge Worker
1940ce88a0
Merge "Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0e4d8aa531" into rvc-d1-dev-plus-aosp am: 17ec2206f3 am: f0def7ceaf
...
Change-Id: Id54d6bb071fa7dbd28bd6356e6d0a7ec0b3355f5
2020-03-27 01:34:45 +00:00
Philip P. Moltmann
26551165d3
Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d am: 370b7006f2 am: 211c103a2a
...
Change-Id: Ia4288ecc0ca1ea1b746f20f6d482679e58d35bc5
2020-03-27 01:33:44 +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
1da1106869
Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb am: 7dd9a37fab am: 7ddf390f0f
...
Change-Id: Ic2af4512bc4736acb7231856e5dc6632759672e7
2020-03-27 01:33:08 +00:00
Philip P. Moltmann
6ed0278e1f
Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: e7466934b7 am: 6ce4efc2a1
...
Change-Id: I80484612731766437a9241c0aad6ecb3b8924100
2020-03-27 01:22:42 +00: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
Philip P. Moltmann
b8e47e2ad5
Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d am: 716ff8c256
...
Change-Id: I84eeb20ce13d2d5139a7deb6c00ddad83cda6bc6
2020-03-27 01:21:47 +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
Automerger Merge Worker
f0def7ceaf
Merge "Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0e4d8aa531" into rvc-d1-dev-plus-aosp am: 17ec2206f3
...
Change-Id: Ib19b6434590732f77b36c2f6a929dc11dbaa57dd
2020-03-27 01:18:34 +00:00
Xiangyu/Malcolm Chen
e9b0810465
Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb am: 90f9b73775
...
Change-Id: I01062a8b381ee5cf318ee4912905f7e49d5548a3
2020-03-27 01:16:37 +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
6ce4efc2a1
Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: e7466934b7
...
Change-Id: I1fa90dc38669d315f63405a2f14deab2ed906dab
2020-03-27 00:59:51 +00:00
Philip P. Moltmann
716ff8c256
Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d
...
Change-Id: Ie7713b153c189a48770f91d85e6b4562d7bd1842
2020-03-27 00:59:36 +00:00
Automerger Merge Worker
17ec2206f3
Merge "Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0e4d8aa531" into rvc-d1-dev-plus-aosp
2020-03-27 00:58:34 +00:00
Xiangyu/Malcolm Chen
a99132ab3a
Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0e4d8aa531
...
Change-Id: Iaaf9a087b05d493b1b53a219d9cab9ca6398998c
2020-03-27 00:58:27 +00:00
Xiangyu/Malcolm Chen
90f9b73775
Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb
...
Change-Id: If6e8b2f0b0e6b4031bf850577849ce4bbdf6fede
2020-03-27 00:58:12 +00:00
Philip P. Moltmann
e7466934b7
Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4
...
Change-Id: I3a36b7b0561cb630c115e000294e32fe378a94a1
2020-03-27 00:47:23 +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
0e4d8aa531
Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08
...
Change-Id: Id7cec642292dab8ec19bb33ab8247d7f3b0d2865
2020-03-27 00:44:30 +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
ef0b84e8cb
Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 300b3742fd am: 9c7c2f8187 am: 0192f27094 am: 1022701794
...
Change-Id: I9a6475dd63ad59328b18208c4dc9a77840d24fe5
2020-03-26 22:13:55 +00:00
TreeHugger Robot
877c193d46
Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 908fff9099 am: a93ba8895e am: 0a6c73e3bd
...
Change-Id: I41e741309d110012f2b76893bbed0026d609d1cc
2020-03-26 22:12:29 +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
1022701794
Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 300b3742fd am: 9c7c2f8187 am: 0192f27094
...
Change-Id: I4cf13e2f1fd4374cec8bbca1bb25cab580655860
2020-03-26 22:09:54 +00:00
TreeHugger Robot
0a6c73e3bd
Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 908fff9099 am: a93ba8895e
...
Change-Id: I50c3c982de1b46c37fed6dede432853b8c288164
2020-03-26 22:00:25 +00:00
TreeHugger Robot
ea2948eaaa
Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 300b3742fd am: 23188466eb
...
Change-Id: I8206d4655aacb380376afc25c1f646f18d589415
2020-03-26 21:59:10 +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
a93ba8895e
Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 908fff9099
...
Change-Id: I2cf85a16e67b131c5383283dcff291a74d80f9d8
2020-03-26 21:18:34 +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
23188466eb
Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034 am: 300b3742fd
...
Change-Id: I768ea3ffd82421631d17f04cf3d857cc8250da08
2020-03-26 21:18:13 +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
908fff9099
Merge "DND Bypassing Apps redesign" into rvc-dev am: 7440bf7034
...
Change-Id: Ibc83796466da9e39440c205d47ba059b4908175f
2020-03-26 21:06:30 +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
3ae744b420
Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: a3368c723d am: cff829902d am: b1fffc6071 am: d89dda533b
...
Change-Id: I6fe2fd123ba159d211632bdb809ba9886c471542
2020-03-26 16:22:09 +00:00
TreeHugger Robot
d89dda533b
Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: a3368c723d am: cff829902d am: b1fffc6071
...
Change-Id: Idbbbbb6b6a61724146faf56357420c21acd07ba1
2020-03-26 16:11:06 +00:00
Automerger Merge Worker
b9e66db60f
Merge "Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: 6b37d4d4f1" into rvc-d1-dev-plus-aosp am: ea7b3d94a8 am: cde2d3981b
...
Change-Id: I008270b3396c1db0a461ac62016fc59ff5e5366e
2020-03-26 16:03:02 +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
Automerger Merge Worker
cde2d3981b
Merge "Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: 6b37d4d4f1" into rvc-d1-dev-plus-aosp am: ea7b3d94a8
...
Change-Id: Ibeba7ab5d24d4c88bee7fc2e5415c0c0f0ae1887
2020-03-26 15:47:39 +00:00
TreeHugger Robot
d0ff75aefa
Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: a3368c723d am: 71791d7e02
...
Change-Id: I6c1483bd9f3c28c67f71ccf3365def35b11d10fb
2020-03-26 15:47:27 +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
Automerger Merge Worker
ea7b3d94a8
Merge "Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: 6b37d4d4f1" into rvc-d1-dev-plus-aosp
2020-03-26 15:28:58 +00:00
