Commit Graph

61765 Commits

Author SHA1 Message Date
Alex Johnston
7d2f42ef2b Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: b2c004b3b7 am: 36956907ce
Change-Id: Ia99cb382f7a8db2065751f7f9dcc9696497bd129
2020-04-29 09:07:58 +00:00
Alex Johnston
36956907ce Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: b2c004b3b7
Change-Id: Iea3de900abd4fa5179e355f59366e9f8cd542d11
2020-04-29 08:50:09 +00:00
Menghan Li
5337625d14 Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 5d7fd4abc3 am: 222ccca3af
Change-Id: I85414131be20dc1e393a1f3d7c5e69860400e758
2020-04-29 08:44:48 +00:00
Alex Johnston
b2c004b3b7 Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6
Change-Id: I65079e2dc5c1cceb8489c7d691cdce08f0788c90
2020-04-29 08:33:53 +00:00
Menghan Li
222ccca3af Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 5d7fd4abc3
Change-Id: I5b445da9587b04642bec4ac63ed18cbaf1f628ea
2020-04-29 08:25:17 +00:00
Alex Johnston
d1408a66a6 Merge "Check if FRP policy is supported in Settings" into rvc-dev 2020-04-29 08:19:14 +00:00
Menghan Li
5d7fd4abc3 Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b
Change-Id: I3a7d6846feb4191cf09aea61f3b6e1eb0cea03e4
2020-04-29 08:13:57 +00:00
Menghan Li
981d10db0b Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev 2020-04-29 07:59:35 +00:00
Zoey Chen
fc6bf429e3 Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09 am: 9bdb276281 am: 1891db88b1
Change-Id: Ifbabf8515ea4223a0ae74f930127dd3ee404465b
2020-04-29 06:40:31 +00:00
Zoey Chen
1891db88b1 Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09 am: 9bdb276281
Change-Id: Iea50e0a5c9f4f01050aacb55c63c9663b7847699
2020-04-29 06:27:51 +00:00
Zoey Chen
9bdb276281 Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09
Change-Id: If161edb6ba8db7861bd9e36fcec89e02f14031ce
2020-04-29 06:11:55 +00:00
TreeHugger Robot
1276dbef56 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8c28127323 -s ours am: c763d18148 -s ours am: 29f6ec314e -s ours
am skip reason: subject contains skip directive

Change-Id: I54f25b248843669547ec36a280c111ead5104215
2020-04-29 06:07:32 +00:00
TreeHugger Robot
113a084571 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88 -s ours am: 899dbf039f -s ours am: f80898b03b -s ours
am skip reason: subject contains skip directive

Change-Id: Ifca877357cf6ad66c7d41bc2099a3f59585409b9
2020-04-29 06:07:23 +00:00
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
Zoey Chen
e6b7e24a09 Merge "Improve the performance of displaying preference." into rvc-dev 2020-04-29 05:57:12 +00:00
TreeHugger Robot
29f6ec314e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8c28127323 -s ours am: c763d18148 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic87ea23e12d78533b2bf67fa9691c13324573662
2020-04-29 05:50:19 +00:00
TreeHugger Robot
f80898b03b [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: I5313f8a3cbb131e3f9b140cc55b8baa37a74cba1
2020-04-29 05:50:13 +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
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
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
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
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
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
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
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
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
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
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
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
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
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