PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,824 Commits 1 Branch 0 Tags
c75d440e497c351db31f66d672eb4525a4db05f3
Commit Graph

62824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
c75d440e49 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88 -s ours am: 899dbf039f -s ours 
am skip reason: subject contains skip directive

Change-Id: I96ba3f724014bcfd9c527ee7f88f189d2c1947f6
 2020-04-29 05:50:37 +00:00
TreeHugger Robot
31bab75429 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8c28127323 -s ours am: 2ec23fb8ab -s ours 
am skip reason: subject contains skip directive

Change-Id: I644d84eee4f32ca4d6250e766fbfaa2e58088949
 2020-04-29 05:50:20 +00:00
TreeHugger Robot
bc15fc2e62 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88 -s ours am: 9acc933b12 -s ours 
am skip reason: subject contains skip directive

Change-Id: I4cf2843833eae69c184603cd2fa7a317af775b41
 2020-04-29 05:50:04 +00:00
Automerger Merge Worker
e1780aef04 Merge "Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: b47f88ee05" into rvc-d1-dev-plus-aosp 2020-04-29 05:49:57 +00:00
TreeHugger Robot
5a9e5af764 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: b47f88ee05 
Change-Id: I0839b8c51c797ec2a028aec3cb2309fa409f742d
 2020-04-29 05:49:52 +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
2ec23fb8ab [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8c28127323 -s ours 
am skip reason: subject contains skip directive

Change-Id: I2a33923cdeb291084ee314a7ad77431aae6492ce
 2020-04-29 05:40:15 +00:00
TreeHugger Robot
8c28127323 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-29 05:37:45 +00:00
TreeHugger Robot
9acc933b12 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88 -s ours 
am skip reason: subject contains skip directive

Change-Id: I43ddf4d5c4a2db654146693b204237aa04139f90
 2020-04-29 05:33:38 +00:00
TreeHugger Robot
899dbf039f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88 -s ours 
am skip reason: subject contains skip directive

Change-Id: I6b1514ea2a852fc8e77e413d7415d6493d749778
 2020-04-29 05:33:27 +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
Paul Chang
661384b69c Merge "Fix - Bug report handler settings is not shown when it is launched by a work profile app." into rvc-dev am: e52353609e am: efe10c0b7b 
Change-Id: I8b9c5380279f1ba74228b43567ed6f16c64e8d38
 2020-04-29 03:11:16 +00:00
Paul Chang
f66382774e Merge "Fix - Bug report handler settings is not shown when it is launched by a work profile app." into rvc-dev am: e52353609e am: c6f8af3626 
Change-Id: Idcb3a25e47693e7f85e5508e43483e1560a64569
 2020-04-29 03:11:04 +00:00
Paul Chang
efe10c0b7b Merge "Fix - Bug report handler settings is not shown when it is launched by a work profile app." into rvc-dev am: e52353609e 
Change-Id: I507f80a8acfac98fac9594d45a1fb86588aab65c
 2020-04-29 02:55:09 +00:00
Paul Chang
c6f8af3626 Merge "Fix - Bug report handler settings is not shown when it is launched by a work profile app." into rvc-dev am: e52353609e 
Change-Id: I9e901b0b99fbcf40a34a1d0a0a6d9af11f1c22c8
 2020-04-29 02:55:05 +00:00
Paul Chang
e52353609e Merge "Fix - Bug report handler settings is not shown when it is launched by a work profile app." into rvc-dev 2020-04-29 02:38:45 +00:00
TreeHugger Robot
caaa9b5ad3 Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7 am: 0886b927ec 
Change-Id: Iac4189dbb22559862724db12346d0f62db5c49e1
 2020-04-29 02:19:46 +00:00
TreeHugger Robot
88271f0273 Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7 am: f2df3a44d6 
Change-Id: I26e6ad236a906c1b55ae7c5e7f374d020dc8f057
 2020-04-29 02:13:58 +00:00
TreeHugger Robot
0886b927ec Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7 
Change-Id: I3749154738a770247a35284d26061a5f530294bf
 2020-04-29 02:01:35 +00:00
TreeHugger Robot
f2df3a44d6 Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7 
Change-Id: I212bb31c2b1bf27b23da75853a0dbfa7074247a8
 2020-04-29 02:00:40 +00:00
TreeHugger Robot
7a2f3dd8a7 Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev 2020-04-29 01:44:42 +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
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
045dfbcca4 Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: ec9e965d90 
Change-Id: I9c498750d13804dd2c06d6116c93a2e81cd58adc
 2020-04-28 22:43:41 +00: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
ea5d476de0 Fix some icons on conversation screen am: 1a2e7ad52f am: b97501ff23 
Change-Id: I4d2e0c65d95a7723f2e66fad041aedc7c4e67a6c
 2020-04-28 20:52:40 +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
Brad Ebinger
e6fae38169 Fix NPE if CarrierConfigManager is not available 
Fixes: 155147094
Test: Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Change-Id: Iecf3e385a88d18c7578eb520449f4042324e21f5
 2020-04-28 11:27:27 -07:00
Beverly
e6f80c2626 Update strings to be more translation friendly am: dcc79e9942 am: f32362f03a 
Change-Id: Id2f6cb93b5d5c3e00c795c78aaa6a093390b51b4
 2020-04-28 17:17:08 +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
Paul Chang
6950a8056e Fix - Bug report handler settings is not shown when it is launched by a work profile app. 
BUG: 155045928
Test: Bug report handler settings can be shown when it is launched by a work profile app

Change-Id: I1e9b5e81aac4b0bf646d4ac1cf84afd64df1df67
 2020-04-28 23:02:57 +08:00
TreeHugger Robot
305663b436 Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 47b56d7152 
Change-Id: I2609354dc855493301734a2004c21e989594f974
 2020-04-28 14:55:29 +00:00
TreeHugger Robot
6b3c8a4169 Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 46f68f51e6 
Change-Id: I6e114287d6495105022e498293000b8fbacda13d
 2020-04-28 14:54:57 +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
47b56d7152 Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e 
Change-Id: I4a63e84c417fd31e87b0b4cae0a957b13e9b79c5
 2020-04-28 14:36:28 +00:00
TreeHugger Robot
46f68f51e6 Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e 
Change-Id: Iaa49b317fbe48f2641b0d3a75be9596ead8bcc7b
 2020-04-28 14:36:23 +00:00
TreeHugger Robot
4eeb99d63e Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev 2020-04-28 14:21:14 +00:00