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
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
TreeHugger Robot
3421f934c8
Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: 6b37d4d4f1
...
Change-Id: Ie02d655b3334da8e169a017f638f3c38bba034a3
2020-03-26 15:28:47 +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
71791d7e02
Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c am: a3368c723d
...
Change-Id: I550cc778b65683cbf2aed3441db7270d00021213
2020-03-26 15:28:26 +00:00
TreeHugger Robot
6b37d4d4f1
Merge "[Wi-Fi] Refactor AddAppNetworksFragment to use WifiEntry but not AccessPoint." into rvc-dev am: 6f16992d3c
...
Change-Id: I8e2d6cf302840e650f19caf6290f49542bcdd5f0
2020-03-26 15:05:36 +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
9bd2f5b736
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983 am: 1f95535ead am: eb0d29514c am: 1b20885f5b
...
Change-Id: Icf545616e6e7d2184c5e0ea366523536f9479a1d
2020-03-26 14:12:24 +00:00
Automerger Merge Worker
ed64fbf53a
Merge "Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: 47415a0a45" into rvc-d1-dev-plus-aosp am: 04be843ab3 am: 90da510597
...
Change-Id: Id137c8c1654873601b5ceddb5883e03fd3cb13e9
2020-03-26 14:11:03 +00:00
Alex Johnston
1b20885f5b
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983 am: 1f95535ead am: eb0d29514c
...
Change-Id: Iffb8b725b14e404c3a62ad58d17af075ac1289d5
2020-03-26 14:10:48 +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
Automerger Merge Worker
90da510597
Merge "Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: 47415a0a45" into rvc-d1-dev-plus-aosp am: 04be843ab3
...
Change-Id: I984611ffa131e55ed89c6ac5d17c203417b4ad79
2020-03-26 13:52:23 +00:00
Alex Johnston
bd706ef24f
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983 am: cf38af6de6
...
Change-Id: I76b103fa54c7e357e3fc941b704b0d6ed010f2e7
2020-03-26 13:52:06 +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
Automerger Merge Worker
04be843ab3
Merge "Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: 47415a0a45" into rvc-d1-dev-plus-aosp
2020-03-26 13:39:05 +00:00
Alex Johnston
ff02f246c9
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: 47415a0a45
...
Change-Id: I7ad8727e62802411caea66fab8e81decd6878abb
2020-03-26 13:39:00 +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
cf38af6de6
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef am: bbd65ff983
...
Change-Id: Ic438fc8b8ba8a62cb718f18a5edb83066f132efe
2020-03-26 13:38:54 +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
47415a0a45
Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev am: 7bc50ac2ef
...
Change-Id: Ib57653e7b2937b6375b2aa287622a900083e723c
2020-03-26 13:19:43 +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
e5ad60c411
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 706a7f19c2 am: 0a6e14020a am: b3721664fb am: d3ce7d66c9
...
Change-Id: Ib99c28d4e8f46b31212e643eb9d3e7eb16e66a8a
2020-03-26 12:41:58 +00:00
TreeHugger Robot
d3ce7d66c9
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 706a7f19c2 am: 0a6e14020a am: b3721664fb
...
Change-Id: Id6847d9bf7064f43a323f60720c44f193c8962bb
2020-03-26 12:35:35 +00:00
TreeHugger Robot
2e5279048d
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 6b754f1582 am: 52c1c77d93 am: b64699a400
...
Change-Id: I862b8b9adc8852968067786f085afcb65f1c5a3f
2020-03-26 12:35:26 +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
TreeHugger Robot
b64699a400
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 6b754f1582 am: 52c1c77d93
...
Change-Id: I3e32425a71ed7ddefd3ceaec3bd6d977d5635581
2020-03-26 12:20:44 +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
4fdff5e5a4
Merge "Add unit tests for policy transparency on Fact Auth settings" into rvc-dev am: cb90ffafbb am: 706a7f19c2 am: c228661d69
...
Change-Id: Icc675a8ccff6b3c7b63d8f15d913dc11e58afd95
2020-03-26 12:20:38 +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
