PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,893 Commits 1 Branch 0 Tags
f76cee6244df79cd532efddf2e55e404bc05c47d
Commit Graph

20115 Commits

Author SHA1 Message Date
Julia Reynolds
f76cee6244 Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 am: 68d3972a36 am: c106e6bc03 am: adfd6ba13e 
Change-Id: I60cdb48528604d693889411c9e1efa027bd3a47d
 2020-04-29 16:41:13 +00: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
e2eb832033 Merge "Remove unused development setting" into rvc-dev 2020-04-29 15:25:24 +00:00
TreeHugger Robot
64018512ed Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: 5c6094bcf4 am: 27c76c3075 am: bc83b982da am: 6faaa7caaf 
Change-Id: I3adf38c9704dae37fa8e78ac75e0ffd466d04462
 2020-04-29 14:30:39 +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
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
aaf55d2ca6 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: 222da24344 am: a21603a224 am: 6732e446a7 am: 4004667fff 
Change-Id: I58aa44bb4df482ee5e756d175944c0d6bc6ea5ad
 2020-04-29 06:34:01 +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
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
Mady Mellor
3d02a73990 Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: 0ffd6c0b17 am: e62939420e am: fad77d3ffd am: b09f9f37aa 
Change-Id: I0b631ca3e9a62b083bccf216003386b157206ec3
 2020-04-28 23:25:00 +00: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
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
19d1dc6aa2 Fix some icons on conversation screen am: 1a2e7ad52f am: 1dae9fac9d am: 2581f68bd9 am: 412ddf12e0 am: 98821960c6 
Change-Id: Ib99ff51af1b48dabe90862070f43d4f762558241
 2020-04-28 21:33:28 +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
d9f5622380 Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed am: 2c3e295e2f am: 7b79d4bb08 am: 5ed8cf12e8 
Change-Id: I0b28770394b45a3e5eaf93249be92968430c3023
 2020-04-28 18:12:07 +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
b6a92b08e3 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 am: 4bc961c95d am: 6637170b1d am: d49493a1f8 
Change-Id: I69dac104290b6092b162627d46eda0b3eb29f935
 2020-04-28 14:37:26 +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
a6485734c9 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201 am: de07ac05d8 am: 479366ccd5 am: 2747fbb275 
Change-Id: I9005cc89e9b473ede22dad20706b970cc58781cf
 2020-04-27 21:48:43 +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
75022aa6b3 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: d120058c87 am: f9ddba1a51 am: 98789a079b am: 53f27efde2 
Change-Id: Icc6fbc9b20547c9e2e88c401e31ef51bb80d9d57
 2020-04-27 18:46:43 +00:00
TreeHugger Robot
dc01df9a35 Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: 001dcc9a5b am: 6acc3d6c95 am: 86e170790a am: 37720caadf 
Change-Id: I1533e3c8a908486515aa3f3294f1d8ee810b907a
 2020-04-27 18:45:44 +00:00