Julia Reynolds
f04c167475
Fix overlapping importance icons
...
We can't re-use the same background because not
all of the buttons are the same size
Test: manual
Bug: 161297551
Change-Id: I8583cb2fbbcb971ab5819eefd84dde3f7c3b4bdf
2020-07-16 10:19:27 -04:00
timhypeng
b5527e329b
Fix test case fail
...
Bug: 160956047
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib975e906aefc44c59a8465a586832d92664f5147
2020-07-13 10:29:11 +08:00
TreeHugger Robot
8a2468447b
Merge "Restore original importance when unblocking notif channel"
2020-07-09 15:47:01 +00:00
Julia Reynolds
e2a8266328
Restore original importance when unblocking notif channel
...
Test: atest
Bug: 62355992
Change-Id: I5d764d0ade68b2ce5708ae79e9ef488ab57bb141
2020-07-08 15:09:41 -04:00
Beverly
c549280a33
Replace zen setting plurals with MessageFormat
...
For better translations. See go/android-i18n-plurals.
Test: manual
Test: make RunSettingsRoboTests7
Fixes: 156651436
Change-Id: Ic82140b81bf49f071291d2824fa45d310de238ae
2020-07-06 11:25:00 -04:00
TreeHugger Robot
3e032c93b5
Merge "Update notification subtext" into rvc-dev am: 141153e789 am: 385e9be34f am: 73ebf35f81 am: 399e5e3d7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342
Change-Id: I2309a23cb2c461d5893571ef63561888ec14afcb
2020-06-19 02:04:33 +00:00
Alex Mang
4368da2e23
Merge "Add flag to allow NAS to indicate adjustments on notifications and solicit feedback."
2020-06-18 20:38:06 +00:00
Julia Reynolds
03a42fd844
Update notification subtext
...
Test: atest
Fixes: 159274325
Change-Id: Iff98b4b056bf7a3c6386063d6588a26607ee7525
2020-06-18 16:25:38 -04:00
Julia Reynolds
8dd2ffb334
Merge "Only show Bubbles link for messaging apps" into rvc-dev am: 73b6bfc1e8 am: 9be31ce9ef am: 16444e9a70 am: 21b2d1d714
...
Change-Id: Iad84a70f650ac477ec3fd07e1449fb17471f4eeb
2020-05-31 19:52:58 +00:00
Julia Reynolds
3d613bb6c9
Only show Bubbles link for messaging apps
...
Apps that have sent at least one valid conversation
Test: manual, atest
Fixes: 156033178
Change-Id: If4fff6810f2e390ba0ad0f7587b8d8c2d5819c93
2020-05-29 14:51:06 -04:00
Julia Reynolds
087c3f5bf6
Update conversation-related strings am: 9e78ec75d1 am: 61e956443d am: 423fdfa8bb am: 0051068fcb
...
Change-Id: I5da6a7997f960ca6a112ce6958c20197447a4846
2020-05-22 12:31:26 +00:00
Julia Reynolds
9e78ec75d1
Update conversation-related strings
...
Test: atest
Bug: 157215227
Change-Id: Iba279bb285e53918a1e1b43c04d6ec7576cd48a0
2020-05-21 20:49:53 +00:00
Julia Reynolds
75aba32e27
Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d am: a98f5e1445 am: 25d1b428bf
...
Change-Id: Iddbf702265aa3c17cdd7ad9997f2b76aa22d0b36
2020-05-21 20:11:16 +00:00
Julia Reynolds
04d50c9709
Switch from shortlabel to label
...
Test: atest
Bug: 157140669
Change-Id: Iebcb2f076fef33b6f3ce16326af4e4c5c6770459
2020-05-20 14:23:43 -04:00
TreeHugger Robot
07c525c487
Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: 0217cbd19e am: 2806494683 am: e8d332dc54
...
Change-Id: I035d09faa19a1269adf361a5e0cfdb8c9d74eb8b
2020-05-16 00:06:05 +00:00
Julia Reynolds
32d189fbfe
Add settings for apps that don't use full conversations am: eca1e4d197 am: 33e6708f75 am: 2ae175233b am: 6a87cdcd50
...
Change-Id: Ic01e59c4462f51128cd9b425075087459add3057
2020-05-16 00:06:02 +00:00
Julia Reynolds
cd237ccf9b
Update conversation launch point
...
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
Fixes: 156670585
Change-Id: I31f306d1b7d480ac0ef0cc4a5f7e66efe528383d
2020-05-15 19:40:56 +00:00
Julia Reynolds
eca1e4d197
Add settings for apps that don't use full conversations
...
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
Fixes: 155276427
Change-Id: Ie145b9cdc9555d4676a8bd225427abc9222f31c5
2020-05-15 19:38:14 +00:00
tim peng
d499737462
Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1 am: c5531ce6e8 am: d9370a1e27 am: 143db43ff4
...
Change-Id: I345f7f76088d9667515da8133315d74c6348e25a
2020-05-07 03:27:11 +00:00
Tim Peng
2ef5a87f36
Update "Play media to" to "Play <APP> on"
...
-Update in Volume panel and Sound settings
-Add test cases
Bug: 155345595
Test: make -j50 RunSettingsRoboTests
Change-Id: Id971038ddbf22924a747e4e1be3597face7ec6ed
2020-05-06 10:17:15 +08:00
Automerger Merge Worker
693186aa5f
Merge "Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9 am: 8e81088c03" into rvc-d1-dev-plus-aosp am: 99b7c321f9 am: ad01553db3
...
Change-Id: Id9c15e44517cb7752c9e8509e7ac4fa4845efde6
2020-05-04 09:39:46 +00:00
tim peng
1424b594c9
Merge "Modify rule of remote media session UI" into rvc-dev
2020-05-04 08:47:41 +00:00
Tim Peng
e9b91f08c4
Modify rule of remote media session UI
...
-Add preference by remote session in Sound Setting
-Add slice item by remote session in Volume panel
-Replace media device data with media session data
-Add test case
Bug: 154918214
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib1c873c9f99eebcba377f4115c4b9b4297b20c3d
2020-05-04 12:21:20 +08:00
Julia Reynolds
0f331cc786
Fix bubble tests am: 99b363fb18 am: d4045296ba am: 90d41ad625 am: e546135a18
...
Change-Id: I62ebb3f11b46aeadfbaeec9a17921852abf8538e
2020-04-29 16:24:30 +00:00
Julia Reynolds
99b363fb18
Fix bubble tests
...
Test: atest
Fixes: 155239388
Change-Id: I8a32098b9a36ea1c8eabaf235b37d1e190419937
2020-04-29 13:58:46 +00:00
Mady Mellor
b09f9f37aa
Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: 0ffd6c0b17 am: e62939420e am: fad77d3ffd
...
Change-Id: I47ec347fffc1a083e376c6bea445da3d2a9d4fa2
2020-04-28 23:11:38 +00:00
Mady Mellor
a27918494f
Add list of selected/excluded convos to bubble settings
...
* Some changes to extend AppConversationListPrefController
* When a user removes something from the selected or
excluded list that resets the channel setting
Bug: 148619540
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="Bubble"
Change-Id: I7a9ed7b70208dbdefca6c3c09d34d55c65f06408
2020-04-28 13:18:56 -07:00
TreeHugger Robot
a9ba9c02a5
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 7cf00c8a97 am: 6471bef55c am: 0009d317fa
...
Change-Id: I99e80f51c027bc0239a008fa6b81df7ffb3d6c9a
2020-04-28 03:57:40 +00:00
kholoud mohamed
c5b78e072f
Fix broken tests in RedactionInterstitialTest
...
correctly set the user as managed profile after the
implementation for ShadowUserManager#isManagedProfile changed.
Fixes: 154567856
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.notification.RedactionInterstitialTest
Change-Id: I14472913391c3986c5f27391023e396b7b64aad3
2020-04-27 15:25:42 +01:00
TreeHugger Robot
843e500256
Merge "Revert "Ignore a lot of failed test cases on Settings"" into rvc-dev am: 3c4b5d2a2e am: 195adf8adf am: d941a0bc5b am: f38c5c6b6e
...
Change-Id: I61faae9ced543989acca6ea34297668bf10e67db
2020-04-22 21:55:34 +00:00
Jeff Sharkey
1a703c4846
Revert "Ignore a lot of failed test cases on Settings"
...
This reverts commit d9d08ebd4f
2020-04-22 18:08:41 +00:00
TreeHugger Robot
ba6e6c13e3
Merge "Ignore a lot of failed test cases on Settings" into rvc-dev am: f90d2b2bca am: 93d784e3b1 am: 9ff792d9a6 am: c61ab0a2dc
...
Change-Id: I29397a63465951bedd79b351473d0963f63aebd4
2020-04-22 08:25:41 +00:00
Sunny Shao
d9d08ebd4f
Ignore a lot of failed test cases on Settings
...
Bug: 154667181
Bug: 154667917
Bug: 154667745
Bug: 154668517
Bug: 154667730
Bug: 154668805
Bug: 154669079
Bug: 154668589
Bug: 154670012
Bug: 154669528
Bug: 154668369
Bug: 154670613
Bug: 154669869
Test: make RunSettingsRoboTests
Change-Id: I37bf61fcd965b821e0198c695720ff826c8417b9
2020-04-22 12:51:30 +08:00
TreeHugger Robot
e7da00e135
Merge "Update ZenModeSettingsTest" into rvc-dev am: 0ff0929e0f am: 8d53e5888d am: c97178761f am: cf272edf73
...
Change-Id: I7a2cf2bceed0e3200297b038388108eac2207b0b
2020-04-21 15:10:08 +00:00
TreeHugger Robot
0ff0929e0f
Merge "Update ZenModeSettingsTest" into rvc-dev
2020-04-21 14:12:15 +00:00
Beverly
d796da16f0
Update ZenModeSettingsTest
...
String was updated
Test: make ROBOTEST_FILTER=ZenModeSettingsTest RunSettingsRoboTests
Fixes: 154568594
Change-Id: Ia67f7ff2e3692cc4f40b87e94e3d3952002a9e87
2020-04-21 09:31:16 -04:00
TreeHugger Robot
ceb7b66664
Merge "Ignore a lot of failed roboletric test cases" into rvc-dev am: a10969bfc5 am: 5362a1e8cd am: cbbb819ae3 am: 752571b52e
...
Change-Id: Ibe8c1473fc8c5d87d53e71c4bb3b2a74bde09e6a
2020-04-21 09:48:58 +00:00
Sunny Shao
5094248487
Ignore a lot of failed roboletric test cases
...
Bug: 154568213
Bug: 154568594
Bug: 154567856
Bug: 154566065
Bug: 154566012
Bug: 154566007
Bug: 154564960
Bug: 154564366
Bug: 154564361
Bug: 154564994
Bug: 154563784
Bug: 154564243
Bug: 154563562
Bug: 154564136
Bug: 154564211
Bug: 154563778
Bug: 154563910
Bug: 154562715
Bug: 154563116
Bug: 154562264
Bug: 154562785
Bug: 154563290
Bug: 154561690
Bug: 154562361
Bug: 154560878
Bug: 154560145
Test: make RunSettingsRoboTests
Change-Id: I220540d519b222ad7d3b69070a9262bb25f22d23
2020-04-21 15:00:30 +08:00
Julia Reynolds
37e316a427
Update configure notifications screen am: f43cf08634 am: b84e194474 am: fa8f3a84dd am: 245a2af879
...
Change-Id: I572c46d4847973262e28171256ee6529f5f5d8c6
2020-04-17 22:13:09 +00:00
Julia Reynolds
f43cf08634
Update configure notifications screen
...
Test: atest
Bug: 153150072
Change-Id: I99ebe2cad5036a154c40bce54dbd6ddbd23c2323
2020-04-17 12:47:06 -04:00
Julia Reynolds
dbef46a5d5
Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: d2d8115ac9 am: fb328c7bc6
...
Change-Id: I8384671d90c0bb08df14840ddd9813129da63bfd
2020-04-16 14:53:53 +00:00
Julia Reynolds
e3cb4f094e
Launch subscreens with the correct user
...
Test: atest
Fixes: 153556621
Change-Id: I5f3f0f408dc8e50db1762b1ce93f7748ea6332b0
2020-04-15 17:36:11 -04:00
Julia Reynolds
3ef490189b
Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439 am: cc3d0501f1 am: e81fdf8011 am: 228048065f
...
Change-Id: Icbee4d67ea0166296963e65c6181d15828bc9249
2020-04-14 12:07:23 +00:00
Mady Mellor
409c3dfe68
Bubble settings: feature, notification, app
...
* Removed setting from developer options
* Removed bubble settings from normal notifications /
channels
* Feature available via notification setting
* Feature screen with educational gif
* App level is now a tri-state choice of all / selected /
none
* App level bubble controls are accessible top-level in
app notifications
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="Bubble"
Bug: 138116133
Change-Id: Id103e9d3717fdc9b86a916be40c43cda9c35ac34
2020-04-13 10:15:38 -07:00
Alex Mang
ea5526ca7d
Add flag to allow NAS to indicate adjustments on notifications and
...
solicit feedback.
Bug: 145559028
Test: make -j RunSettingsRoboTests
Change-Id: I45e880168352e4dc5409e5d91ff22d7e4ce69ca7
2020-04-03 14:18:00 -07:00
TreeHugger Robot
53c6bfffae
Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: 6e9938cf48 am: 0035707d32 am: 85f940b564
...
Change-Id: Ia73d18279f72e0eaefe73f0053549a4287a68ffa
2020-03-31 21:48:17 +00:00
Steve Elliott
8a575029fc
Disable conversation strip setting.
...
Test: manual, robotests
Fixes: 149070144
Fixes: 149001624
Change-Id: I422872e38f7adead81938c39b6084bbc7ed911ae
2020-03-31 13:24:46 -04:00
TreeHugger Robot
bc1687c94f
Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd am: 8b94c0e4a3 am: 1b29a5a2ba
...
Change-Id: Ia90ec22e76476867615f4482e27c55434e50bb10
2020-03-31 05:01:12 +00:00
Julia Reynolds
139f0ccf07
Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec am: 639b6f89ea am: 41874f9f73
...
Change-Id: Ic0b0645779a3ca80c841b83c21f2f93cc2bdf5c5
2020-03-31 05:00:16 +00:00
TreeHugger Robot
6f837d10bf
Merge "Don't filter demoted conversation from app subtext" into rvc-dev
2020-03-30 20:03:45 +00:00
