Bill Yi
cc1306957a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
...
am: 833512a1d2
-s ours
am skip reason: subject contains skip directive
Change-Id: I20fe79ea6a6f6b3fd54da7ab03eaa233913287c1
2019-10-01 15:18:03 -07:00
Joshua Mccloskey
b288f07bb2
Merge "Added new string." into qt-qpr1-dev
...
am: 262f5fe91f
Change-Id: If8467461e0963648886c02159353c177e9b88d41
2019-10-01 15:17:26 -07:00
TreeHugger Robot
833512a1d2
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2019-10-01 22:08:03 +00:00
Joshua Mccloskey
262f5fe91f
Merge "Added new string." into qt-qpr1-dev
2019-10-01 22:05:41 +00:00
Bill Yi
881736b7ef
Import translations. DO NOT MERGE
...
Change-Id: I594742575ea6729d9c71e0ef04658f6513875aaf
Auto-generated-cl: translation import
2019-10-01 12:53:15 -07:00
Bonian Chen
c7c84d2c87
[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
2019-10-01 17:59:43 +00:00
Paul Hu
67fe04814d
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED" am: a67ca4cfd7
am: 3a728ae13b
...
am: a6dadc465b
Change-Id: I08a04f4e627ce876a3cabd194a9838a0b5ce8459
2019-10-01 03:15:14 -07:00
Paul Hu
a6dadc465b
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED" am: a67ca4cfd7
...
am: 3a728ae13b
Change-Id: Id211709644b505fa866b0661f9657991c36dbaf6
2019-10-01 03:09:15 -07:00
Paul Hu
3a728ae13b
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED"
...
am: a67ca4cfd7
Change-Id: I7a2a4d76d1e0092188121d390c75c12eac20cdab
2019-10-01 03:03:36 -07:00
Paul Hu
a67ca4cfd7
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED"
2019-10-01 09:50:28 +00:00
Bill Yi
beb37b072f
[automerger skipped] Import translations. DO NOT MERGE
...
am: 0631ad6efb
-s ours
am skip reason: subject contains skip directive
Change-Id: I1338a125768855043cf83c6c5c759b470e12e7d4
2019-09-30 12:42:10 -07:00
Bill Yi
0631ad6efb
Import translations. DO NOT MERGE
...
Change-Id: I10e5b04a3a580ba34f945305d011ac192a3c4dd3
Auto-generated-cl: translation import
2019-09-30 03:35:57 -07:00
Bill Yi
37703c090a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
...
am: b01e0ab05c
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie644497f111a2029d99a700b6333d3dec43fa948
2019-09-28 14:16:37 -07:00
TreeHugger Robot
b01e0ab05c
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2019-09-28 21:05:31 +00:00
Bill Yi
f7de50f5be
Import translations. DO NOT MERGE
...
Change-Id: Idfb9ca3c6ddf6aa0a9bc04a262b8e0fd76032867
Auto-generated-cl: translation import
2019-09-28 04:11:34 -07:00
joshmccloskey
515772802f
Changed string for translations.
...
am: 186dbc65af
Change-Id: Id48a469817c96a13ac1311792ad4b8bcd61fe88f
2019-09-27 16:41:36 -07:00
joshmccloskey
4259495574
Added new string.
...
Fixes: 141762646
Test: Verified that string translates to spanish after changing
the language.
Change-Id: I48e34de15460c93c8f50d26821c4d64984f20c6d
2019-09-27 23:15:32 +00:00
joshmccloskey
186dbc65af
Changed string for translations.
...
Fixes: 141762646
Test: Verified that string translates to spanish after changing
the language.
Change-Id: Ieebb2ec15cf5cff2afcfefcb130193bdce6086fe
2019-09-27 21:56:46 +00:00
Kevin Chyn
a9c14ab4b1
Fix FaceSetupSliceTest
...
am: acde97cf90
Change-Id: Ied72d5ae4b891ef1c5600b8d416b016d0aede23e
2019-09-27 01:07:02 -07:00
Kevin Chyn
acde97cf90
Fix FaceSetupSliceTest
...
Bug: 141380252
Test: make -j56 RunSettingsRoboTests
Change-Id: Ifb9a29d8f3115759a9e8e93e3721135c6ba229bf
2019-09-26 22:32:52 -07:00
joshmccloskey
3511ad89ca
Added different flow for re-enrollment
...
am: bba7632f28
Change-Id: Ie5174848a3a35df197177b0aa2cf6c324813b8dd
2019-09-26 20:06:48 -07:00
joshmccloskey
bba7632f28
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
2019-09-26 23:54:59 +00:00
lucaslin
570f7dbc4b
Improve the wifi description for the case of private DNS broken
...
Currently, users don't know if the wifi description shows
"No internet" means it really doesn't have internet access or no
internet is because of private DNS resolution failed. So, Add a
new description for wifi when private DNS is broken.
Bug: 113242081
Test: make -j44 RunSettingsRoboTests \
ROBOTEST_FILTER=WifiDetailPreferenceControllerTest
Change-Id: I44a7e51cf76dc3f2a6b9583f226af6649f9b1f5f
2019-09-26 15:55:01 +08:00
Taesu Lee
1c20ea5644
Merge "Fix to show eUICC preference in eng build" am: e825c30137
am: 9e81a2f4a8
...
am: c4c8f51bb0
Change-Id: I58dae46adec67c855a5e26542d75d15f116c37dc
2019-09-25 23:28:11 -07:00
Taesu Lee
c4c8f51bb0
Merge "Fix to show eUICC preference in eng build" am: e825c30137
...
am: 9e81a2f4a8
Change-Id: I777273344c8eb4f791756be7fcb9755a5bf9e8b8
2019-09-25 23:21:12 -07:00
Taesu Lee
9e81a2f4a8
Merge "Fix to show eUICC preference in eng build"
...
am: e825c30137
Change-Id: Ie6ca5a575e5c5caa4c841286421d037649765397
2019-09-25 23:14:10 -07:00
Treehugger Robot
e825c30137
Merge "Fix to show eUICC preference in eng build"
2019-09-26 05:53:10 +00:00
joshmccloskey
ab5bf98c03
Added mandatory scrolling for FaceIntroduction
...
am: af1e831ab7
Change-Id: I1877ce4650fd393d08e2ff1c15944df8fbd4d6d7
2019-09-25 10:58:00 -07:00
Bill Yi
5f968e68c7
[automerger skipped] Import translations. DO NOT MERGE am: 500e7b2b71
-s ours
...
am: 444eac4f4a
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic8198769cb6d796e2add9491f538723fa3381d4c
2019-09-25 07:46:21 -07:00
Bill Yi
444eac4f4a
[automerger skipped] Import translations. DO NOT MERGE
...
am: 500e7b2b71
-s ours
am skip reason: subject contains skip directive
Change-Id: I4a84a614577ee9558b05de1e30fe543ff2ece1d3
2019-09-25 07:30:56 -07:00
Bill Yi
500e7b2b71
Import translations. DO NOT MERGE
...
Change-Id: I0f9786915ebc5c168487e7a5386d4f2060d27a12
Auto-generated-cl: translation import
2019-09-24 18:54:26 -07:00
joshmccloskey
af1e831ab7
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
2019-09-25 00:23:59 +00:00
Felipe Leon
e42ab42c5c
Settings: fix apn_editor carrier_enabled summaryOff string
...
Change-Id: I44ccec73601806dc8facad122f1ab16ff3aca484
Signed-off-by: Felipe Leon <fglfgl27@gmail.com >
2019-09-25 00:43:17 +03:00
Daniel Huang
f7b4dc1dc7
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's" am: 51cb777530
am: f28625bcf1
...
am: 1fec213233
Change-Id: Ifed2aeb3759051ce1ddc490fb695b50642b76402
2019-09-24 02:45:00 -07:00
Daniel Huang
1fec213233
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's" am: 51cb777530
...
am: f28625bcf1
Change-Id: Ie151d421eae8321dc684f7d4a684f582fb60c3ac
2019-09-24 02:39:02 -07:00
Daniel Huang
f28625bcf1
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's"
...
am: 51cb777530
Change-Id: I7d6675734eed90cbfb0ccda46c047883e460962f
2019-09-24 02:32:29 -07:00
Daniel Huang
51cb777530
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's"
2019-09-24 09:21:51 +00:00
Yi-Ling Chuang
3b8a14e86f
Merge "Enable dismissal feature on legacy suggestions." am: ee39335edc
am: 8d8c3e19b5
...
am: b26711944b
Change-Id: I0edf1eff42cf54e644e60a11ba97219c38891e93
2019-09-22 20:16:25 -07:00
Yi-Ling Chuang
b26711944b
Merge "Enable dismissal feature on legacy suggestions." am: ee39335edc
...
am: 8d8c3e19b5
Change-Id: I8fae05f98c2ad04e0d7fba7a2aa409c08f781c0b
2019-09-22 20:09:51 -07:00
Yi-Ling Chuang
8d8c3e19b5
Merge "Enable dismissal feature on legacy suggestions."
...
am: ee39335edc
Change-Id: Ibce2403de032bd3d7fce750f6cd80191a8b14441
2019-09-22 20:03:21 -07:00
Treehugger Robot
ee39335edc
Merge "Enable dismissal feature on legacy suggestions."
2019-09-23 02:45:25 +00:00
Android Build Merger (Role)
df8a9839fc
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 73915b77ed
-s ours am: cbfc75bb00
-s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
2019-09-22 19:59:59 +00:00
Bill Yi
66d00b68c6
[automerger skipped] Import translations. DO NOT MERGE am: 73915b77ed
-s ours
...
am: 99f04da5dc
-s ours
am skip reason: subject contains skip directive
Change-Id: I6f6945b78fd9a192c61d03a0741f62e7ea93fdcb
2019-09-22 12:59:44 -07:00
Bill Yi
85533dc3e2
[automerger skipped] Import translations. DO NOT MERGE am: 73915b77ed
-s ours
...
am: cbfc75bb00
-s ours
am skip reason: subject contains skip directive
Change-Id: I93d10d5ed7938c69b3b26c3b22d9d56ebc03f6ed
2019-09-22 12:59:44 -07:00
Bill Yi
f5e74d30d6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
...
am: 59e1c0a768
-s ours
am skip reason: subject contains skip directive
Change-Id: Iaf1cc92e717e2a7cdada89267ee6b5f3cc55a5b0
2019-09-22 12:54:00 -07:00
Bill Yi
99f04da5dc
[automerger skipped] Import translations. DO NOT MERGE
...
am: 73915b77ed
-s ours
am skip reason: subject contains skip directive
Change-Id: Ief64a890db8759f6361b58d304ff4f7e333739c6
2019-09-22 12:53:43 -07:00
Bill Yi
cbfc75bb00
[automerger skipped] Import translations. DO NOT MERGE
...
am: 73915b77ed
-s ours
am skip reason: subject contains skip directive
Change-Id: I31f45d935e2c9a13feb71186730b99fffc102c9b
2019-09-22 12:53:43 -07:00
TreeHugger Robot
59e1c0a768
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2019-09-22 19:42:36 +00:00
Bill Yi
0b39e54783
Import translations. DO NOT MERGE
...
Change-Id: I92110fede16a12a445efbd96896e17f46f89a203
Auto-generated-cl: translation import
2019-09-22 07:52:20 -07:00
Bill Yi
73915b77ed
Import translations. DO NOT MERGE
...
Change-Id: Ib6e2dcd3084a0399fec672c4fff3a51e8dd0d195
Auto-generated-cl: translation import
2019-09-22 07:38:24 -07:00