Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,760 Commits 1 Branch 0 Tags
5337625d140553bcaed4ea7c836c5e2ec8222bbf
Commit Graph

19761 Commits

Author SHA1 Message Date
TreeHugger Robot
dc18558a59 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: 222da24344 am: ae12c347ee 
Change-Id: If6e047f5a0885de679c9c871693a94fcb6ed053c
 2020-04-29 06:06:41 +00:00
TreeHugger Robot
ae12c347ee Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: 222da24344 
Change-Id: I2306bbe11fb2eeccfd9fc498d0faef3b4290077c
 2020-04-29 05:49:50 +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
8b4406dadb Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: 0ffd6c0b17 am: 53f46dd5e2 
Change-Id: I640571a848e93fbe159cfc96a8cc279a526461c3
 2020-04-28 22:59:39 +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
53f46dd5e2 Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: 0ffd6c0b17 
Change-Id: Iafa2295158931e2c51dd87ee52cb94996bb895b8
 2020-04-28 22:43:40 +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
6e748079c0 Fix some icons on conversation screen am: 1a2e7ad52f am: 1dae9fac9d am: 9cdfc636ff 
Change-Id: I6b0a50ca6c4d5d8677afb84f2c526048a2b295a1
 2020-04-28 21:00:17 +00:00
Julia Reynolds
9cdfc636ff Fix some icons on conversation screen am: 1a2e7ad52f am: 1dae9fac9d 
Change-Id: I5779c55539ec749802760b17199e1037f051a14b
 2020-04-28 20:45:56 +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
1f3cc80103 Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed am: e792b84f57 
Change-Id: I7138ed95b98c566c6fa026a8bef1a9fe07dc424c
 2020-04-28 17:29:44 +00:00
Beverly
e792b84f57 Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed 
Change-Id: I9ab4817ac8029df1bb25f1238046145613c3a798
 2020-04-28 17:16:34 +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
22446ccf4a Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 am: d7478b0db4 
Change-Id: I5a79813584186bc54de9d5a8f64854a20e7ca6f5
 2020-04-28 14:16:18 +00:00
TreeHugger Robot
d7478b0db4 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 
Change-Id: Iee676688bd868b5bb045bd4da5296c7549ab8860
 2020-04-28 14:08:22 +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
e194ca5528 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201 am: eab97e5548 
Change-Id: I39b9eee2e6edb9b24b5216ff0c77258ed289de8c
 2020-04-27 21:10:27 +00:00
TreeHugger Robot
eab97e5548 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201 
Change-Id: Icff3bab54b6b26f68ee83c451abd3b9e24105a23
 2020-04-27 20:52:03 +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
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
36b7fd7322 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: 1e84f0252b am: a84e0cb241 
Change-Id: I4cc6c791999c42fa46dcb30e722883b06c2da9b8
 2020-04-27 18:22:34 +00:00
TreeHugger Robot
a0823cbb6c Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: e1617681df am: e0b855898a 
Change-Id: I1d271b9fb31b38f874d6459daa5b9c7b67a8d22b
 2020-04-27 18:22:24 +00:00
TreeHugger Robot
a84e0cb241 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: 1e84f0252b 
Change-Id: I8eab9035ceacc23c3f8deabadcb0ad88ecb28387
 2020-04-27 18:04:09 +00:00
TreeHugger Robot
e0b855898a Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: e1617681df 
Change-Id: I4cf2d49a51639240483eb162f386a5ca1b7b4710
 2020-04-27 18:03:57 +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
7ad40cc9e4 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 am: 8afeaa1fa7 am: dc0196627d 
Change-Id: I17af5b51d03b6d5841bfe83140c393175f59e3d7
 2020-04-27 15:20:44 +00:00
Menghan Li
dc0196627d Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 am: 8afeaa1fa7 
Change-Id: I4e1cf7113623b30c671495f8fd5412185368df05
 2020-04-27 15:08:11 +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
TreeHugger Robot
7f15836d47 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-27 14:57:02 +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
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
Menghan Li
63aa5c6ecd Merge "Refines the limit of advanced in edit shortcut dialog." into rvc-dev am: 450d0eb385 am: 6c780ee4ca am: f52eeb1fac 
Change-Id: I8f10d72d72eb70e9b07276de4c5ce2a4ab95cca6
 2020-04-24 16:50:42 +00:00
Menghan Li
f52eeb1fac Merge "Refines the limit of advanced in edit shortcut dialog." into rvc-dev am: 450d0eb385 am: 6c780ee4ca 
Change-Id: I8a63273d84eabf86730a1ba09df43b418b4a74e5
 2020-04-24 16:40:52 +00:00
TreeHugger Robot
146afc351e Merge "Import translations. DO NOT MERGE" into mainline-prod 2020-04-24 16:38:17 +00:00