Commit Graph

56233 Commits

Author SHA1 Message Date
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
Neil Fuller
738df11447 Merge "Fix missing zone strings in some cases" 2020-04-29 12:18:53 +00:00
Neil Fuller
eafec7a244 Fix missing zone strings in some cases
ICU's TimeZoneNames requires a "canonical" zone ID, otherwise it will
return no data. Usually the ID being used is the same as the canonical
ID so there's no problem. TZDB version 2020a switched the ID of one of
Greenland's zones from America/Godthab to America/Nuuk, and ICU/CLDR
hold their translation data against America/Godthab in the current
version of ICU on Android.

Bug: 155167041
Test: Manual - viewed settings on a device with the tzdb 2020a update
Change-Id: Ia89c777a832f8b41c8d56d3327a9b7370ba44b52
2020-04-29 10:16:19 +01:00
SongFerng Wang
7999b0a9a2 Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5
Change-Id: I1799dd42b0400e29772bb01ddeb957031df6aa8b
2020-04-29 08:50:04 +00:00
SongFerng Wang
0d4010c5e5 Merge "Settings: Fix force close when destory sim lock fragment view" 2020-04-29 08:31:05 +00:00
hoffc
4b575ec0d1 Settings: Fix force close when destory sim lock fragment view
Sim lock fragment does not override its parent onCreateView method and diretly
return null, which results in NPE when destory after removing Sim card.

Override its parent onCreateView when no sim card inserted.

Bug: 154743278
Test: build pass
Change-Id: I0b10a07c1767cda74096dc44ef7ffa7839a9aae4
2020-04-28 07:21:36 +00:00
Malcolm Chen
97a8568e49 Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest.
Bug: 154566065
Test: robotest
Change-Id: I77dfa6eb61ee7b2cf2eb4fd8d8a392a43f7035b3
Merged-In: I77dfa6eb61ee7b2cf2eb4fd8d8a392a43f7035b3
2020-04-27 18:19:44 -07:00
Malcolm Chen
99e64da899 Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter
Bug: 152786064
Test: build and manual
Change-Id: I6194592d9a7bf4d4b7993fc344d7392bf5c296aa
Merged-In: I6194592d9a7bf4d4b7993fc344d7392bf5c296aa
2020-04-27 18:19:13 -07:00
Malcolm Chen
5e68080b1f Define a helper link for 5G limitation in DSDS footer.
Bug: 152786064
Test: manual
Change-Id: I5a02f847531988217cc6ab47e3b35ed319c1027c
Merged-In: I5a02f847531988217cc6ab47e3b35ed319c1027c
2020-04-27 18:14:46 -07:00
Brad Ebinger
c973423a34 Revise strings as per string UX review
Fixes: 154148793
Fixes: 155098265
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Merged-In: Ia510ce5262fbe576718b0785175c0a82acb3c722
Change-Id: Ia510ce5262fbe576718b0785175c0a82acb3c722
2020-04-27 18:00:29 -07:00
Brad Ebinger
f82153c3ec Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" am: a7bf6a3046
Change-Id: I765918f1712bb80006a3d0751a84477a94c2d432
2020-04-20 21:06:10 +00:00
Brad Ebinger
2c60eb8851 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." am: a9295ea648
Change-Id: I1d6e0324ee8db02a75e3f14ebfe24fad369b0bd2
2020-04-20 21:04:14 +00:00
Brad Ebinger
a7bf6a3046 Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" 2020-04-20 20:40:50 +00:00
Brad Ebinger
a9295ea648 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." 2020-04-20 20:40:02 +00:00
Brad Ebinger
6b87fa6705 Set the CHAR_LIMIT to 110 in order to support more translations.
Increase the CHAR_LIMIT for contact_discovery_opt_in_summary.

Fixes: 153376000
Fixes: 150941009
Test: manual
Merged-In: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
Change-Id: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
2020-04-20 12:08:58 -07:00
Brad Ebinger
f6a1184c0f Change to Contact Discovery Dialog Language based on Privacy Feedback
Fixes: 153376820
Bug: 141950843
Test: verify text
Merged-In: Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12
Change-Id: Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12
2020-04-20 19:08:07 +00:00
Wang Han
d3d2760841 Preserve icon for "manage space"
* I1f7cccf0558960f867a8bf2d0ee14dc5ec9fd7a9 fixes the text but
   there is no more icon for "manage space". Preserve the old
   icon.

Change-Id: I3256f176b861cfa88780dfcbc54c6e38aac87c8b
2020-04-19 04:52:27 +00:00
Bonian Chen
74e3771df3 Merge "[Settings] Avoid from crash when pull out SIM" am: d43db12f96
Change-Id: I898b16508649f6f0f11002a810089b4d9c133a4e
2020-04-12 18:02:49 +00:00
Bonian Chen
d43db12f96 Merge "[Settings] Avoid from crash when pull out SIM" 2020-04-12 17:42:45 +00:00
Bonian Chen
8dd1b0258d [Settings] Avoid from crash when pull out SIM
Avoid from crash when pull out SIM under SimStatusDialogController.

Bug: 153512823
Test: manual
Merged-In: I3869326bdfb65368827f25469ae83539a68e171f
Change-Id: I60500c058cf15bc432e46e27fe4b9fb1ae2989b7
2020-04-10 16:42:57 +08:00
Xin Li
ee75f54619 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master
Bug: 151763422
Change-Id: Ie99b0fb88c440f1e40a412da74905adf3f0725df
2020-04-09 18:41:52 -07:00
Bonian Chen
ee2b1d1561 Merge "[Settings] Refactor of Wifi Calling part" am: 61e003440b am: 1dcc1037dd
Change-Id: Ic2c8fc4e5ef11373058b9c9b3444c3c2c0c772a5
2020-04-09 05:35:46 +00:00
Bonian Chen
1dcc1037dd Merge "[Settings] Refactor of Wifi Calling part" am: 61e003440b
Change-Id: I532654e3c3a5650ff36963b0e2172a66ec39baa5
2020-04-09 05:22:20 +00:00
Bonian Chen
61e003440b Merge "[Settings] Refactor of Wifi Calling part" 2020-04-09 05:04:15 +00:00
Bonian Chen
5042276cf7 [Settings] Refactor of Wifi Calling part
Refactor of Wifi Calling to avoid accessing hidden APIs.
This includes the following cherry-picks on the corresponding files:
I455685eb26df69d929ff3ed3c26ce84aa5f6b1f8
I1a67db80b114a438afda7d45af90e54af38703c3
Idd4935a6d8ceed77c15e90f96781014d1940a427
Ia5179ee1a23f054899bc74c796542bae40cdc8d5
I57c91a095fc4d454d92e8d78e0b647b4f098c6a3
I8a09264f83b9fc4fce3f79ec3aeb6ae757b004e4
I68462368669b81e10d09bbb93e74e23ea9a1f446
I9c54eb63a0df3fde38965ee7e2ae46cc1b7efd47
I0d5dcfc33b0bddacf059d1fb9af559646e32e68a
I45977c850977be84c0dc1f6461e68a1941efc1a2
I46c047359257ddd5cb3e331add4856b01c5c9739
I35246811d3e01d0b2ca197e9a1ed7081691cd982

Bug: 140542283
Test: build pass
Change-Id: I2cddeefb7cc5f1b2060e572a73560f7cd6204d0b
2020-04-09 01:35:07 +00:00
Treehugger Robot
56c6ff781c Merge "Show footer to notify user no 5G in DSDS mode." am: 8889d6012e am: a097d46cc1
Change-Id: I8edb12c3ebf05675148bbb10c35a675c00bd4570
2020-04-08 20:03:25 +00:00