Jeff Tinker
a5f7479f5a
Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c
...
Change-Id: I980e0dba1556a28d683ffb3e5a40da52974c062e
2020-05-20 19:50:57 +00:00
Jeff Tinker
9e974afd4c
Merge "Revert "[Settings] Remove mobile network v1""
2020-05-20 19:37:56 +00:00
Jeff Tinker
9c657c34f4
Revert "[Settings] Remove mobile network v1"
...
This reverts commit daf6c9e85b
.
Reason for revert: Broken build 6513883 on aosp-master on errorprone
Change-Id: I5e473863c2669a3c89014e12cc952c5c72a12cb7
bug:157138919
2020-05-20 19:14:57 +00:00
Bonian Chen
075a17c995
Merge "[Settings] Remove mobile network v1" am: 10799d12fd
...
Change-Id: Id17878bd85d8e86f1cb42bc52a78fc5469278376
2020-05-20 12:45:32 +00:00
Bonian Chen
10799d12fd
Merge "[Settings] Remove mobile network v1"
2020-05-20 12:28:20 +00:00
Bonian Chen
daf6c9e85b
[Settings] Remove mobile network v1
...
Cherry-pick of Ib365ba712af62729ca35abbc370aef087ce52a90
Fixes: 142920912
Test: rebuild, robolectric
Merged-In: Ib365ba712af62729ca35abbc370aef087ce52a90
Change-Id: I1554d475e0f34971381dcc42817573f98f958825
2020-05-20 07:49:33 +00:00
Treehugger Robot
d71f2b3f1a
Merge "Preserve icon for "manage space"" am: c39b3dfd76
...
Change-Id: Ic24c59d88117a9e0a6f61e2c1b0e2726a1546487
2020-05-19 11:58:13 +00:00
Treehugger Robot
c39b3dfd76
Merge "Preserve icon for "manage space""
2020-05-19 11:42:46 +00:00
Zoey Chen
6622ff7181
Merge "[Settings] Code refactor" am: f4d59078fb
...
Change-Id: I65a011ca26c574d53d7ae3c2551fe6aa44f9c861
2020-05-19 10:15:33 +00:00
Zoey Chen
f4d59078fb
Merge "[Settings] Code refactor"
2020-05-19 09:51:16 +00:00
Bonian Chen
e9911c28cf
[Settings] Code refactor
...
Code refactor.
Bug: 141833767
Test: manual
Merged-In: I3fa9dcc630b7612c1af3300024dee4f8deb6b308
Change-Id: I3fa9dcc630b7612c1af3300024dee4f8deb6b308
2020-05-19 16:48:11 +08:00
Zoey Chen
2673571d28
Merge "[Settings] Code refactor for availability session" am: d7dbfe04ca
...
Change-Id: I1d486a18f7b0a9b7eb79ac3d28ebbdc0cdfa88c9
2020-05-19 08:23:13 +00:00
Zoey Chen
d7dbfe04ca
Merge "[Settings] Code refactor for availability session"
2020-05-19 08:04:42 +00:00
Bonian Chen
cede995c5d
[Settings] Code refactor for availability session
...
Code refactor for session design of availability status config.
Bug: 141833767
Test: manual
Merged-In: Ia4982bc4036abbcff5ee1a4bba69bdf6f70ad657
Change-Id: Ia4982bc4036abbcff5ee1a4bba69bdf6f70ad657
2020-05-19 11:41:59 +08:00
Zoey Chen
9cc7978d0a
Merge "Improve the performance of displaying preference." am: f0322ab48e
...
Change-Id: I27fdfb879d8081ebd949f57799f10daa2d0f8c2d
2020-05-19 03:22:10 +00:00
Zoey Chen
f0322ab48e
Merge "Improve the performance of displaying preference."
2020-05-19 03:03:26 +00:00
Zoey Chen
ad9b5c3b56
Merge "[Settings] Avoid rendering hidden preferences" am: b4b612a8e3
...
Change-Id: I75cf82d73c30583c5e7983e90af50da43246abfc
2020-05-18 08:58:01 +00:00
zoey chen
20d88eb2a8
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
Merged-In: Ia13a75a3821bb6c17d0dfeffb5043f47b60adf61
Change-Id: Ia13a75a3821bb6c17d0dfeffb5043f47b60adf61
2020-05-18 16:51:13 +08:00
Zoey Chen
b4b612a8e3
Merge "[Settings] Avoid rendering hidden preferences"
2020-05-18 08:38:05 +00:00
Bonian Chen
cc6a88bf6c
[Settings] Avoid rendering hidden preferences
...
Under dashboards with expand button, preferences are renderred even
not been expanded.
Avoid from rendering un-expanded preference can improve the performance
of dashboard display.
Bug: 141833767
Test: manual
Merged-In: I00c6f827a0b7b7cec6a6fd8c809b94ca1dce88bb
Change-Id: I00c6f827a0b7b7cec6a6fd8c809b94ca1dce88bb
2020-05-18 03:17:09 +00:00
Benedict Wong
63a1447508
Merge "Hide IKEv2 VPN options if not supported" am: 806523a7cd
...
Change-Id: I3e8b13b615bfc6c2095efd5bd7c2f61beebf7b3e
2020-05-16 00:25:53 +00:00
Benedict Wong
806523a7cd
Merge "Hide IKEv2 VPN options if not supported"
2020-05-16 00:14:05 +00:00
Treehugger Robot
5797829fa6
Merge "Settings performance testing" am: 9446266f4f
...
Change-Id: Ie761e966d27c4aaf7e28850b0a01fc06650c4738
2020-05-15 10:43:29 +00:00
Treehugger Robot
9446266f4f
Merge "Settings performance testing"
2020-05-15 10:28:54 +00:00
youtengliang
1bf3f1c26a
Settings performance testing
...
1. Change TEST_TIME to 10 to avoid timeout fail.
Test: atest SettingsPerfTests:LaunchSettingsTest
Change-Id: Id1ec855196b3e8b5fdd28c0d683aa95b002a8462
2020-05-15 14:26:14 +08:00
Benedict Wong
ad2421fe5b
Hide IKEv2 VPN options if not supported
...
This change hides the VPN type options if the FEATURE_IPSEC_TUNNELS is
not supported on the device.
Bug: 156681625
Test: Manually tested
Change-Id: I3ef2e6144371596380351341e58c4ee84d49f39d
2020-05-14 19:13:53 -07:00
Treehugger Robot
0780e5d581
Merge "Settings performance testing" am: 8683e38068
...
Change-Id: I9ebe2a1749a4279d66c987a724cddef02526bfd1
2020-05-11 04:18:19 +00:00
Treehugger Robot
8683e38068
Merge "Settings performance testing"
2020-05-11 04:02:55 +00:00
youtengliang
9de3878944
Settings performance testing
...
1. Add storage page as test target.
2. Set screen timeout to 2 hours to avoid screen timeout during testing.
3. Force close settings before launching each page.
4. Reset screen timeout after testing.
5. Increase test times from 10 to 100.
Test: atest SettingsPerfTests:LaunchSettingsTest
Change-Id: I52c4f15e47a2a83219212de1262a13b3b196c21c
2020-05-08 20:30:42 +08:00
Bill Yi
4192f7f836
Merge "Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE" am: a502c55a5c
...
Change-Id: I309b9093a6f18bbb88f2a1b6ae3c7dc71c17cc13
2020-05-06 16:15:39 +00:00
Bill Yi
3194770f30
Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE am: 58957af851
...
Change-Id: Ia5775138e7e2a368a721cb648050014898312d9a
2020-05-06 16:15:34 +00:00
Bill Yi
a502c55a5c
Merge "Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE"
2020-05-06 15:59:08 +00:00
Treehugger Robot
37c9c5b514
Merge "Revise strings as per string UX review" am: 110d7ff721
...
Change-Id: I523fe708d2ff6cacafec362c05e227ae5dda07c8
2020-05-06 03:23:40 +00:00
Treehugger Robot
110d7ff721
Merge "Revise strings as per string UX review"
2020-05-06 03:06:40 +00:00
Bill Yi
58957af851
Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE
...
Merged-In: I1da09579d5ce7b2c67b4a7db381c779a5c5ccb6b
Change-Id: Ifdb33d0e12e1a487f694c37e3e99f87af06b6b74
2020-05-05 17:02:32 +00:00
Treehugger Robot
72f8fa1c90
Merge "Settings: Hide carrier settings version if empty" am: 04b1e2415c
...
Change-Id: I5ed35dc059aae3c9d13f9fe02f7106ca075cf112
2020-05-05 08:15:36 +00:00
Treehugger Robot
04b1e2415c
Merge "Settings: Hide carrier settings version if empty"
2020-05-05 07:37:43 +00:00
Wang Han
f05b2d22fc
Settings: Hide carrier settings version if empty
...
* This gives bad UX if empty as it stays copyable
and "clickable".
Signed-off-by: Luca Stefani <luca.stefani.ge1@gmail.com >
Change-Id: Ia54a1d130e77b4440753f0ce69ae1726cc2c08d9
2020-05-04 13:39:30 +02:00
Xiangyu/Malcolm Chen
30792ed811
Merge "Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest." am: 6819a64e45
...
Change-Id: I6e2235612a27168fc095773e0638da0c9602addd
2020-04-30 17:38:16 +00:00
Xiangyu/Malcolm Chen
6819a64e45
Merge "Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest."
2020-04-30 17:16:55 +00:00
Treehugger Robot
ebea74264a
Merge changes I6194592d,I5a02f847 am: 44146c8e3b
...
Change-Id: I2ebc5edd89fb32b2698c8cfd6acb20342c9cec17
2020-04-30 03:17:19 +00:00
Malcolm Chen
b6fa2277f6
Define a helper link for 5G limitation in DSDS footer. am: 5e68080b1f
...
Change-Id: I3377b9cbc1d4722a8a96c18f40d1118e476c4ef7
2020-04-30 03:17:16 +00:00
Treehugger Robot
44146c8e3b
Merge changes I6194592d,I5a02f847
...
* changes:
Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter
Define a helper link for 5G limitation in DSDS footer.
2020-04-30 02:56:34 +00:00
Treehugger Robot
d6859736a4
Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17
...
Change-Id: I14dc87ff0f185bdbfb5734b6501f727e2cb19792
2020-04-29 22:50:24 +00:00
Bob Badour
2cd2b9e4ab
Merge "Remove MODULE_LICENSE_APACHE2 from apps/Settings" am: 2ab7555be5
...
Change-Id: Ifabb259302be383fad6555849876a4d7e3a0a71a
2020-04-29 22:50:17 +00:00
Treehugger Robot
87d1e30f17
Merge "Disable 'Mobile data' selection after removing SIM"
2020-04-29 22:34:39 +00:00
Grace Jia
7098379555
Disable 'Mobile data' selection after removing SIM
...
Bug: 153895858
Test: Manually remove SIM and test
Change-Id: I5934b01c047172ae2269e77e2fe0945aacba4ca1
Exempt-From-Owner-Approval: Telephony settings
2020-04-29 22:34:29 +00:00
Bob Badour
2ab7555be5
Merge "Remove MODULE_LICENSE_APACHE2 from apps/Settings"
2020-04-29 22:32:10 +00:00
Bob Badour
edb5a95f5d
Remove MODULE_LICENSE_APACHE2 from apps/Settings
...
Repositories containing third-party code need a METADATA and a
license_type. Repositories containing only first-party code no longer
need a MODULE_LICENSE_* file.
Bug: 68860345
Bug: 69058154
Bug: 151953481
Test: no code changes
Change-Id: I818112c2ff1f9c2fffeb92291b03c7753c0b083e
2020-04-29 13:12:26 -07:00
Neil Fuller
6a19fdf877
Merge "Fix missing zone strings in some cases" am: 738df11447
...
Change-Id: I66ba5583cdd3632c6e6efb47fb1c0a0ea3b137cb
2020-04-29 12:30:24 +00:00