Commit Graph

67439 Commits

Author SHA1 Message Date
TreeHugger Robot
e6eb84e8bd Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7 am: 0886b927ec am: caaa9b5ad3 am: d0af508413
Change-Id: I36f8f9f73cae8b95588e930d09b6b9e8b06d0ba4
2020-04-29 02:47:42 +00:00
TreeHugger Robot
6c705a338b Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7 am: f2df3a44d6 am: 88271f0273 am: f7a0986aa3
Change-Id: I98e8a6e1639d887a114726db75ce04423d7e9ca6
2020-04-29 02:47:27 +00:00
TreeHugger Robot
cedd5b1e5c Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7 am: 0886b927ec am: 20876aa35e
Change-Id: I5fe1dddf8721f65a91ff1fc74070711c3d5952e5
2020-04-29 02:40:00 +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
d0af508413 Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7 am: 0886b927ec am: caaa9b5ad3
Change-Id: Ie9e887f9727b85cd6fdd25819f169ca021b5ff6c
2020-04-29 02:25:19 +00:00
TreeHugger Robot
f7a0986aa3 Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7 am: f2df3a44d6 am: 88271f0273
Change-Id: I85b094ed76eb5c0e39712b833c84c7359cf915c4
2020-04-29 02:25:13 +00:00
TreeHugger Robot
20876aa35e Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7 am: 0886b927ec
Change-Id: Ic08c232d198b32d77771ae6addff4a5a47915419
2020-04-29 02:19:46 +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
Mady Mellor
39ae019e11 Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: 0ffd6c0b17 am: 53f46dd5e2 am: 8b4406dadb am: 94a291c45c
Change-Id: I378ad934290c53b83da3fab8b376b3f66808281d
2020-04-28 23:12:49 +00:00
Mady Mellor
26cabaab14 Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: ec9e965d90 am: 045dfbcca4 am: aaf8c30551
Change-Id: I7d8cfd80787f12640009a15ba5f03ad7f4a30eeb
2020-04-28 23:12:33 +00:00
Mady Mellor
94a291c45c Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: 0ffd6c0b17 am: 53f46dd5e2 am: 8b4406dadb
Change-Id: I4b8aaad4daa7ac4f0812429762d78599ab077762
2020-04-28 23:11:51 +00:00
Julia Reynolds
e4a04eccd8 Fix history task stack
Test: manual
Bug: 154721261
Change-Id: Ib39fff447d0d6571b4267700eaf39e425fa114d7
2020-04-28 19:11:47 -04: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
Mady Mellor
aaf8c30551 Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: ec9e965d90 am: 045dfbcca4
Change-Id: I544a0778153c228f372a1d7e704c682e2c251a92
2020-04-28 23:00:32 +00:00
Mady Mellor
fad77d3ffd Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: 0ffd6c0b17 am: e62939420e
Change-Id: I9fc2c7433bc2209822b393c55ea63ca8f04e1280
2020-04-28 22:59:51 +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
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
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
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
9856814652 Fix some icons on conversation screen am: 1a2e7ad52f am: 1dae9fac9d am: 9cdfc636ff am: 6e748079c0 am: 99ed0a9d04
Change-Id: I0e3edf9908f897023877571228107dee201b81f8
2020-04-28 21:22:08 +00:00
Julia Reynolds
fa58f43972 Fix some icons on conversation screen am: 1a2e7ad52f am: b97501ff23 am: ea5d476de0 am: cb8dd459b9
Change-Id: I76f2e89195b402d71fdc53fbb67cd337377b7ba3
2020-04-28 21:21:37 +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
99ed0a9d04 Fix some icons on conversation screen am: 1a2e7ad52f am: 1dae9fac9d am: 9cdfc636ff am: 6e748079c0
Change-Id: I23e8e60b957cb97a7871d6592568507a0e9966cb
2020-04-28 21:20:17 +00:00
Julia Reynolds
cb8dd459b9 Fix some icons on conversation screen am: 1a2e7ad52f am: b97501ff23 am: ea5d476de0
Change-Id: I739fb766f654240302691658a558a3e89b241df6
2020-04-28 21:01:02 +00:00
Julia Reynolds
412ddf12e0 Fix some icons on conversation screen am: 1a2e7ad52f am: 1dae9fac9d am: 2581f68bd9
Change-Id: Idd18708114b024cfc894f09facc1820f3e91b9ae
2020-04-28 21:00:19 +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
ea5d476de0 Fix some icons on conversation screen am: 1a2e7ad52f am: b97501ff23
Change-Id: I4d2e0c65d95a7723f2e66fad041aedc7c4e67a6c
2020-04-28 20:52:40 +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
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
1aadec59ea Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed am: e792b84f57 am: 1f3cc80103 am: fdb8693a8a
Change-Id: I11b6bea32a88530bdcdaa99aac4c7d5da0fed793
2020-04-28 17:58:59 +00:00
Beverly
ebd15ce93a Update strings to be more translation friendly am: dcc79e9942 am: f32362f03a am: e6f80c2626 am: 0dccdc11b6
Change-Id: I7ea70ae3da2070e01830288f2cd72dd2ade78b96
2020-04-28 17:58:37 +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
fdb8693a8a Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed am: e792b84f57 am: 1f3cc80103
Change-Id: I007195dc0f9b746265a2f150af93c8979533699a
2020-04-28 17:51:28 +00:00
Beverly
0dccdc11b6 Update strings to be more translation friendly am: dcc79e9942 am: f32362f03a am: e6f80c2626
Change-Id: Ia88d14a388104804618c905d62faea09e3f8c64e
2020-04-28 17:29:49 +00:00