OSDN Git Service
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 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 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 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 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 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 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 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
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 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
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
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: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
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: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 [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 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
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
Christine Franks [Sun, 4 Aug 2019 08:32:21 +0000 (01:32 -0700)]
[DO NOT MERGE] Update title for null uri when setting changes am:
ea14373666
am:
c48918dac0
Change-Id: I268d4d01a515e1c49b83e3c321af230cb06bffc9
Christine Franks [Sun, 4 Aug 2019 07:53:35 +0000 (00:53 -0700)]
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev
am:
37b38f872f
Change-Id: Ie2b1e884d7501fb1d37ce816a5f4c78042be6300
Christine Franks [Sun, 4 Aug 2019 07:53:29 +0000 (00:53 -0700)]
[DO NOT MERGE] Update title for null uri when setting changes
am:
ea14373666
Change-Id: Idca3e0d0855ced876f4bd891739e0141ec86a777
Christine Franks [Sat, 3 Aug 2019 14:47:40 +0000 (14:47 +0000)]
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev
Christine Franks [Thu, 1 Aug 2019 18:09:16 +0000 (11:09 -0700)]
[DO NOT MERGE] Update title for null uri when setting changes
Currently, the title will not update at all if set to silent.
Bug:
130445562
Test: make RunSettingsRoboTests -j48
Change-Id: Id8fc0182adb37c05436f5924b7dcdffb9d994e0d
Edgar Wang [Fri, 2 Aug 2019 06:00:15 +0000 (23:00 -0700)]
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am:
8e3b202070
am:
063cc34713
Change-Id: Ic856426092578e47418498de40e22aa484badb19
Edgar Wang [Fri, 2 Aug 2019 05:49:22 +0000 (22:49 -0700)]
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
am:
8e3b202070
Change-Id: Ib1cf35ee24f88a9eae71714349fe40cb982214b0
Edgar Wang [Fri, 2 Aug 2019 05:38:23 +0000 (05:38 +0000)]
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
Daniel Solomon [Thu, 1 Aug 2019 20:51:28 +0000 (13:51 -0700)]
Merge "Settings: change the color mode preview image" into qt-r1-dev am:
c5fbd7b669
am:
8e699b6ec8
Change-Id: I077cdf4c165158aa927f4d1aa0632b6c343b2fb2
Daniel Solomon [Thu, 1 Aug 2019 20:38:20 +0000 (13:38 -0700)]
Merge "Settings: change the color mode preview image" into qt-r1-dev
am:
c5fbd7b669
Change-Id: I719cdde36a264519900584b9835d5c6e70cc5818
TreeHugger Robot [Thu, 1 Aug 2019 19:58:47 +0000 (19:58 +0000)]
Merge "Settings: change the color mode preview image" into qt-r1-dev
Youming Ye [Thu, 1 Aug 2019 18:58:55 +0000 (11:58 -0700)]
Check the missing useHomeWfMode case am:
b7923f5a3f
am:
84049d217d
Change-Id: I101a0d837a4912e316c3cd25f6f829d15cbc8745
Youming Ye [Thu, 1 Aug 2019 18:27:48 +0000 (11:27 -0700)]
Check the missing useHomeWfMode case
am:
b7923f5a3f
Change-Id: I81aadd772a8c8b07ca6c967868789aa91fe0dba9
Edgar Wang [Mon, 29 Jul 2019 08:55:31 +0000 (16:55 +0800)]
Add skip lock screen in Notification & security lock screen settings
Users may have trouble finding this setting in face auth.
Heard this from dogfood/executive feedback and customer support discussion.
So add Skip Lock Screen preference in
Display > Lock screen display > What to show >
and
App & Notifications > Notifications > Lock Screen >
Bug:
138458558
Test: robotest & manual
Change-Id: I10e420821423821743d65b00c8b7e6d4d1224e00
Youming Ye [Tue, 11 Jun 2019 22:25:52 +0000 (15:25 -0700)]
Check the missing useHomeWfMode case
Bug:
133812904
Test: Build
Change-Id: If89c67c0595808a1339517c6084f1d1e23f5974b
Merged-In: If89c67c0595808a1339517c6084f1d1e23f5974b
Antony Sargent [Wed, 31 Jul 2019 23:05:35 +0000 (16:05 -0700)]
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am:
4685c785b9
am:
ad2f49f851
Change-Id: I7a87b32111936ce805f90cf68b7cbe7c8df498f9
Bill Yi [Wed, 31 Jul 2019 23:04:50 +0000 (16:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
5a690f3c4c -s ours
am:
1ccff0ddc6 -s ours
am skip reason: subject contains skip directive
Change-Id: I69d8e92cdbaca6f83a068ed2507b623728c8eac3
Antony Sargent [Wed, 31 Jul 2019 22:56:00 +0000 (15:56 -0700)]
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
am:
4685c785b9
Change-Id: I5792ff5333005e2e0c66fd24d594b79bf67d140c
Bill Yi [Wed, 31 Jul 2019 22:53:52 +0000 (15:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
5a690f3c4c -s ours
am skip reason: subject contains skip directive
Change-Id: Ic10bfa052664715f150c09abfc3f0015aa530ee8
TreeHugger Robot [Wed, 31 Jul 2019 22:39:22 +0000 (22:39 +0000)]
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
Antony Sargent [Wed, 31 Jul 2019 19:53:39 +0000 (12:53 -0700)]
Protect entry points to add an eSIM when admin restricted
If the DISALLOW_CONFIG_MOBILE_NETWORKS admin policy is set, we were
accidentally still allowing access to the flow where you add an eSIM
subscription via the "plus" button on the Network & internet page. While
fixing this, I also noticed that the mobile networks list page (which
only becomes available if you have multiple subscriptions) has a link at
the bottom to start the flow as well, and that wasn't being protected.
The fix for the plus button on the Network & internet page was just to
make sure not to call setEnabled(true) if the preference was already
disabled by admin policy, since that has the effect of overriding the
admin-disabling.
The fix for the mobile networks list page just needed to add the
relevant tags in the layout XML, and then we get it for free.
Fixes:
137627845
Test: make RunSettingsRoboTests
Change-Id: I896ac248f50aaeecc157791938a0a0a98265aa07
Daniel Solomon [Wed, 31 Jul 2019 18:46:39 +0000 (11:46 -0700)]
Settings: change the color mode preview image
Change the color mode preview image to better illustrate the difference
between Natural and Boosted color modes.
Bug:
138126243
Test: manual testing on Pixel
Change-Id: I367b383f9f2da9b2e2d5960e51c3ec7821d4915b
Bill Yi [Wed, 31 Jul 2019 19:09:08 +0000 (12:09 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3e51c61d9bdff182bc83a04242ccd6e1e4f9629d
Quang Luong [Wed, 31 Jul 2019 00:35:06 +0000 (17:35 -0700)]
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am:
17908b1e8f
am:
5c4a0e3444
Change-Id: I68a1a9451dda22ab32baf6bae395c0368b1f9b9b
Quang Luong [Wed, 31 Jul 2019 00:16:00 +0000 (17:16 -0700)]
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
am:
17908b1e8f
Change-Id: Ie1cdb83f47bac988b93401b3994a096d85333ce6
TreeHugger Robot [Tue, 30 Jul 2019 23:33:22 +0000 (23:33 +0000)]
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
Antony Sargent [Tue, 30 Jul 2019 22:58:21 +0000 (15:58 -0700)]
Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev am:
66208e734b
am:
5a39d48ab2
Change-Id: Id51073c918d19403b47cc0bf21964a122d6cadf3
Bill Yi [Tue, 30 Jul 2019 22:57:25 +0000 (15:57 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am:
67afe87617 -s ours
am:
1b86d59384 -s ours
am skip reason: subject contains skip directive
Change-Id: I2aa2952eec13d8c7fcb0ae1eeb437e780ef8c818
Antony Sargent [Tue, 30 Jul 2019 22:43:32 +0000 (15:43 -0700)]
Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev
am:
66208e734b
Change-Id: I7e1494a1859393844ad5810a9721bf3865ed5f75
Bill Yi [Tue, 30 Jul 2019 22:42:25 +0000 (15:42 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
67afe87617 -s ours
am skip reason: subject contains skip directive
Change-Id: I253e0acc117f894554878c91ba084cca775eb7bd
TreeHugger Robot [Tue, 30 Jul 2019 22:33:32 +0000 (22:33 +0000)]
Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev
TreeHugger Robot [Tue, 30 Jul 2019 21:39:43 +0000 (21:39 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Antony Sargent [Tue, 30 Jul 2019 17:10:57 +0000 (10:10 -0700)]
Make EnabledNetworkModePreferenceController listen to setting changes
The controller for the "Preferred network type" preference on the SIM
details page wasn't listening for changes to the underlying global
setting, so changes to the setting would be reflected in SysUI but not
on this page if it happened to be showing.
Bug:
135667565
Test: make RunSettingsRoboTests
Change-Id: I5dfe4843a681c613f49caf4584e9dbebc54e708a
Bill Yi [Tue, 30 Jul 2019 19:03:57 +0000 (12:03 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
9af3e6a625 -s ours am:
f5c8056f7a -s ours
am:
3cda841897 -s ours
am skip reason: subject contains skip directive
Change-Id: I8670a31858f74816775f9ca91e799e08719d7284
Bill Yi [Tue, 30 Jul 2019 18:55:38 +0000 (11:55 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id8561f757b8520ebbd976cc9b06fa833b68575d8
Bill Yi [Tue, 30 Jul 2019 18:47:09 +0000 (11:47 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
9af3e6a625 -s ours
am:
f5c8056f7a -s ours
am skip reason: subject contains skip directive
Change-Id: I8d700ef074dff397a3e02cca8945935a549c77df
Bill Yi [Tue, 30 Jul 2019 18:43:40 +0000 (11:43 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am:
f63cb669ff -s ours
am:
50dc17d8bc -s ours
am skip reason: subject contains skip directive
Change-Id: I594fbdb0e5eea0247dfa12fd5eff51677627e41c
Bill Yi [Tue, 30 Jul 2019 18:32:38 +0000 (11:32 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
f63cb669ff -s ours
am skip reason: subject contains skip directive
Change-Id: Ia87ca65aaf5bf3f43c2d15b944bdf06a74f857c6
Bill Yi [Tue, 30 Jul 2019 18:32:37 +0000 (11:32 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
9af3e6a625 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic131b3c52fc5f2c0bd1b735a376df65108490f5e
TreeHugger Robot [Tue, 30 Jul 2019 18:09:15 +0000 (18:09 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev