Bill Yi
37703c090a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
...
am: b01e0ab05c
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
2019-09-27 16:41:36 -07: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
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
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
Taesu Lee
1c20ea5644
Merge "Fix to show eUICC preference in eng build" am: e825c30137 am: 9e81a2f4a8
...
am: c4c8f51bb0
2019-09-25 23:28:11 -07:00
Taesu Lee
c4c8f51bb0
Merge "Fix to show eUICC preference in eng build" am: e825c30137
...
am: 9e81a2f4a8
2019-09-25 23:21:12 -07:00
Taesu Lee
9e81a2f4a8
Merge "Fix to show eUICC preference in eng build"
...
am: e825c30137
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
2019-09-25 10:58:00 -07:00
Bill Yi
5f968e68c7
[automerger skipped] Import translations. DO NOT MERGE am: 500e7b2b71 -s ours
...
am: 444eac4f4a
2019-09-25 07:46:21 -07:00
Bill Yi
444eac4f4a
[automerger skipped] Import translations. DO NOT MERGE
...
am: 500e7b2b71
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
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
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
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
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
2019-09-22 20:16:25 -07:00
Yi-Ling Chuang
b26711944b
Merge "Enable dismissal feature on legacy suggestions." am: ee39335edc
...
am: 8d8c3e19b5
2019-09-22 20:09:51 -07:00
Yi-Ling Chuang
8d8c3e19b5
Merge "Enable dismissal feature on legacy suggestions."
...
am: ee39335edc
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
2019-09-22 12:59:44 -07:00
Bill Yi
85533dc3e2
[automerger skipped] Import translations. DO NOT MERGE am: 73915b77ed -s ours
...
am: cbfc75bb00
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
2019-09-22 12:54:00 -07:00
Bill Yi
99f04da5dc
[automerger skipped] Import translations. DO NOT MERGE
...
am: 73915b77ed
2019-09-22 12:53:43 -07:00
Bill Yi
cbfc75bb00
[automerger skipped] Import translations. DO NOT MERGE
...
am: 73915b77ed
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
Edgar Wang
18839c1fbc
Merge "Handle Aware sensor status for Always On" into qt-qpr1-dev
...
am: 07ea1dc815
2019-09-21 02:07:52 -07:00
Edgar Wang
07ea1dc815
Merge "Handle Aware sensor status for Always On" into qt-qpr1-dev
2019-09-21 08:54:47 +00:00
Yi-Ling Chuang
83ac0efd81
Enable dismissal feature on legacy suggestions.
...
Add back the close button for legacy suggestions.
Fixes: 140786274
Test: robotest
Change-Id: Iaf0376bd482db4c4ff7d04a68131071c29c01ced
2019-09-20 18:03:10 -07:00
Edgar Wang
c3a9fff980
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
2019-09-21 02:08:36 +08:00
苗苗 (Miao Miao)
9f4a65c893
In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's
...
STEPS TO REPRODUCE:
1. Insert two sim into device, sim1 is CUCC, sim2 is CMCC
2. Goto Settings-Network & Internet-sim1-MobileNetworkSettings-Access Point Names. It shows CUCC APN information
3. Hot plug out sim2
4. Hot plug in sim2, APN information changes to CMCC APN information
EXPECTED RESULTS:
When hot plug out/in sim2, sim1 APN settings interface should still keep its APN information instead of changing to sim2 APN information
Change-Id: I04c769f60ba1686b2c9bebcd07e3a04685979442
Bug: 141087659
Test:In sim1 APN settings interface, hot plug out/in sim2, it shows sim1 APN information all the time, test pass.
2019-09-20 18:13:30 +08:00
Bonian Chen
3cce668981
Merge "[Help Page] Support help content under 2 CDMA SIM" into qt-qpr1-dev
...
am: 20290d0451
2019-09-19 13:25:31 -07:00
Bonian Chen
20290d0451
Merge "[Help Page] Support help content under 2 CDMA SIM" into qt-qpr1-dev
2019-09-19 20:07:20 +00:00
Bonian Chen
fad5a00b84
[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
2019-09-18 22:20:25 +00:00
joshmccloskey
3b20d776fe
Updated face remove dialog string.
...
am: 7abb800c9f
2019-09-17 20:30:28 -07:00
joshmccloskey
7abb800c9f
Updated face remove dialog string.
...
Test: Verified that the correct string shows after deleting
face data.
Fixes: 141145591
Change-Id: I836c79fb4775157ae4995f706e05d1fd1233bc8f
2019-09-17 23:46:46 +00:00
Neil Fuller
ac3d9d8641
Merge "Remove use of deprecated Time class" am: b3f8696c4d am: b83ddefb5c
...
am: 42b55bc6f6
2019-09-17 10:17:41 -07:00
Neil Fuller
42b55bc6f6
Merge "Remove use of deprecated Time class" am: b3f8696c4d
...
am: b83ddefb5c
2019-09-17 10:06:03 -07:00
Neil Fuller
b83ddefb5c
Merge "Remove use of deprecated Time class"
...
am: b3f8696c4d
2019-09-17 09:56:45 -07:00
Treehugger Robot
b3f8696c4d
Merge "Remove use of deprecated Time class"
2019-09-17 16:32:47 +00:00
Neil Fuller
4c77d00e34
Remove use of deprecated Time class
...
Remove a use of the deprecated Time class.
Bug: 16550209
Test: treehugger only
Change-Id: If97b0d8ea78a76d613652ab623c3a48f5aa9aabb
2019-09-17 13:53:17 +01:00
