Commit Graph

20094 Commits

Author SHA1 Message Date
TreeHugger Robot
968abefdbc Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: 4d6ad1dec9 am: e22a776b12 am: c8b2d09997
Change-Id: I77450b815c5f9c1c8f239ea685af1ccde6b1a831
2020-04-29 19:29:47 +00:00
TreeHugger Robot
4d6ad1dec9 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3
Change-Id: Ia1d018e763df06a1bd9c750f805573a3070e7296
2020-04-29 18:40:34 +00:00
TreeHugger Robot
7e94c5e3b3 Merge "Fix icon color in dark theme." into rvc-dev 2020-04-29 18:02:45 +00:00
kholoud mohamed
7c84508e16 Fix icon color in dark theme.
Bug: 154582949
Test: visual testing
Change-Id: Ibb17f06c5b1d9745294af460565aa078c4e2baf2
2020-04-29 17:43:34 +01:00
Julia Reynolds
adfd6ba13e Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 am: 68d3972a36 am: c106e6bc03
Change-Id: I28f44b8929ad28e241ca9781a4cb9a80549b21e4
2020-04-29 16:25:50 +00:00
Julia Reynolds
68d3972a36 Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0
Change-Id: I14a3372d2ca7304667e3923b94d1a377eb927aa9
2020-04-29 15:52:56 +00:00
Julia Reynolds
04b6152ef0 Merge "Remove unused development setting" into rvc-dev am: e2eb832033
Change-Id: Ic77ae688d2b211a1dc3ad5c0b8e2b5967698604e
2020-04-29 15:42:46 +00:00
Julia Reynolds
c6fe4407fe Merge "Remove unused development setting" into rvc-dev am: e2eb832033
Change-Id: I834d268678426e9173edacb0c5c9a52fe6941946
2020-04-29 15:42:45 +00:00
Julia Reynolds
e2eb832033 Merge "Remove unused development setting" into rvc-dev 2020-04-29 15:25:24 +00:00
TreeHugger Robot
6faaa7caaf Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: 27c76c3075 am: bc83b982da
Change-Id: I57f9070cadb4d8bed271825a66fa1076e836b0d0
2020-04-29 14:18:07 +00:00
TreeHugger Robot
27c76c3075 Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4
Change-Id: I84b0ddf08b3efa97c7b082c613c18b254471c61d
2020-04-29 13:38:14 +00:00
TreeHugger Robot
d5cf3b0a5e Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0
Change-Id: Idfd8ff9e9da16191add8c764370e20b5b6ad174f
2020-04-29 13:22:56 +00:00
TreeHugger Robot
5c6094bcf4 Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0
Change-Id: Ibc3eb51b98ea8dbb864731f92cc5a503d297d857
2020-04-29 13:22:48 +00:00
TreeHugger Robot
e76cdc27d0 Merge "Fix the preference index conflict problem" into rvc-dev 2020-04-29 13:01:45 +00:00
Sunny Shao
502a5eb1c5 Fix the preference index conflict problem
Bug: 153888035
Test: manual test
Change-Id: I6c67d2fea752487ceb5fa05c6537df980a0f8d6a
2020-04-29 11:53:55 +00:00
TreeHugger Robot
4004667fff Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: 222da24344 am: a21603a224 am: 6732e446a7
Change-Id: I47bf21ce8c231bcd7996e96d9d72e5809d42befd
2020-04-29 06:20:50 +00:00
TreeHugger Robot
a21603a224 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: 222da24344
Change-Id: Ie3ba8186a2b0ded3fcfeaf0689c2569aa99c475b
2020-04-29 05:49:42 +00:00
TreeHugger Robot
8c28127323 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-29 05:37:45 +00:00
TreeHugger Robot
b47f88ee05 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609
Change-Id: I5db9bb66a86b1377f43bbf35b4410a44a79d4755
2020-04-29 05:33:23 +00:00
TreeHugger Robot
222da24344 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609
Change-Id: I8ba500b881798bfe9ee55d5a1d82e3f8926cd4a0
2020-04-29 05:33:14 +00:00
TreeHugger Robot
fdb8558d88 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-29 05:24:29 +00:00
TreeHugger Robot
4c221d1609 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev 2020-04-29 05:17:30 +00:00
Bill Yi
6de079f842 Import translations. DO NOT MERGE
Change-Id: Ia9288eff67da11149c3207ff4c99093b5b4a2271
Auto-generated-cl: translation import
2020-04-28 17:26:06 -07:00
Bill Yi
2a3fe1c938 Import translations. DO NOT MERGE
Change-Id: I110ea7607bf1a03f53ec852eb9fa791f7ad7a2f3
Auto-generated-cl: translation import
2020-04-28 16:54:21 -07:00
Julia Reynolds
6b2716fce0 Remove unused development setting
Test: atest
Fixes: 151821676
Change-Id: I59338340ac88873d20cd715c82723590af64acd3
2020-04-28 19:11:47 -04: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
Kevin Chyn
1895f8b5f2 Move ImeAwareTextEdit to android.widget
Allows it to be used in more projects

Bug: 154161590

Test: Manually opened each setting that was impacted
Change-Id: Ife59074e5f8ffa76c2c81cca4022ca200bb59526
2020-04-28 15:57:40 -07:00
Mady Mellor
e62939420e Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: 0ffd6c0b17
Change-Id: I9cea0ab8a2d0c1173e8bbd412a08065f9c18794d
2020-04-28 22:43:11 +00:00
Mady Mellor
ec9e965d90 Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e
Change-Id: I382f080699006d2a3d160290f7b71d84cd65f033
2020-04-28 22:30:18 +00:00
Mady Mellor
0ffd6c0b17 Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e
Change-Id: Ia002914e6a8c939fdb79ff9a1a918b3869e721d2
2020-04-28 22:30:08 +00:00
Mady Mellor
2b42301a6e Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev 2020-04-28 22:17:05 +00:00
Julia Reynolds
98821960c6 Fix some icons on conversation screen am: 1a2e7ad52f am: 1dae9fac9d am: 2581f68bd9 am: 412ddf12e0
Change-Id: Ia314e5f53797f07a1d6922558e85ecacbe262924
2020-04-28 21:20:59 +00:00
Julia Reynolds
2581f68bd9 Fix some icons on conversation screen am: 1a2e7ad52f am: 1dae9fac9d
Change-Id: Iaf9aaa690e95b62347720d39eb72302d7bf0d4ea
2020-04-28 20:45:40 +00:00
Julia Reynolds
b97501ff23 Fix some icons on conversation screen am: 1a2e7ad52f
Change-Id: Iee93e4294fb026c6d62f7bd1cb7bdc37404e9619
2020-04-28 20:33:48 +00:00
Julia Reynolds
1dae9fac9d Fix some icons on conversation screen am: 1a2e7ad52f
Change-Id: I51705467345bc8f961a43b4f3b2ecf2fa808cb3e
2020-04-28 20:33:27 +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
Julia Reynolds
1a2e7ad52f Fix some icons on conversation screen
Test: manual
Fixes: 154930822
Change-Id: Ic480203f494eaccd743a7c77895596174f52539b
2020-04-28 19:07:08 +00:00
Beverly
5ed8cf12e8 Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed am: 2c3e295e2f am: 7b79d4bb08
Change-Id: I7e1ef371eaed8840429d468be51adb16c2d0b88a
2020-04-28 17:58:03 +00:00
Beverly
2c3e295e2f Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed
Change-Id: I4954569d276c25c4e14bd6031d11d0209abcb384
2020-04-28 17:16:38 +00:00
Beverly
f32362f03a Update strings to be more translation friendly am: dcc79e9942
Change-Id: Ic9de15791cf1298605683eb42c25ee4a0901b613
2020-04-28 16:50:46 +00:00
Beverly
0d644b34ed Update strings to be more translation friendly am: dcc79e9942
Change-Id: Ic545a4151940b97dc705d1f7bb8f252e108c9d1b
2020-04-28 16:49:37 +00:00
Beverly
dcc79e9942 Update strings to be more translation friendly
Use different strings for "None" based on the context of the string.
Some languages may require different gendered grammar depending on its
context.

Also update contacts summary string to include plurals (1 vs many).

Test: make RunSettingsRoboTests7
Bug: 154898476
Fixes: 154944295
Change-Id: If9949d75de573042389a19df3d4c5d15c6cbeb25
2020-04-28 14:53:08 +00:00
TreeHugger Robot
d49493a1f8 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 am: 4bc961c95d am: 6637170b1d
Change-Id: Ie7bdb43e3e3fa4919b7e8286bdda57077ae49156
2020-04-28 14:20:50 +00:00
TreeHugger Robot
4bc961c95d Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887
Change-Id: Ia923da6427ace26e9231bba0e464cf9d0a1f3a77
2020-04-28 14:08:16 +00:00
TreeHugger Robot
dcba11ba82 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09
Change-Id: I90d6f44c1b5af1037422aadae7fae71eabcaa452
2020-04-28 14:02:40 +00:00
TreeHugger Robot
4738734887 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09
Change-Id: I5d739de32339359c28bab9ab6957abf1c287b9e1
2020-04-28 14:02:27 +00:00
TreeHugger Robot
6f482cef09 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev 2020-04-28 13:57:15 +00:00
TreeHugger Robot
2747fbb275 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201 am: de07ac05d8 am: 479366ccd5
Change-Id: I833d8c09d079806f7ef7763db3d6e38e02e92f30
2020-04-27 21:33:24 +00:00
TreeHugger Robot
de07ac05d8 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201
Change-Id: I4e7f836bef89d2c2f4a8dbf6005a22ac0ff17896
2020-04-27 20:51:46 +00:00
TreeHugger Robot
f6ab80044d Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e
Change-Id: Iff94af0e29f4537aefcb3905452efd4c34927331
2020-04-27 20:38:25 +00:00