Joshua Mccloskey
cbeeed9942
Merge "Modified text to cancel enrollment" into qt-r1-dev
...
am: fde49ec3ad
Change-Id: I7691e528d2ceb433509558885ad8af750ddc6678
2019-09-05 16:00:59 -07:00
Joshua Mccloskey
fde49ec3ad
Merge "Modified text to cancel enrollment" into qt-r1-dev
2019-09-05 22:44:12 +00:00
Joshua Mccloskey
648db67fec
Merge "Updated security settings string." into qt-r1-dev
...
am: b7ac44e643
Change-Id: Ib890b97401801fb5bcea20d1cd4fa284c1dec09f
2019-09-05 12:50:45 -07:00
joshmccloskey
a55cbf036f
Modified text to cancel enrollment
...
Fixes: 140446388
Test: Manual.
Change-Id: If3f0affb390743cd7973957b5dea69d5e012dcb1
2019-09-05 12:23:44 -07:00
Joshua Mccloskey
b7ac44e643
Merge "Updated security settings string." into qt-r1-dev
2019-09-05 19:22:29 +00:00
joshmccloskey
e02042d140
Updated security settings string.
...
Test: Manual.
Bug: 140445577
Change-Id: Ie31132dcfcc10a8970b32c1a9bd082990560a353
2019-09-03 16:33:39 -07:00
Bill Yi
6cf0558c80
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ife4a90b13e0fea3568f7dd2097184b46cc542237
2019-09-01 23:17:12 -07:00
Bill Yi
42b697c5fa
[automerger skipped] Import translations. DO NOT MERGE
...
am: d595d265f0
-s ours
am skip reason: subject contains skip directive
Change-Id: I3b7728ea50f17bfcb92153699909602836b9fd27
2019-08-30 18:57:26 -07:00
Bill Yi
acf9750118
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I893b442565d5ac2caa0607111c523ecef27c7bf6
2019-08-30 17:04:50 -07:00
Bill Yi
d595d265f0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I59f54fe4b2f22bb52495436350e1c7e3cf02e800
2019-08-30 16:49:34 -07:00
Bill Yi
2c4800b4f4
[automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc
-s ours
...
am: 272f241fd4
-s ours
am skip reason: subject contains skip directive
Change-Id: I35eee950f35028f93b5fd93732076ea1e59777b8
2019-08-27 01:18:06 -07:00
Bill Yi
b23b8117ef
[automerger skipped] Import translations. DO NOT MERGE
...
am: 18183ad552
-s ours
am skip reason: subject contains skip directive
Change-Id: Ifd79b8618022e2ae80e21af4e0677f0049304f33
2019-08-27 00:50:02 -07:00
Jayachandran Chinnakkannu
ddc7dda71b
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
...
am: 7afb9854a7
Change-Id: Idfbc3f765fc834ab3cb7e07ec340a98606ce87ad
2019-08-27 00:40:42 -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
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
7afb9854a7
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
2019-08-24 00:09:32 +00: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
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
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
TreeHugger Robot
1407d45e3b
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2019-08-21 23:32:19 +00: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
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
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
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
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
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
Kevin Chyn
88936d4a46
Merge "Remove attention controller" into qt-r1-dev
...
am: 41aafab963
Change-Id: Ic5e2b13d6246fe7693a8f1c289d82d43d3fc6efd
2019-08-19 19:57:37 -07:00
TreeHugger Robot
41aafab963
Merge "Remove attention controller" into qt-r1-dev
2019-08-20 02:37:20 +00: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
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
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
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
5725d33471
Merge "Update attention string" into qt-r1-dev
...
am: e218dc0517
Change-Id: I0fd8c3a1ea66dde8eefc934cd3265cbb6fbafe0f
2019-08-16 19:42:52 -07:00