Commit Graph

20068 Commits

Author SHA1 Message Date
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
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
4c221d1609 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev 2020-04-29 05:17:30 +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
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
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
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
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
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
7aa3131201 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e
Change-Id: I91b09f88338864003ce982eb37f8cd42e1ee6971
2020-04-27 20:37:53 +00:00
TreeHugger Robot
5c3f71859e Merge "Allow > 1 line title for DND duration preference" into rvc-dev 2020-04-27 20:21:50 +00:00
TreeHugger Robot
53f27efde2 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: d120058c87 am: f9ddba1a51 am: 98789a079b
Change-Id: I9d06f8b1f0594734c9f19eb25a1fdb650e320bb7
2020-04-27 18:34:25 +00:00
TreeHugger Robot
37720caadf Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: 001dcc9a5b am: 6acc3d6c95 am: 86e170790a
Change-Id: Ibea550337d422fd56f2960396f9fbbc0f437004a
2020-04-27 18:32:53 +00:00
Beverly
f939976367 Allow > 1 line title for DND duration preference
Test: manual
Fixes: 154694705
Change-Id: I9eaffb21e5d5902782beb5e9f845394015ba23be
2020-04-27 14:23:54 -04:00
TreeHugger Robot
d120058c87 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462
Change-Id: Ia6dcc5c5f142838bceac1b170669be939f7065e2
2020-04-27 17:39:13 +00:00
TreeHugger Robot
001dcc9a5b Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182
Change-Id: I2479c711420447d02e7742a00e4b1002c18dcff5
2020-04-27 17:39:07 +00:00
TreeHugger Robot
1e84f0252b Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462
Change-Id: I515b17b9408bdb84b5dc0d0f951f0bf167b27132
2020-04-27 17:39:06 +00:00
TreeHugger Robot
e1617681df Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182
Change-Id: I98945495e8b451863faeb5bd18ee01b7f8ca0de2
2020-04-27 17:38:57 +00:00
TreeHugger Robot
50a5a0c462 Merge "Separate dnd categories in a list" into rvc-dev 2020-04-27 17:38:06 +00:00
TreeHugger Robot
d28fca9182 Merge "Separate call/messages dnd summary string" into rvc-dev 2020-04-27 17:26:16 +00:00
Beverly
ae2d681faf Separate dnd categories in a list
For translations purposes, separate strings that are the first element
in a list of sound categories from the stand alone category titles.

Test: manual
Bug: 154694384
Change-Id: I1ba5a487f179103ccfa881fdc57b10b6ec2560ad
2020-04-27 12:08:11 -04:00
Menghan Li
9bc66971d7 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 am: 8afeaa1fa7 am: abc21bdb41 am: 61d7b654a2
Change-Id: I39edbebb57580542270f6616c9b9a9f7d4c52d71
2020-04-27 15:39:26 +00:00
Julia Reynolds
8fe4b28312 Updates for msg apps that don't use shortcuts
- Notice on app specific page
- No individual conversation bubble controls

Test: manual
Bug: 154814754
Change-Id: I74c291890ba6203e6a3a162fc0c0335ed5eba3d4
2020-04-27 11:07:40 -04:00
Menghan Li
abc21bdb41 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 am: 8afeaa1fa7
Change-Id: I840a42b41004b3557ba9d25e20958ad1672081c1
2020-04-27 15:07:40 +00:00
TreeHugger Robot
7f15836d47 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-27 14:57:02 +00:00
Menghan Li
b49fb33540 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91
Change-Id: Ib348a11d558771871da94e32e7c3fa5040590669
2020-04-27 14:41:14 +00:00
Menghan Li
8afeaa1fa7 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91
Change-Id: I1f61856a89598b4d72bdf9873e0e7ac63e50f53f
2020-04-27 14:40:56 +00:00
Menghan Li
24f71c6e91 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev 2020-04-27 14:22:22 +00:00
Beverly
a8ea534674 Separate call/messages dnd summary string
The translation for call/messages may be feminine or masculine depending
on the language which changes the way this string should be translated.
Therefore, separate the string to prevent bad translations.

Test: manual
Fixes: 154687360
Change-Id: I3cbef72d41626a244ce82a0d0574427fb9c4462e
2020-04-27 10:02:28 -04:00
Bill Yi
c162aa3acb Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I5fd1212a2ca1683651184562d1d51811883c56cd
2020-04-27 04:37:20 -07:00
Bill Yi
114edb926b Import translations. DO NOT MERGE
Change-Id: If34c66548982270e15e0b607dd3fa7c810ad5f15
Auto-generated-cl: translation import
2020-04-26 22:07:52 -07:00
TreeHugger Robot
f94fc3c337 Merge "Import translations. DO NOT MERGE" 2020-04-24 19:47:28 +00:00
TreeHugger Robot
1ac457ebb8 Merge "Import translations. DO NOT MERGE" 2020-04-24 19:12:20 +00:00
TreeHugger Robot
0dc7e9b328 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-04-24 18:02:01 +00:00
TreeHugger Robot
c93aaf860e Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-24 17:33:41 +00:00