Bill Yi
6ac1ded703
[automerger skipped] Import translations. DO NOT MERGE am: 91ca872a44
-s ours
...
am: 075385c12e
-s ours
am skip reason: subject contains skip directive
Change-Id: I0ca2c0114c8fdeaf006d21081f7bf51018bf83c6
2019-08-21 16:19:06 -07:00
Bill Yi
154e1c5025
[automerger skipped] Import translations. DO NOT MERGE
...
am: 91ca872a44
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie77d935d5417155e3bb63de51aec4e03a2994d08
2019-08-21 16:15:32 -07:00
Bill Yi
075385c12e
[automerger skipped] Import translations. DO NOT MERGE
...
am: 91ca872a44
-s ours
am skip reason: subject contains skip directive
Change-Id: I72351a3f496967c2ef6e6a4e457a4d30d5b70955
2019-08-21 16:06:39 -07:00
Bill Yi
1815f5a534
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 138829927
Change-Id: Ibebcce851f08b7cc14d8707305f2c21b29e7dfc0
2019-08-21 15:12:57 -07:00
Hyunyoung Song
2bf37d4da3
Merge "[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791" into qt-qpr1-dev
...
am: 9f4093daef
Change-Id: Ibb7e6e3ea242eeb5390ef790cba4d8a0eecf2b61
2019-08-21 15:05:24 -07:00
Hyunyoung Song
c7456de5ec
[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791
...
am: 84c67f5fd6
Change-Id: Id11d6e52d9ae89b9afa436323bb4a7e6ac563f15
2019-08-21 14:39:48 -07:00
TreeHugger Robot
9f4093daef
Merge "[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791" into qt-qpr1-dev
2019-08-21 21:19:19 +00:00
Bill Yi
91ca872a44
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ia404cdb510ff6c09446362da5ca1738f20bcc9fe
2019-08-21 12:57:11 -07:00
Hyunyoung Song
84c67f5fd6
[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791
...
Test: presubmit setup on source branch
Change-Id: I4ff876bd5e711e04be5148008fdaa6ef29df0cbe
2019-08-21 16:05:31 +00:00
andychou
34fc2495d2
If the user add APN with empty APN type, map it for default type
...
Original behavior will map all APN type if enter empty APN type. But it
sometimes cause problem that MMS or IMS not working when select to this
custom APN. So if the user doesn't enter any APN type, just map to
valure of carrier config 'apn_settings_default_apn_types_string_array'
to avoid all the functions broken.
Bug: 129704611
Test: 1.Enter empty APN type and check if only default is added into
APN. 2.atest ApnEditorTest pass.
Change-Id: Icec274e5b402af06822479bcc60294b347f5254f
2019-08-21 21:20:49 +08:00
Goven Liu
b0abf92713
Merge "[Wi-Fi NetworkRequest] Set theme for the NetworkRequest dialog" into qt-qpr1-dev
...
am: cfcfb024c4
Change-Id: I3da8cbf728bd761fd4665eef47539374a07d787c
2019-08-20 22:36:08 -07:00
Goven Liu
cfcfb024c4
Merge "[Wi-Fi NetworkRequest] Set theme for the NetworkRequest dialog" into qt-qpr1-dev
2019-08-21 05:13:49 +00:00
govenliu
14a74125e6
[Wi-Fi NetworkRequest] Set theme for the NetworkRequest dialog
...
We should set the same theme which applied in Settings APP to the NetworkRequestDialog
Bug: 139294487
Test: check if the right theme is applied when launching this activity.
Change-Id: Iefdfd5b810f5cf22c220830e1ee965113a439a3e
Merged-In: Iefdfd5b810f5cf22c220830e1ee965113a439a3e
2019-08-21 12:23:32 +08:00
android-build-team Robot
58fb6fb806
Snap for 5817507 from 1dea02439a
to qt-qpr1-release
...
Change-Id: I0dcf68f81f5231993e8abb6e3b8acd99f0c12088
2019-08-21 03:17:31 +00:00
Bill Yi
d8cce55735
[automerger skipped] Import translations. DO NOT MERGE
...
am: 1dea02439a
-s ours
am skip reason: subject contains skip directive
Change-Id: I3aa129a38621beccec52246350313b9859428d76
2019-08-20 17:29:09 -07:00
Bill Yi
1dea02439a
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I79a6c2c9db40e5198b2bbe60f23d4d2e40f5ab19
2019-08-20 15:26:43 -07:00
Bill Yi
e4f117dda7
[automerger skipped] Import translations. DO NOT MERGE am: ba8880dd87
-s ours
...
am: e2f660eb6a
-s ours
am skip reason: subject contains skip directive
Change-Id: I7cf0182705e63315cecb597941c854eb796d721c
2019-08-20 14:36:38 -07:00
Bill Yi
cbedccf7ff
[automerger skipped] Import translations. DO NOT MERGE
...
am: ba8880dd87
-s ours
am skip reason: subject contains skip directive
Change-Id: I3c89dde348a9f374aa78c90a1c3033a1c0fcf638
2019-08-20 13:36:37 -07:00
Bill Yi
e2f660eb6a
[automerger skipped] Import translations. DO NOT MERGE
...
am: ba8880dd87
-s ours
am skip reason: subject contains skip directive
Change-Id: I5bcce2e15265af9c85e766fd62beb3b65c13d809
2019-08-20 13:36:35 -07:00
Kevin Chyn
88b20ce11e
Merge "Remove attention controller" into qt-r1-dev am: 41aafab963
...
am: 88936d4a46
Change-Id: I85afd00691b65f8a13e8e47801f291383656158c
2019-08-20 13:33:52 -07:00
Kevin Chyn
d441ca94bf
Merge "Remove delay from enroll start button" into qt-r1-dev am: ca2bbdfeca
...
am: 59538f62c1
Change-Id: Ie5ce78c69aff2ba0885738d6567d97c9a9dbe8f3
2019-08-20 12:45:58 -07:00
Bill Yi
27bc8abe28
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9909286ace
-s ours
am skip reason: subject contains skip directive
Change-Id: I6da76f3e355756de383339e52252717e80978132
2019-08-20 12:41:39 -07:00
Bill Yi
7a4c37d7e5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5
-s ours
...
am: 5188a0560f
-s ours
am skip reason: subject contains skip directive
Change-Id: I36bfd0b4831c53650425409c1b18ef3d26db248a
2019-08-20 12:38:42 -07:00
Arc Wang
4443953daf
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d
...
am: 2394d0821b
Change-Id: Ife8a564c622b03983a9f5a557e2762bc3cd969e2
2019-08-20 12:25:41 -07:00
Bill Yi
ba8880dd87
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 139484065
Change-Id: I6c50b4480bec5326951eb809eabc7194d1d06b65
2019-08-20 18:39:09 +00:00
Arc Wang
3fff50e3ba
[Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator
...
WifiTracker#getAccessPoints() only contains a hidden SSID Wi-Fi
network if it's a saved Wi-Fi network. We can't check if a hidden
SSID Wi-Fi network is reachable inadvance. That is the difference
after a user scanned a QR code of hidden SSID Wi-Fi network.
Bug: 135892509
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDppUtilsTest
manual test:
Click the Share button of a connected hidden SSID Wi-Fi network
and save the QR code image. Use Wi-Fi QR code scanner in Wi-Fi
Settings to scan the saved QR code image.
Change-Id: I9056622e6dadb04e5642ae1c50fb4d227a78d26d
Merged-In: I9056622e6dadb04e5642ae1c50fb4d227a78d26d
2019-08-20 16:15:02 +08:00
android-build-team Robot
ee122253cb
Snap for 5814541 from 59538f62c1
to qt-qpr1-release
...
Change-Id: I9b0f6dab6f004c6a62e4370a81a67c56a8091150
2019-08-20 03:15:57 +00:00
Kevin Chyn
88936d4a46
Merge "Remove attention controller" into qt-r1-dev
...
am: 41aafab963
Change-Id: Ic5e2b13d6246fe7693a8f1c289d82d43d3fc6efd
2019-08-19 19:57:37 -07:00
Kevin Chyn
7b8e594e5c
Merge "Remove attention controller" into qt-r1-dev
...
am: 41aafab963
Change-Id: Id77bc47085b72bbc04a9cee635fe288f3c8f7ef4
2019-08-19 19:57:30 -07:00
TreeHugger Robot
41aafab963
Merge "Remove attention controller" into qt-r1-dev
2019-08-20 02:37:20 +00:00
Kevin Chyn
ac55252e28
Merge "Remove delay from enroll start button" into qt-r1-dev
...
am: ca2bbdfeca
Change-Id: I031e6034ac2cc1bcd7a6d6e36c4fc28b9014636b
2019-08-19 15:11:17 -07:00
Kevin Chyn
59538f62c1
Merge "Remove delay from enroll start button" into qt-r1-dev
...
am: ca2bbdfeca
Change-Id: I59870f9318f9ac84107c437aaa660f3d28b861c5
2019-08-19 15:08:48 -07:00
Kevin Chyn
ca2bbdfeca
Merge "Remove delay from enroll start button" into qt-r1-dev
2019-08-19 21:50:22 +00:00
Bill Yi
9909286ace
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I0f506526563a88f386ec68d2a31b00b3e5e3b47e
2019-08-19 10:42:35 -07:00
android-build-team Robot
6327a11afd
Snap for 5811135 from 5188a0560f
to qt-qpr1-release
...
Change-Id: I6707a442fd7fd079623de9b9dc76dc8079d72b40
2019-08-17 23:10:11 +00:00
Bill Yi
5188a0560f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 7892f729a5
-s ours
am skip reason: subject contains skip directive
Change-Id: I02568545b0452c41a81daf515960665dbf7516cc
2019-08-17 09:45:15 -07:00
Bill Yi
735e8a680d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 7892f729a5
-s ours
am skip reason: subject contains skip directive
Change-Id: Id230b9e65dd2bb45e599c6064be37203eb4ac014
2019-08-17 09:45:15 -07:00
TreeHugger Robot
7892f729a5
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-08-17 16:30:21 +00:00
Arc Wang
2394d0821b
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
...
am: 54dbed859d
Change-Id: I19214265a783f092bb183b3341aa1c2116f3188f
2019-08-17 07:17:59 -07:00
Arc Wang
5101624819
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
...
am: 54dbed859d
Change-Id: I7267b4fe82f6e5e6e6523463eb710049c68e66f9
2019-08-17 07:17:59 -07:00
TreeHugger Robot
54dbed859d
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
2019-08-17 13:58:53 +00:00
Bill Yi
0bb9d1e153
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ie3771d039d46900090a8a4f58f325b9a5eb29e0a
2019-08-17 01:35:46 -07:00
Kevin Chyn
058af41a42
Remove delay from enroll start button
...
Fixes: 139554930
Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Merged-in: I365308c2a00c122b80f70c904d11bb4a5d6cf404
2019-08-17 04:52:30 +00:00
Kevin Chyn
f490c7cb7f
Merge "Update attention string" into qt-r1-dev am: e218dc0517
...
am: 5725d33471
Change-Id: Ic8302db945bdf128bb04eda2ba6105abe6083ce0
2019-08-16 20:01:16 -07:00
Kevin Chyn
208b633c7e
Merge "Update attention string" into qt-r1-dev
...
am: e218dc0517
Change-Id: Ie03ff39347a98318bf44928124cdb0c4bae57f5c
2019-08-16 19:51:18 -07:00
Kevin Chyn
5725d33471
Merge "Update attention string" into qt-r1-dev
...
am: e218dc0517
Change-Id: I0fd8c3a1ea66dde8eefc934cd3265cbb6fbafe0f
2019-08-16 19:42:52 -07:00
Kevin Chyn
e218dc0517
Merge "Update attention string" into qt-r1-dev
2019-08-17 02:01:31 +00:00
Arc Wang
91200e610d
[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem
...
Context#getResources loading is done based on the last SIM to
come up, we may get wrong customization settings.
This fix check the setting of active subscription and shows the preference.
Bug: 138956509
Test: CellularFallbackPreferenceControllerTest
manual test:
1. Insert feature supported SIM and check UI.
2. Remove feature supported SIM and check UI.
3. Turn airplane mode on and check 1. and 2..
Change-Id: I72b6db415429181395a02f163889bb1b9c0f070f
Merged-In: I72b6db415429181395a02f163889bb1b9c0f070f
2019-08-17 01:37:21 +00:00
Kevin Chyn
8e1d1ca3ab
Remove attention controller
...
Bug: 139484065
Test: manual
Change-Id: Ideed761c978ba0831b04ed2cc294e9655dddb01c
2019-08-16 16:34:09 -07:00
Kevin Chyn
821fbc83a1
Update attention string
...
Bug: 139484065
Test: manual
Change-Id: Ie4619fb51709ba2651866b7841dd4d6b51f165d1
2019-08-16 16:34:09 -07:00