OSDN Git Service
Bonian Chen [Wed, 2 Oct 2019 02:44:34 +0000 (02:44 +0000)]
Merge "[Settings Telephony] Carrier name API replacement" into qt-qpr1-dev
Bill Yi [Tue, 1 Oct 2019 23:05:46 +0000 (16:05 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
141777841
Change-Id: I5ef0e8ee2f723c81d4cc1c0be5daf311c7c38e84
TreeHugger Robot [Tue, 1 Oct 2019 22:08:03 +0000 (22:08 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Joshua Mccloskey [Tue, 1 Oct 2019 22:05:41 +0000 (22:05 +0000)]
Merge "Added new string." into qt-qpr1-dev
Bill Yi [Tue, 1 Oct 2019 19:53:15 +0000 (12:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I594742575ea6729d9c71e0ef04658f6513875aaf
Auto-generated-cl: translation import
Bonian Chen [Mon, 9 Sep 2019 07:10:13 +0000 (15:10 +0800)]
[Settings Telephony] Carrier name API replacement
Replacing TelephonyManager.getNetworkOperatorName() by
Obtaining carrier name from SubscriptionInfo.getCarrierName().
TelephonyManager.getNetworkOperatorName() only be used when there's no
SubscriptionInfo can be found.
Bug: b/
140443508
Test: Manual testing
atest MobileNetworkUtilsTest
atest OpenNetworkSelectPagePreferenceControllerTest
Change-Id: I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3
Bill Yi [Mon, 30 Sep 2019 10:35:57 +0000 (03:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I10e5b04a3a580ba34f945305d011ac192a3c4dd3
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 28 Sep 2019 21:05:31 +0000 (21:05 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Bill Yi [Sat, 28 Sep 2019 11:11:34 +0000 (04:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idfb9ca3c6ddf6aa0a9bc04a262b8e0fd76032867
Auto-generated-cl: translation import
joshmccloskey [Fri, 27 Sep 2019 22:09:05 +0000 (15:09 -0700)]
Added new string.
Fixes:
141762646
Test: Verified that string translates to spanish after changing
the language.
Change-Id: I48e34de15460c93c8f50d26821c4d64984f20c6d
joshmccloskey [Fri, 27 Sep 2019 21:54:38 +0000 (14:54 -0700)]
Changed string for translations.
Fixes:
141762646
Test: Verified that string translates to spanish after changing
the language.
Change-Id: Ieebb2ec15cf5cff2afcfefcb130193bdce6086fe
Kevin Chyn [Fri, 27 Sep 2019 05:01:56 +0000 (22:01 -0700)]
Fix FaceSetupSliceTest
Bug:
141380252
Test: make -j56 RunSettingsRoboTests
Change-Id: Ifb9a29d8f3115759a9e8e93e3721135c6ba229bf
joshmccloskey [Thu, 19 Sep 2019 18:23:29 +0000 (11:23 -0700)]
Added different flow for re-enrollment
In order to enable this new flow, a user must currently have an enrolled
face and the security setting face_unlock_re_enroll must be non-zero.
Ex.
1. Enroll Face.
2. adb shell settings put
(secure face_unlock_re_enroll|secure_face_unlock_must_re_enroll) 1
3. If settings is opened, close it.
4. Open settings
5. Verify the new flow appears.
Bug:
141380252
Bug:
141254937
Test: Verified that the user's face is deleted after clicking delete.
Test: Verified that the user can re-enroll after removing their face.
Change-Id: I2b36a0bda5cb10fb33dfb2a5627d8fa40f14fb7e
joshmccloskey [Tue, 24 Sep 2019 22:07:08 +0000 (15:07 -0700)]
Added mandatory scrolling for FaceIntroduction
Test: Verified in SUW/Settings user must scroll through contents in
order to go to the next screen.
Bug:
141380294
Change-Id: I483ab6ae6a282c81ba2f2c4d1d9d1f21c6cb9453
Bill Yi [Sun, 22 Sep 2019 19:53:43 +0000 (12:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
73915b77ed -s ours
am skip reason: subject contains skip directive
Change-Id: Ief64a890db8759f6361b58d304ff4f7e333739c6
TreeHugger Robot [Sun, 22 Sep 2019 19:42:36 +0000 (19:42 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Bill Yi [Sun, 22 Sep 2019 14:52:20 +0000 (07:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I92110fede16a12a445efbd96896e17f46f89a203
Auto-generated-cl: translation import
Bill Yi [Sun, 22 Sep 2019 14:38:24 +0000 (07:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib6e2dcd3084a0399fec672c4fff3a51e8dd0d195
Auto-generated-cl: translation import
Edgar Wang [Sat, 21 Sep 2019 08:54:47 +0000 (08:54 +0000)]
Merge "Handle Aware sensor status for Always On" into qt-qpr1-dev
Edgar Wang [Thu, 19 Sep 2019 11:23:01 +0000 (19:23 +0800)]
Handle Aware sensor status for Always On
- "Always On" preference will be hiden when aware
sensor is available
- Extract NavModeCandidateInfo from SystemNavigationGestureSettings
Bug:
136610131
Test: robotest & manual
Change-Id: If58c70549339b66116f19df7193d85bb04e3f1b7
Bonian Chen [Thu, 19 Sep 2019 20:07:20 +0000 (20:07 +0000)]
Merge "[Help Page] Support help content under 2 CDMA SIM" into qt-qpr1-dev
Bonian Chen [Wed, 11 Sep 2019 06:35:15 +0000 (14:35 +0800)]
[Help Page] Support help content under 2 CDMA SIM
Fix the design for displaying help content.
Launch help content from notification (PendingIntent) could not be resolved correctly.
Route through HelpTrampoline to fix it.
Bug:
139040358
Test: Manual with fake from framework side for dual CDMA SIM
Change-Id: Iff3a6e9095c3908b3c5b1a25e2535bcab1858ae2
joshmccloskey [Tue, 17 Sep 2019 20:04:08 +0000 (13:04 -0700)]
Updated face remove dialog string.
Test: Verified that the correct string shows after deleting
face data.
Fixes:
141145591
Change-Id: I836c79fb4775157ae4995f706e05d1fd1233bc8f
Mady Mellor [Mon, 16 Sep 2019 21:55:52 +0000 (21:55 +0000)]
Merge "qt-r1-bubbles-dev @ build
5835883" into qt-qpr1-dev
Bill Yi [Sun, 15 Sep 2019 01:38:18 +0000 (18:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: If6b8f670eb54a3f5b45efa0ba2a540cd25327260
Auto-generated-cl: translation import
Ilya Matyukhin [Fri, 13 Sep 2019 09:10:32 +0000 (09:10 +0000)]
Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev
Ilya Matyukhin [Wed, 11 Sep 2019 20:58:12 +0000 (13:58 -0700)]
Fix "skip lock screen" not working for a secondary user
Bug:
140878309
Test: "Skip lock screen" is no longer grayed-out for a secondary user
Change-Id: I3aab6582bee07760b671034b0971c98b1c946a1c
Bill Yi [Fri, 13 Sep 2019 00:39:37 +0000 (17:39 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
86dfbd6254 -s ours
am skip reason: subject contains skip directive
Change-Id: I9979a3422b5926a7e210ded393484f6eb28e8600
Bill Yi [Thu, 12 Sep 2019 23:10:45 +0000 (16:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I27cfc6c9ffa9def49d83eea920b88a5ce762fb53
Auto-generated-cl: translation import
Bill Yi [Thu, 12 Sep 2019 22:54:53 +0000 (15:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1cf797286a22443416d4b401e38f8923bb4edd43
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 12 Sep 2019 20:49:56 +0000 (20:49 +0000)]
Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev
TreeHugger Robot [Thu, 12 Sep 2019 08:05:21 +0000 (08:05 +0000)]
Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev
Bill Yi [Thu, 12 Sep 2019 05:50:27 +0000 (22:50 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
8173de150d -s ours
am skip reason: subject contains skip directive
Change-Id: Ica53f59adc22c9442b6c823abc35a63c2e864d8e
Bill Yi [Thu, 12 Sep 2019 02:26:07 +0000 (19:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1b2826dd790519a2946d8505aec03f72b1815f04
Bill Yi [Thu, 12 Sep 2019 02:10:50 +0000 (19:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I60bd87b13925d699bc7db9f6f215321ff20eea44
Mady Mellor [Thu, 29 Aug 2019 22:38:40 +0000 (15:38 -0700)]
qt-r1-bubbles-dev @ build
5835883
Test: presubmit setup on source branch
Bug:
129158983
Bug:
136034310
Bug:
137876221
Change-Id: I5ade70c2101d09eed4698ce29bd3242483ec7f8b
Merged-In: If2b813f24cf5998829fe417e32179c5e8283d308
Merged-In: I58f0287ed99a4daf3758316e4004bca05f17b0d1
Bill Yi [Wed, 11 Sep 2019 19:03:00 +0000 (12:03 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
09c08d1da0 -s ours
am skip reason: subject contains skip directive
Change-Id: I07fe60817626b45ba59b9e0f823aa7f462533b19
TreeHugger Robot [Wed, 11 Sep 2019 18:41:53 +0000 (18:41 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
TreeHugger Robot [Wed, 11 Sep 2019 18:18:32 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Bill Yi [Wed, 11 Sep 2019 05:37:57 +0000 (22:37 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1ee6e4e49b18ed13ab3e431583d316c0663a4f8f
Bill Yi [Wed, 11 Sep 2019 05:24:00 +0000 (22:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1163141368fc482f675e7d9dd7b4503dfcd309bf
TreeHugger Robot [Wed, 11 Sep 2019 03:43:27 +0000 (03:43 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Bill Yi [Wed, 11 Sep 2019 03:15:44 +0000 (20:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
c1bfd1f50d -s ours
am skip reason: subject contains skip directive
Change-Id: I6fcd972f09510bdba25fd0732dd37e168d356a70
Bill Yi [Wed, 11 Sep 2019 02:41:30 +0000 (19:41 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
140445577
Change-Id: Ica56884b49d5f16a84096f4c4f34bc0b639ad3e1
Bill Yi [Wed, 11 Sep 2019 01:35:47 +0000 (18:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
140445577
Change-Id: Ife760913fdf573fb8820f604e90fae666cab08e5
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
Arc Wang [Thu, 5 Sep 2019 06:56:56 +0000 (14:56 +0800)]
[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network
Should only allow saved network UI initialization for once.
Bug:
140362368
Test: WifiConfigControllerTest
manual:
Manually change EAP method and other security fields for a saved
Wi-Fi neterprise network.
Change-Id: Iddc1dae53849760f43b41b75262358dff6ba09af
Merged-In: Iddc1dae53849760f43b41b75262358dff6ba09af
cosmohsieh [Thu, 5 Sep 2019 05:09:37 +0000 (13:09 +0800)]
[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection
Call NetworkRequestUserSelectionCallback#reject() to notify framework that user quit this request without
selecting any network.
Bug:
138855477
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.NetworkRequestErrorDialogFragmentTest
Change-Id: I4b06c9772598ab3f9416f32456cd0a65e2d70d68
Merged-In: I4b06c9772598ab3f9416f32456cd0a65e2d70d68
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
TreeHugger Robot [Mon, 26 Aug 2019 19:04:13 +0000 (19:04 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
Bill Yi [Mon, 26 Aug 2019 17:52:55 +0000 (10:52 -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: Ieaabc566a4f74cc640f6f7bd5ddc4fc66ca45d69
Bill Yi [Mon, 26 Aug 2019 17:52:18 +0000 (10:52 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
18183ad552 -s ours
am skip reason: subject contains skip directive
Change-Id: Iaef7f84ffabe3b1238ed4c3f65330fbb9b43ed38
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:46:44 +0000 (05:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If0c4f3a5f240a8da2bfd94c4496f4a86fabb02e9
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 03:31:09 +0000 (20:31 -0700)]
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
am:
7afb9854a7
Change-Id: I2598b482b4630279d47685381ddac9c746fbe12d
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
TreeHugger Robot [Thu, 22 Aug 2019 17:11:06 +0000 (17:11 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
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:34 +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: I0ad889879219af3ac9f9ccbaac40caecadd1ebef
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