OSDN Git Service
Miranda Kephart [Tue, 10 Sep 2019 20:24:04 +0000 (20:24 +0000)]
Merge "Merging from qt-qpr1-sysui-dev @ build
5855545" into qt-qpr1-dev
joshmccloskey [Tue, 10 Sep 2019 06:20:26 +0000 (23:20 -0700)]
Merge "Change cancel button type to skip for SUW" into qt-r1-dev
am:
ff01d52d50
Change-Id: Idcddf14e8aa3cfcd50b78ed112d51bf06424b840
TreeHugger Robot [Tue, 10 Sep 2019 06:02:39 +0000 (06:02 +0000)]
Merge "Change cancel button type to skip for SUW" into qt-r1-dev
joshmccloskey [Mon, 9 Sep 2019 23:11:27 +0000 (16:11 -0700)]
Change cancel button type to skip for SUW
Test: Verified in SUW that enrollment will skip after
tapping the cancel button in the Introduction.
Fixes:
140702414
Change-Id: I9d9da0ff6d10b6ee6929cb52ff4a03a684f43d17
Miranda Kephart [Fri, 6 Sep 2019 14:40:29 +0000 (10:40 -0400)]
Merging from qt-qpr1-sysui-dev @ build
5855545
Test: manual, presubmit on the source branch
Merged-In: Idc3d5c39427722a5486552312552f7f77ef40980
Merged-In: Ieea5138da3d182735fb92eedd607f52750c91e19
Change-Id: Iefbdac334e3e1807f61e4832f7ac66b9023047f6
Bill Yi [Sun, 8 Sep 2019 01:27:34 +0000 (18:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
53e826122d -s ours
am skip reason: subject contains skip directive
Change-Id: Idcf6bcf772195798c2853d81e1ab6623b17bf8df
Bill Yi [Fri, 6 Sep 2019 16:27:30 +0000 (09:27 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ie16be62ead2b453c69d0201a5aa5e7ae3411405f
Raff Tsai [Fri, 6 Sep 2019 08:47:16 +0000 (01:47 -0700)]
Fix Settings crash when click uninstall button
am:
2d709131ba
Change-Id: I5e7c8f9e5ea9ac6854be24ddd025ee0849a200cf
Raff Tsai [Mon, 29 Jul 2019 08:24:39 +0000 (16:24 +0800)]
Fix Settings crash when click uninstall button
When mPackageName is null, mFinish is true. OnResume() doesn't
invoke refreshUI(). It causes uninstall button is still enabled.
The solution is hiding AppButtonsPreference when mFinish is true.
Fixes:
138524326
Test: make RunSettingsRoboTests ROBOTEST_FILTER
Change-Id: I9759e53f002afbd4c88d8d536df3bf01c343135e
(cherry picked from commit
88228c33994fe963022b950ff4affc81d4bf3021)
Bill Yi [Fri, 6 Sep 2019 01:36:03 +0000 (18:36 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
e2f5f9b876 -s ours
am:
f85844d8e6 -s ours
am skip reason: subject contains skip directive
Change-Id: I71ccaf502f0cff035cfc533f6a1183382b79fdb2
Bill Yi [Fri, 6 Sep 2019 01:30:04 +0000 (18:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e2f5f9b876 -s ours
am skip reason: subject contains skip directive
Change-Id: I0a5fec1d9bb34749d2add5aa4691007208c6b2b6
Bill Yi [Fri, 6 Sep 2019 00:10:26 +0000 (17:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
140445577
Change-Id: I162cbffdd4239b49c258bae8df318f7c4ebd0643
Joshua Mccloskey [Thu, 5 Sep 2019 23:10:00 +0000 (16:10 -0700)]
Merge "Modified text to cancel enrollment" into qt-r1-dev am:
fde49ec3ad
am:
cbeeed9942
Change-Id: I6a62cccc71ce78f49ab85713b162be1395f8769d
Joshua Mccloskey [Thu, 5 Sep 2019 23:00:59 +0000 (16:00 -0700)]
Merge "Modified text to cancel enrollment" into qt-r1-dev
am:
fde49ec3ad
Change-Id: I7691e528d2ceb433509558885ad8af750ddc6678
Joshua Mccloskey [Thu, 5 Sep 2019 22:44:12 +0000 (22:44 +0000)]
Merge "Modified text to cancel enrollment" into qt-r1-dev
Joshua Mccloskey [Thu, 5 Sep 2019 20:22:56 +0000 (13:22 -0700)]
Merge "Updated security settings string." into qt-r1-dev am:
b7ac44e643
am:
648db67fec
Change-Id: Id42bb590b657ab4e3ae5164f51dcc50abb62a544
Joshua Mccloskey [Thu, 5 Sep 2019 19:50:45 +0000 (12:50 -0700)]
Merge "Updated security settings string." into qt-r1-dev
am:
b7ac44e643
Change-Id: Ib890b97401801fb5bcea20d1cd4fa284c1dec09f
joshmccloskey [Wed, 4 Sep 2019 19:44:56 +0000 (12:44 -0700)]
Modified text to cancel enrollment
Fixes:
140446388
Test: Manual.
Change-Id: If3f0affb390743cd7973957b5dea69d5e012dcb1
Joshua Mccloskey [Thu, 5 Sep 2019 19:22:29 +0000 (19:22 +0000)]
Merge "Updated security settings string." into qt-r1-dev
joshmccloskey [Tue, 3 Sep 2019 23:33:39 +0000 (16:33 -0700)]
Updated security settings string.
Test: Manual.
Bug:
140445577
Change-Id: Ie31132dcfcc10a8970b32c1a9bd082990560a353
Bill Yi [Mon, 2 Sep 2019 16:10:52 +0000 (09:10 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
6cf0558c80 -s ours
am skip reason: subject contains skip directive
Change-Id: I3e4886467395d5f362668583a56336f2a3e3da3a
Bill Yi [Mon, 2 Sep 2019 06:17:12 +0000 (23:17 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ife4a90b13e0fea3568f7dd2097184b46cc542237
Bill Yi [Sat, 31 Aug 2019 02:04:21 +0000 (19:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
d595d265f0 -s ours
am:
42b697c5fa -s ours
am skip reason: subject contains skip directive
Change-Id: I672f90c2d80f4a9141a31211fe5d516a377374b6
Bill Yi [Sat, 31 Aug 2019 01:57:26 +0000 (18:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
d595d265f0 -s ours
am skip reason: subject contains skip directive
Change-Id: I3b7728ea50f17bfcb92153699909602836b9fd27
Bill Yi [Sat, 31 Aug 2019 01:36:39 +0000 (18:36 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
acf9750118 -s ours
am skip reason: subject contains skip directive
Change-Id: I3d44017502a4a676a80ded624af6698cffde9fba
Bill Yi [Sat, 31 Aug 2019 00:35:08 +0000 (17:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If0969b48cec65b4596c96c0da99714858a6923a3
Bill Yi [Sat, 31 Aug 2019 00:04:50 +0000 (17:04 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I893b442565d5ac2caa0607111c523ecef27c7bf6
Bill Yi [Fri, 30 Aug 2019 23:49:34 +0000 (16:49 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I59f54fe4b2f22bb52495436350e1c7e3cf02e800
Bill Yi [Tue, 27 Aug 2019 09:12:00 +0000 (02:12 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
2a7b5e2abc -s ours am:
272f241fd4 -s ours
am:
2c4800b4f4 -s ours
am skip reason: subject contains skip directive
Change-Id: I35935d3c0f92a547906346ca014756334dfd9889
Bill Yi [Tue, 27 Aug 2019 08:18:06 +0000 (01:18 -0700)]
[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
Bill Yi [Tue, 27 Aug 2019 08:17:04 +0000 (01:17 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
18183ad552 -s ours
am:
b23b8117ef -s ours
am skip reason: subject contains skip directive
Change-Id: I7f6ca5313e2ea952b31b12fb8d7611414bbc8e22
Jayachandran Chinnakkannu [Tue, 27 Aug 2019 08:14:37 +0000 (01:14 -0700)]
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev am:
7afb9854a7
am:
ddc7dda71b
Change-Id: Ie4c47911942926efe0ba8295e9ba9ef05ec98826
Bill Yi [Tue, 27 Aug 2019 07:50:02 +0000 (00:50 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
18183ad552 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifd79b8618022e2ae80e21af4e0677f0049304f33
Jayachandran Chinnakkannu [Tue, 27 Aug 2019 07:40:42 +0000 (00:40 -0700)]
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
am:
7afb9854a7
Change-Id: Idfbc3f765fc834ab3cb7e07ec340a98606ce87ad
Bill Yi [Mon, 26 Aug 2019 17:48:23 +0000 (10:48 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
2a7b5e2abc -s ours
am skip reason: subject contains skip directive
Change-Id: Id5178f84c020fa9a56f7159f44df89f7c069c5f9
Bill Yi [Mon, 26 Aug 2019 17:47:16 +0000 (10:47 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
9781a780e4 -s ours
am skip reason: subject contains skip directive
Change-Id: I702fcf7582392b0e0b6d20a19844702786a90d5e
Bill Yi [Mon, 26 Aug 2019 12:32:34 +0000 (05:32 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I8f245fc67033985824bbd6e410f0163c39d6c162
Bill Yi [Mon, 26 Aug 2019 12:04:21 +0000 (05:04 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Icd19559f196f76e42d29fe3d9e77bf92d7376a07
Bill Yi [Mon, 26 Aug 2019 11:50:21 +0000 (04:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I21b57a34501c5882af563b0026d52940cc70b3bc
Bill Yi [Mon, 26 Aug 2019 11:36:33 +0000 (04:36 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Iea44d6e2097aff936635e25e2cc2f241ef34f121
Jayachandran Chinnakkannu [Sat, 24 Aug 2019 00:09:32 +0000 (00:09 +0000)]
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
Arc Wang [Fri, 23 Aug 2019 05:23:56 +0000 (22:23 -0700)]
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
TreeHugger Robot [Fri, 23 Aug 2019 05:04:35 +0000 (05:04 +0000)]
Merge "[Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator" into qt-qpr1-dev
Bonian Chen [Thu, 22 Aug 2019 09:13:06 +0000 (17:13 +0800)]
[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
Bill Yi [Thu, 22 Aug 2019 16:10:53 +0000 (09:10 -0700)]
[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
Bill Yi [Thu, 22 Aug 2019 15:54:33 +0000 (08:54 -0700)]
[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
Bill Yi [Thu, 22 Aug 2019 15:40:36 +0000 (08:40 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e6c59cd920 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib9cd51789b9d1d747295f27f94905eca862b87d0
TreeHugger Robot [Thu, 22 Aug 2019 15:03:15 +0000 (15:03 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-sysui-dev
Bill Yi [Thu, 22 Aug 2019 10:38:17 +0000 (03:38 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I20e97f9902c0b550ca2c93a87c02243de733428b
SongFerng Wang [Thu, 22 Aug 2019 10:01:09 +0000 (03:01 -0700)]
Merge "If the user add APN with empty APN type, map it for default type" into qt-qpr1-dev
am:
201fc40816
Change-Id: I8aa46d3909e8d048b30ef17c353970d319b2a955
SongFerng Wang [Thu, 22 Aug 2019 09:49:27 +0000 (09:49 +0000)]
Merge "If the user add APN with empty APN type, map it for default type" into qt-qpr1-dev
Bill Yi [Thu, 22 Aug 2019 09:42:58 +0000 (02:42 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2995bfc89e4a39074ec7f05d1425054dfb39c8f6
Bill Yi [Thu, 22 Aug 2019 00:23:55 +0000 (17:23 -0700)]
[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
TreeHugger Robot [Wed, 21 Aug 2019 23:32:19 +0000 (23:32 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Bill Yi [Wed, 21 Aug 2019 23:19:06 +0000 (16:19 -0700)]
[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
Bill Yi [Wed, 21 Aug 2019 23:06:39 +0000 (16:06 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
91ca872a44 -s ours
am skip reason: subject contains skip directive
Change-Id: I72351a3f496967c2ef6e6a4e457a4d30d5b70955
Bill Yi [Wed, 21 Aug 2019 22:12:57 +0000 (15:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
138829927
Change-Id: Ibebcce851f08b7cc14d8707305f2c21b29e7dfc0
Hyunyoung Song [Wed, 21 Aug 2019 22:05:24 +0000 (15:05 -0700)]
Merge "[DO NOT MERGE] qt-qpr1-sysui-dev @ build
5814791" into qt-qpr1-dev
am:
9f4093daef
Change-Id: Ibb7e6e3ea242eeb5390ef790cba4d8a0eecf2b61
Hyunyoung Song [Wed, 21 Aug 2019 21:39:48 +0000 (14:39 -0700)]
[DO NOT MERGE] qt-qpr1-sysui-dev @ build
5814791
am:
84c67f5fd6
Change-Id: Id11d6e52d9ae89b9afa436323bb4a7e6ac563f15
TreeHugger Robot [Wed, 21 Aug 2019 21:19:19 +0000 (21:19 +0000)]
Merge "[DO NOT MERGE] qt-qpr1-sysui-dev @ build
5814791" into qt-qpr1-dev
Bill Yi [Wed, 21 Aug 2019 19:57:11 +0000 (12:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ia404cdb510ff6c09446362da5ca1738f20bcc9fe
Hyunyoung Song [Tue, 20 Aug 2019 07:46:22 +0000 (00:46 -0700)]
[DO NOT MERGE] qt-qpr1-sysui-dev @ build
5814791
Test: presubmit setup on source branch
Change-Id: I4ff876bd5e711e04be5148008fdaa6ef29df0cbe
andychou [Wed, 7 Aug 2019 06:41:49 +0000 (14:41 +0800)]
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
Goven Liu [Wed, 21 Aug 2019 05:36:08 +0000 (22:36 -0700)]
Merge "[Wi-Fi NetworkRequest] Set theme for the NetworkRequest dialog" into qt-qpr1-dev
am:
cfcfb024c4
Change-Id: I3da8cbf728bd761fd4665eef47539374a07d787c
Goven Liu [Wed, 21 Aug 2019 05:13:49 +0000 (05:13 +0000)]
Merge "[Wi-Fi NetworkRequest] Set theme for the NetworkRequest dialog" into qt-qpr1-dev
govenliu [Mon, 19 Aug 2019 06:35:02 +0000 (14:35 +0800)]
[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
Bill Yi [Wed, 21 Aug 2019 00:29:09 +0000 (17:29 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
1dea02439a -s ours
am skip reason: subject contains skip directive
Change-Id: I3aa129a38621beccec52246350313b9859428d76
Bill Yi [Tue, 20 Aug 2019 22:26:43 +0000 (15:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I79a6c2c9db40e5198b2bbe60f23d4d2e40f5ab19
Bill Yi [Tue, 20 Aug 2019 21:36:38 +0000 (14:36 -0700)]
[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
Bill Yi [Tue, 20 Aug 2019 20:36:35 +0000 (13:36 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
ba8880dd87 -s ours
am skip reason: subject contains skip directive
Change-Id: I5bcce2e15265af9c85e766fd62beb3b65c13d809
Kevin Chyn [Tue, 20 Aug 2019 20:33:52 +0000 (13:33 -0700)]
Merge "Remove attention controller" into qt-r1-dev am:
41aafab963
am:
88936d4a46
Change-Id: I85afd00691b65f8a13e8e47801f291383656158c
Kevin Chyn [Tue, 20 Aug 2019 19:45:58 +0000 (12:45 -0700)]
Merge "Remove delay from enroll start button" into qt-r1-dev am:
ca2bbdfeca
am:
59538f62c1
Change-Id: Ie5ce78c69aff2ba0885738d6567d97c9a9dbe8f3
Bill Yi [Tue, 20 Aug 2019 19:41:39 +0000 (12:41 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
9909286ace -s ours
am skip reason: subject contains skip directive
Change-Id: I6da76f3e355756de383339e52252717e80978132
Bill Yi [Tue, 20 Aug 2019 19:38:42 +0000 (12:38 -0700)]
[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
Arc Wang [Tue, 20 Aug 2019 19:25:41 +0000 (12:25 -0700)]
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
Bill Yi [Tue, 20 Aug 2019 17:52:47 +0000 (10:52 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
139484065
Change-Id: I6c50b4480bec5326951eb809eabc7194d1d06b65
Arc Wang [Tue, 20 Aug 2019 08:15:02 +0000 (16:15 +0800)]
[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
Kevin Chyn [Tue, 20 Aug 2019 02:57:37 +0000 (19:57 -0700)]
Merge "Remove attention controller" into qt-r1-dev
am:
41aafab963
Change-Id: Ic5e2b13d6246fe7693a8f1c289d82d43d3fc6efd
TreeHugger Robot [Tue, 20 Aug 2019 02:37:20 +0000 (02:37 +0000)]
Merge "Remove attention controller" into qt-r1-dev
Kevin Chyn [Mon, 19 Aug 2019 22:08:48 +0000 (15:08 -0700)]
Merge "Remove delay from enroll start button" into qt-r1-dev
am:
ca2bbdfeca
Change-Id: I59870f9318f9ac84107c437aaa660f3d28b861c5
Kevin Chyn [Mon, 19 Aug 2019 21:50:22 +0000 (21:50 +0000)]
Merge "Remove delay from enroll start button" into qt-r1-dev
Bill Yi [Mon, 19 Aug 2019 17:42:35 +0000 (10:42 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I0f506526563a88f386ec68d2a31b00b3e5e3b47e
Bill Yi [Sat, 17 Aug 2019 16:45:15 +0000 (09:45 -0700)]
[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
TreeHugger Robot [Sat, 17 Aug 2019 16:30:21 +0000 (16:30 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Arc Wang [Sat, 17 Aug 2019 14:17:59 +0000 (07:17 -0700)]
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
am:
54dbed859d
Change-Id: I19214265a783f092bb183b3341aa1c2116f3188f
TreeHugger Robot [Sat, 17 Aug 2019 13:58:53 +0000 (13:58 +0000)]
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
Bill Yi [Sat, 17 Aug 2019 08:35:46 +0000 (01:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie3771d039d46900090a8a4f58f325b9a5eb29e0a
Kevin Chyn [Fri, 16 Aug 2019 23:40:39 +0000 (16:40 -0700)]
Remove delay from enroll start button
Fixes:
139554930
Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Merged-in: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Kevin Chyn [Sat, 17 Aug 2019 03:01:16 +0000 (20:01 -0700)]
Merge "Update attention string" into qt-r1-dev am:
e218dc0517
am:
5725d33471
Change-Id: Ic8302db945bdf128bb04eda2ba6105abe6083ce0
Kevin Chyn [Sat, 17 Aug 2019 02:42:52 +0000 (19:42 -0700)]
Merge "Update attention string" into qt-r1-dev
am:
e218dc0517
Change-Id: I0fd8c3a1ea66dde8eefc934cd3265cbb6fbafe0f
Kevin Chyn [Sat, 17 Aug 2019 02:01:31 +0000 (02:01 +0000)]
Merge "Update attention string" into qt-r1-dev
Arc Wang [Mon, 12 Aug 2019 12:11:13 +0000 (20:11 +0800)]
[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
Kevin Chyn [Thu, 15 Aug 2019 23:48:39 +0000 (16:48 -0700)]
Remove attention controller
Bug:
139484065
Test: manual
Change-Id: Ideed761c978ba0831b04ed2cc294e9655dddb01c
Kevin Chyn [Fri, 16 Aug 2019 23:34:01 +0000 (16:34 -0700)]
Update attention string
Bug:
139484065
Test: manual
Change-Id: Ie4619fb51709ba2651866b7841dd4d6b51f165d1
Yi Jiang [Tue, 13 Aug 2019 01:51:42 +0000 (18:51 -0700)]
Merge "Don't show suggestion slice if 'Screen attention' is already on" into qt-qpr1-dev
am:
7933af0273
Change-Id: Iecc58066521d19bb58514eca667a5f4daecbe0de
Yi Jiang [Tue, 13 Aug 2019 01:28:31 +0000 (01:28 +0000)]
Merge "Don't show suggestion slice if 'Screen attention' is already on" into qt-qpr1-dev
Arc Wang [Thu, 8 Aug 2019 08:30:51 +0000 (01:30 -0700)]
[Wi-Fi] Remove unsupported EAP methods for WPA3-Enterprise 192-bit
am:
bde8c0a64d
Change-Id: Ib7dc37d80825346c6c024c84f450f8762c21b3ef
Arc Wang [Mon, 5 Aug 2019 07:20:42 +0000 (15:20 +0800)]
[Wi-Fi] Remove unsupported EAP methods for WPA3-Enterprise 192-bit
1. Only support EAP-TLS for WPA3-Enterprise 192-bit
2. Remove "Do not validate" from the CA certificate menu
3. Remove "Do not provide" from user certificate menu
Bug:
135127581
Test: WifiConfigControllerTest
Change-Id: Ibf904da9407ec803afb8bb995e9df1a2e25f0dcb
Merged-In: Ibf904da9407ec803afb8bb995e9df1a2e25f0dcb
Yi Jiang [Tue, 16 Jul 2019 00:14:33 +0000 (17:14 -0700)]
Don't show suggestion slice if 'Screen attention' is already on
Bug:
137259771
Fix:
137259771
Test: Manually
Change-Id: I5568b569ecd4db943f1a239c7ddcd2923bec4028
(cherry picked from commit
06f0bd6d4ee02656954016b3bc1a63f16dfad17b)
Merged-In: I5568b569ecd4db943f1a239c7ddcd2923bec4028
Christine Franks [Sun, 4 Aug 2019 08:37:50 +0000 (01:37 -0700)]
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev am:
37b38f872f
am:
31cc369a4d
Change-Id: I578907b141f2a6a705473394e16519507997caa8
OSDN Git Service
