Bill Yi
80589d367d
[automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc
-s ours
...
am: 272f241fd4
-s ours
am skip reason: subject contains skip directive
Change-Id: Ieaabc566a4f74cc640f6f7bd5ddc4fc66ca45d69
2019-08-26 10:52:55 -07:00
Bill Yi
1168870624
[automerger skipped] Import translations. DO NOT MERGE
...
am: 18183ad552
-s ours
am skip reason: subject contains skip directive
Change-Id: Iaef7f84ffabe3b1238ed4c3f65330fbb9b43ed38
2019-08-26 10:52:18 -07:00
Bill Yi
272f241fd4
[automerger skipped] Import translations. DO NOT MERGE
...
am: 2a7b5e2abc
-s ours
am skip reason: subject contains skip directive
Change-Id: Id5178f84c020fa9a56f7159f44df89f7c069c5f9
2019-08-26 10:48:23 -07:00
Bill Yi
c6b2785d65
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9781a780e4
-s ours
am skip reason: subject contains skip directive
Change-Id: I702fcf7582392b0e0b6d20a19844702786a90d5e
2019-08-26 10:47:16 -07:00
Bill Yi
e3cbf6a8d1
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If0c4f3a5f240a8da2bfd94c4496f4a86fabb02e9
2019-08-26 05:46:44 -07:00
Bill Yi
29e2efdad1
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I8f245fc67033985824bbd6e410f0163c39d6c162
2019-08-26 05:32:34 -07:00
Bill Yi
9781a780e4
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Icd19559f196f76e42d29fe3d9e77bf92d7376a07
2019-08-26 05:04:21 -07:00
Bill Yi
18183ad552
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I21b57a34501c5882af563b0026d52940cc70b3bc
2019-08-26 04:50:21 -07:00
Bill Yi
2a7b5e2abc
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Iea44d6e2097aff936635e25e2cc2f241ef34f121
2019-08-26 04:36:33 -07:00
Jayachandran Chinnakkannu
15a9d54958
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
...
am: 7afb9854a7
Change-Id: I2598b482b4630279d47685381ddac9c746fbe12d
2019-08-23 20:31:09 -07:00
Jayachandran Chinnakkannu
7afb9854a7
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
2019-08-24 00:09:32 +00:00
Arc Wang
4301d96b42
Merge "[Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator" into qt-qpr1-dev
...
am: 318be48d07
Change-Id: I8e8a4ed08b3dd685f5c08b3503334bb736ef5601
2019-08-22 22:23:56 -07:00
TreeHugger Robot
318be48d07
Merge "[Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator" into qt-qpr1-dev
2019-08-23 05:04:35 +00:00
Bonian Chen
128de7bdb6
[Settings] hide preferred network mode UI
...
Hide preferred network mode UI no matter home, roaming or no service
when KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL been enabled.
Bug: 137681413
Test: atest PreferredNetworkModePreferenceControllerTest
atest EnabledNetworkModePreferenceControllerTest
Manual with AT&T SIM card in out of servce and in service
Change-Id: Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968
2019-08-22 14:36:12 -07:00
TreeHugger Robot
1faba0465a
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
2019-08-22 17:11:06 +00:00
Bill Yi
836cdce5b4
[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920
-s ours am: b227fad96a
-s ours
...
am: 32c8779c92
-s ours
am skip reason: subject contains skip directive
Change-Id: Id03ec76072cd7cf7e39133adbf7c8911c261434f
2019-08-22 09:10:53 -07:00
Bill Yi
7026183341
[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920
-s ours
...
am: b227fad96a
-s ours
am skip reason: subject contains skip directive
Change-Id: I0ad889879219af3ac9f9ccbaac40caecadd1ebef
2019-08-22 08:54:34 -07:00
Bill Yi
32c8779c92
[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920
-s ours
...
am: b227fad96a
-s ours
am skip reason: subject contains skip directive
Change-Id: I7257f9247032fe4fe119610faf8c7df27122c365
2019-08-22 08:54:33 -07:00
Bill Yi
b227fad96a
[automerger skipped] Import translations. DO NOT MERGE
...
am: e6c59cd920
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib9cd51789b9d1d747295f27f94905eca862b87d0
2019-08-22 08:40:36 -07:00
TreeHugger Robot
962c472b26
Merge "Import translations. DO NOT MERGE" into qt-qpr1-sysui-dev
2019-08-22 15:03:15 +00:00
Bill Yi
fdc3164ce7
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I38f3254282525e8874304943e3acd8289168d493
2019-08-22 03:52:06 -07:00
Bill Yi
f8121473ca
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I20e97f9902c0b550ca2c93a87c02243de733428b
2019-08-22 03:38:17 -07:00
SongFerng Wang
332f71a9ca
Merge "If the user add APN with empty APN type, map it for default type" into qt-qpr1-dev
...
am: 201fc40816
Change-Id: I8aa46d3909e8d048b30ef17c353970d319b2a955
2019-08-22 03:01:09 -07:00
SongFerng Wang
201fc40816
Merge "If the user add APN with empty APN type, map it for default type" into qt-qpr1-dev
2019-08-22 09:49:27 +00:00
Bill Yi
e6c59cd920
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I2995bfc89e4a39074ec7f05d1425054dfb39c8f6
2019-08-22 02:42:58 -07:00
Bill Yi
bdf47db145
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
...
am: 1407d45e3b
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib30013c0935eb878f5d83d71b4009eef49c5820f
2019-08-21 17:23:55 -07:00
TreeHugger Robot
1407d45e3b
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2019-08-21 23:32:19 +00:00
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
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