Bill Yi
7ef83b488d
[automerger skipped] Import translations. DO NOT MERGE am: 91ca872a44
-s ours
...
am: 1b7486fe92
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic867e1efd3ccb97bcd7bc53c3185eb8d29feeb9a
2019-08-21 16:17:47 -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
1b7486fe92
[automerger skipped] Import translations. DO NOT MERGE
...
am: 91ca872a44
-s ours
am skip reason: subject contains skip directive
Change-Id: I29b799f65bf043aa22b31b363c5a1660ca28210e
2019-08-21 16:09:36 -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
bc09dd7921
Merge "[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791" into qt-qpr1-dev
...
am: 9f4093daef
Change-Id: I2fa81a5397c4033361e821d7d42d2c57e1c8e36f
2019-08-21 15:06:45 -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
20148f679e
[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791
...
am: 84c67f5fd6
Change-Id: Ie612828734b6aed98b51048af9c5d98ea70f41c4
2019-08-21 14:40:45 -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
fe3548ef41
Merge "[Wi-Fi NetworkRequest] Set theme for the NetworkRequest dialog" into qt-qpr1-dev
...
am: cfcfb024c4
Change-Id: If72465328b970ce0d8e9d0c69f0a229a528bdbee
2019-08-20 22:36:09 -07: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
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
10ca16aebb
[automerger skipped] Import translations. DO NOT MERGE
...
am: 1dea02439a
-s ours
am skip reason: subject contains skip directive
Change-Id: I88d487b3d8c48f58461e47ddc9b96eaedef311bf
2019-08-20 17:27:05 -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
06a0c0fe24
[automerger skipped] Import translations. DO NOT MERGE am: ba8880dd87
-s ours
...
am: d9c4bdf4fb
-s ours
am skip reason: subject contains skip directive
Change-Id: I7503693d8c2bfd386c82edfcf38dd406bb1e9d03
2019-08-20 13:50:49 -07:00
Bill Yi
a42954156b
[automerger skipped] Import translations. DO NOT MERGE am: ba8880dd87
-s ours
...
am: e2f660eb6a
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie20613bf58588878edc8d736dbe789bff4ce3902
2019-08-20 13:49:40 -07:00
Bill Yi
d9c4bdf4fb
[automerger skipped] Import translations. DO NOT MERGE
...
am: ba8880dd87
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic0805579cd91f4ec10fb11c34dfe3ca652a43f50
2019-08-20 13: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 Merger (Role)
451965fab8
Merge "Merge "Remove attention controller" into qt-r1-dev am: 41aafab963
am: 645480a4e4" into qt-qpr1-dev-plus-aosp
2019-08-20 03:07:43 +00:00
Kevin Chyn
3fd14bd081
Merge "Remove attention controller" into qt-r1-dev am: 41aafab963
...
am: 645480a4e4
Change-Id: Ie2f40eef47acd830247a3ed6f1a8d2e717520e4e
2019-08-19 20:07:09 -07:00
Kevin Chyn
6dc15d7976
Merge "Remove attention controller" into qt-r1-dev am: 41aafab963
...
am: 88936d4a46
Change-Id: I13b6d8579a5e1c00aa8ac23ae1f8deac05c057cb
2019-08-19 20:06:32 -07: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
645480a4e4
Merge "Remove attention controller" into qt-r1-dev
...
am: 41aafab963
Change-Id: I31966ea8f672f664a4d1feae8be30eb47d0a2d32
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
Android Build Merger (Role)
b3774dfe29
Merge "Merge "Remove delay from enroll start button" into qt-r1-dev am: ca2bbdfeca
am: d1e331dbcd" into qt-qpr1-dev-plus-aosp
2019-08-19 22:23:17 +00:00
Kevin Chyn
c889474c9c
Merge "Remove delay from enroll start button" into qt-r1-dev am: ca2bbdfeca
...
am: d1e331dbcd
Change-Id: I575c770f557f829d77382384b29253cfc6f90610
2019-08-19 15:22:19 -07:00
Kevin Chyn
2c403efabf
Merge "Remove delay from enroll start button" into qt-r1-dev am: ca2bbdfeca
...
am: 59538f62c1
Change-Id: Idb56289528bae12ef1f66d5f96b2461eb5fc20ab
2019-08-19 15:21:56 -07: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
d1e331dbcd
Merge "Remove delay from enroll start button" into qt-r1-dev
...
am: ca2bbdfeca
Change-Id: Ide066e65d76c70175ade9ebeaf94e471cb11c806
2019-08-19 15:09:00 -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
3efb76b03b
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9909286ace
-s ours
am skip reason: subject contains skip directive
Change-Id: I0653a3670e314128324e2902fdc3c7381639ed23
2019-08-19 13:28:44 -07: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 Merger (Role)
1d13f5c8bb
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5
-s ours am: 978cd2b768
-s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
2019-08-17 16:55:37 +00:00