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
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
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
menghanli
de1258f9cf
Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog.
...
Root cause: service status is not updated after the shortcut status
changed.
Next: Add callback to update the service status
Bug: 155157599
Test: Manual test
Change-Id: I286a04d43066c787304c54eb7b0dfdac5728b6ac
2020-04-29 13:44:54 +08: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
c763d18148
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8c28127323 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id2be69ba0089b706e6251e260c2b2a0efa4c8d2b
2020-04-29 05:40:07 +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
855722dcda
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 am: dc0233d022 am: 886e31fcec
...
Change-Id: Id70de9979dcde2fba62e1c0c238a309612a9afee
2020-04-29 03:43:17 +00:00
Paul Chang
5a990f12ee
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 am: 661384b69c
...
Change-Id: Ibe9ef042da141bffca24c53bd2edaa1e39a30762
2020-04-29 03:28:24 +00:00
Paul Chang
886e31fcec
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 am: dc0233d022
...
Change-Id: I64687e24beb5b0cde0b729daeb74d6029bb02f9f
2020-04-29 03:26:51 +00:00
Paul Chang
6eb17c26e5
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 am: f66382774e
...
Change-Id: Id0838ecc02863617a517d4dc488cf85ce3585c46
2020-04-29 03:26:51 +00:00
zoey chen
84587b1aa3
Improve the performance of displaying preference.
...
- Set a variable to record the status then replace getAvailabilityStatus() with it.
Test: manual test, use command to run MobileNetworkSettings and record it.
Bug: 154061428
Change-Id: Ia13a75a3821bb6c17d0dfeffb5043f47b60adf61
2020-04-29 11:21:36 +08:00
Paul Chang
dc0233d022
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: I966ad09438a6607942342de174984d2af7b93847
2020-04-29 03:11:19 +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
TreeHugger Robot
5496e4c29b
Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7 am: 0886b927ec am: 20876aa35e am: cedd5b1e5c
...
Change-Id: Ib37408b60d01f37f189eaffc74c981ce116cb8f3
2020-04-29 02:55:46 +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
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
Blake Kragten
b0962e5dda
Remove enhanced connectivity switch for non-pixel
...
Bug: 155027331
Test: using aosp build
Change-Id: Ifbb3a29515e60b592e91005459c27084ee3730c3
2020-04-28 16:30:52 -07: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
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
