TreeHugger Robot
8e19b032b2
Merge "Updates main page for Do Not Disturb"
2020-03-23 02:52:46 +00:00
Beverly
5cfb5aa52d
Updates main page for Do Not Disturb
...
Settings > Sound > Do Not Disturb
- Update strings, more descriptive summary for DND Apps summary
- Move top-level ordering of preferences
- Remove old unused DND strings
Test: make RunSettingsRoboTests7
Test: make ROBOTEST_FILTER=ZenModeBypassingAppsPreferenceControllerTest RunSettingsRoboTests
Test: manual
Bug: 151845457
Change-Id: I9c23c558a9d764702e966d22e5c6e5c5425e4d32
2020-03-23 01:41:45 +00:00
Stanley Wang
6ce9be0f96
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875
am: 76c2ec77e3
am: 3277ad0cf6
am: bfaf9af026
am: c97b40924b
...
Change-Id: I0e7c94c953b732821ff083b731207976e3469322
2020-03-21 06:48:23 +00:00
Stanley Wang
815411c78d
[automerger skipped] Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c
am: a8d78418c0
am: 83d06ef1f4
am: adc4662924
-s ours am: 5bedf5a2dd
-s ours
...
am skip reason: Change-Id Id2d89287fe36240d71de2092daac44a5da9be282 with SHA-1 58f9ae3096
is in history
Change-Id: I3899aee3601d28bb9f2f0db0276260950ca802e9
2020-03-21 06:48:17 +00:00
Stanley Wang
f9c7231f32
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875
am: 78e9bdf9b7
am: ef2bc18b14
am: f6d654d16a
...
Change-Id: I3859c8b4b1c6fb60d36630f4f3662d932ff9f140
2020-03-21 06:48:10 +00:00
Stanley Wang
6301c940a1
[automerger skipped] Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c
am: 6c6837424d
-s ours am: ba8e20218e
-s ours am: 39e41746e2
-s ours
...
am skip reason: Change-Id Id2d89287fe36240d71de2092daac44a5da9be282 with SHA-1 58f9ae3096
is in history
Change-Id: Idf975befc9c69241753d207aba9f9d17b80c6677
2020-03-21 06:48:04 +00:00
Stanley Wang
8458bce360
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875
am: 76c2ec77e3
am: b9289ea2ef
am: cc773fc5d9
...
Change-Id: I47ac06c816e854398b1e7c0b62c89acd508bf462
2020-03-21 06:47:58 +00:00
Stanley Wang
b7535851bb
[automerger skipped] Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c
am: a8d78418c0
am: ca95aaae17
am: a56081dff6
-s ours
...
am skip reason: Change-Id Id2d89287fe36240d71de2092daac44a5da9be282 with SHA-1 8694c34e09
is in history
Change-Id: Iad3de88305d13e965beb47e908d112475f05e231
2020-03-21 06:47:52 +00:00
Stanley Wang
c97b40924b
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875
am: 76c2ec77e3
am: 3277ad0cf6
am: bfaf9af026
...
Change-Id: I6ca4256ba736d8675d0fc4c4430f9c94813530c5
2020-03-21 06:41:41 +00:00
Stanley Wang
5bedf5a2dd
[automerger skipped] Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c
am: a8d78418c0
am: 83d06ef1f4
am: adc4662924
-s ours
...
am skip reason: Change-Id Id2d89287fe36240d71de2092daac44a5da9be282 with SHA-1 58f9ae3096
is in history
Change-Id: Ic4d73cf339a8d51e5d0f4dbd3a83bc4d8dc38def
2020-03-21 06:41:31 +00:00
Stanley Wang
f6d654d16a
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875
am: 78e9bdf9b7
am: ef2bc18b14
...
Change-Id: Ic157f20dbb2695ed1a86262f3e510e1e2c2899b1
2020-03-21 06:29:59 +00:00
Stanley Wang
39e41746e2
[automerger skipped] Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c
am: 6c6837424d
-s ours am: ba8e20218e
-s ours
...
am skip reason: Change-Id Id2d89287fe36240d71de2092daac44a5da9be282 with SHA-1 58f9ae3096
is in history
Change-Id: I8861d530217040024612eff9bceed68d5a53eb2d
2020-03-21 06:29:53 +00:00
Stanley Wang
cc773fc5d9
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875
am: 76c2ec77e3
am: b9289ea2ef
...
Change-Id: I70dfd7ac286182637fb9516f61c5505f683ff3e9
2020-03-21 06:29:45 +00:00
Stanley Wang
a56081dff6
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c
am: a8d78418c0
am: ca95aaae17
...
Change-Id: I76b5095d8b6badcba8e075107278724781d363c2
2020-03-21 06:29:15 +00:00
Stanley Wang
bfaf9af026
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875
am: 76c2ec77e3
am: 3277ad0cf6
...
Change-Id: Ic8a90fee9e0e5741046b17762161062bc140d049
2020-03-21 06:27:58 +00:00
Stanley Wang
adc4662924
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c
am: a8d78418c0
am: 83d06ef1f4
...
Change-Id: Ia58b6202a8e5abba5b39a0887ee491ffd8679ada
2020-03-21 06:27:19 +00:00
Stanley Wang
ef2bc18b14
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875
am: 78e9bdf9b7
...
Change-Id: I22cb0a9367e8ecf02b73e5507e735d90aeff61fc
2020-03-21 06:05:47 +00:00
Stanley Wang
3277ad0cf6
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875
am: 76c2ec77e3
...
Change-Id: Ida303b4590886c38e90f8e233920db186102269f
2020-03-21 06:05:27 +00:00
Stanley Wang
ba8e20218e
[automerger skipped] Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c
am: 6c6837424d
-s ours
...
am skip reason: Change-Id Id2d89287fe36240d71de2092daac44a5da9be282 with SHA-1 58f9ae3096
is in history
Change-Id: I2622a960387c4556e82b90ad0155b0b18b372625
2020-03-21 06:05:13 +00:00
Stanley Wang
83d06ef1f4
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c
am: a8d78418c0
...
Change-Id: Ib375c8aee3658797113370493feb7e7d527a8939
2020-03-21 06:04:18 +00:00
Stanley Wang
b9289ea2ef
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875
am: 76c2ec77e3
...
Change-Id: I1dfbb0dd95d894ff970b11f858a6ca69cf621405
2020-03-21 06:04:00 +00:00
Stanley Wang
ca95aaae17
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c
am: a8d78418c0
...
Change-Id: Ie23a43915338769acbaebc4e3547397afd95a4b6
2020-03-21 06:03:47 +00:00
Stanley Wang
78e9bdf9b7
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875
...
Change-Id: Iaeda191d1877ae40f0b3911cea911a876da97f0b
2020-03-21 05:49:32 +00:00
Stanley Wang
6c6837424d
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c
...
Change-Id: If6f30aa662c0fd4696722df8e7f31b49b7929157
2020-03-21 05:49:25 +00:00
Stanley Wang
76c2ec77e3
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875
...
Change-Id: I35d894cd31031fa8019ca7b6f1552dcd0b1c1412
2020-03-21 05:49:13 +00:00
Stanley Wang
a8d78418c0
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c
...
Change-Id: I87df8f40a569b89d2275d5ce38e379eb3f9f96b9
2020-03-21 05:48:43 +00:00
Stanley Wang
fb39c70875
Merge "Update Settings subtexts for R." into rvc-dev
2020-03-21 05:30:25 +00:00
Stanley Wang
61e7d2c24c
Merge "Update Settings strings for R." into rvc-dev
2020-03-21 05:30:00 +00:00
TreeHugger Robot
9a238e65a7
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b
am: 17c6211285
am: 3baeb593c7
am: c8fcfd82d9
am: c459111b66
...
Change-Id: I5c891a6b4b002eeefa44d41592dfdf98621b61d5
2020-03-21 04:10:27 +00:00
TreeHugger Robot
507268f721
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b
am: 981d9e37cb
am: 0677fed3e5
am: 2df4eb3518
...
Change-Id: Id7dd8cfa98291e0d8599cf2d00afb63662cdadf7
2020-03-21 04:09:47 +00:00
TreeHugger Robot
5d418f3082
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b
am: 17c6211285
am: 3e87cf919d
am: 1e734997b0
...
Change-Id: I565e9b04d0f1f1b6429513847f10065e8fd44d97
2020-03-21 04:08:52 +00:00
TreeHugger Robot
c459111b66
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b
am: 17c6211285
am: 3baeb593c7
am: c8fcfd82d9
...
Change-Id: If4f129050b9b8fb22afbc75a241622b2ccba4c05
2020-03-21 04:07:48 +00:00
TreeHugger Robot
c8fcfd82d9
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b
am: 17c6211285
am: 3baeb593c7
...
Change-Id: I42a007cfacde7d1ae1fc91220866afe8fd13538b
2020-03-21 03:56:12 +00:00
TreeHugger Robot
2df4eb3518
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b
am: 981d9e37cb
am: 0677fed3e5
...
Change-Id: Idbbbe9977b25d038137fb0ab6ac1a6170e3d88c7
2020-03-21 03:55:14 +00:00
TreeHugger Robot
1e734997b0
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b
am: 17c6211285
am: 3e87cf919d
...
Change-Id: Ib9efb227322d05a7560edbb0e16b5b8d28880563
2020-03-21 03:54:13 +00:00
TreeHugger Robot
3baeb593c7
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b
am: 17c6211285
...
Change-Id: I193e8c5cb34efe53d9b62953fe8c3cddca485707
2020-03-21 03:39:45 +00:00
TreeHugger Robot
0677fed3e5
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b
am: 981d9e37cb
...
Change-Id: Ie18bb3d1d1cb3a9e376ff7fb8ab88b1cffd4adfa
2020-03-21 03:38:38 +00:00
TreeHugger Robot
3e87cf919d
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b
am: 17c6211285
...
Change-Id: I7b84db149a1410e1fb495b493690c7ae98d73dbb
2020-03-21 03:38:12 +00:00
TreeHugger Robot
17c6211285
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b
...
Change-Id: I5b2b39c33b525407b1b6da300dc853704f727061
2020-03-21 03:14:30 +00:00
TreeHugger Robot
981d9e37cb
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b
...
Change-Id: Idd8c529261fd853b5aba28f88139008ea489aa40
2020-03-21 03:14:28 +00:00
TreeHugger Robot
a4e3d5ef8b
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev
2020-03-21 02:58:15 +00:00
TreeHugger Robot
d6fc4c1c21
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd
am: cdca282167
am: 10b3981f72
am: 60dfe57f61
am: d5c0c27497
...
Change-Id: I2a8dbdadeed8b410949c7dd1761170e010b9715f
2020-03-21 02:45:12 +00:00
TreeHugger Robot
8e1a1dddf1
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd
am: a37f3bc902
am: 4fc06ea996
am: b890ef52c0
...
Change-Id: I20ac185f1af2ed83a796b1369cab583f468c2a1c
2020-03-21 02:43:15 +00:00
TreeHugger Robot
d5c0c27497
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd
am: cdca282167
am: 10b3981f72
am: 60dfe57f61
...
Change-Id: I62507ccb2eff8b859253199813980a4d4c35cd2e
2020-03-21 02:42:18 +00:00
TreeHugger Robot
d30c1c658c
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd
am: cdca282167
am: 08f2027965
am: 715707acb6
...
Change-Id: I14d75c545804cd67eac60cbc340bc34b9717b3fe
2020-03-21 02:41:07 +00:00
TreeHugger Robot
b890ef52c0
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd
am: a37f3bc902
am: 4fc06ea996
...
Change-Id: I0b012f2d70d3a37e6ab2b6bc8ccced69c5ac9674
2020-03-21 02:25:12 +00:00
TreeHugger Robot
715707acb6
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd
am: cdca282167
am: 08f2027965
...
Change-Id: Iea8225d604f7f0a6528a7fa886bb373dd9396245
2020-03-21 02:24:57 +00:00
TreeHugger Robot
60dfe57f61
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd
am: cdca282167
am: 10b3981f72
...
Change-Id: Ic40439ac6621949dc7a00be354adf0a04bd2cddd
2020-03-21 02:24:51 +00:00
TreeHugger Robot
4fc06ea996
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd
am: a37f3bc902
...
Change-Id: Ia1347ce6ba421352fd64622b90f6165eba79ebe5
2020-03-21 02:14:31 +00:00
TreeHugger Robot
10b3981f72
Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd
am: cdca282167
...
Change-Id: I26026f93904a147300c843625170d2585d68b910
2020-03-21 02:14:16 +00:00