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
Edgar Wang
18839c1fbc
Merge "Handle Aware sensor status for Always On" into qt-qpr1-dev
...
am: 07ea1dc815
Change-Id: Ia7f62e46c3c9d7c9b7a55686be911891764ff75d
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
Change-Id: I0b3cb958eff31ede7daa3292987684c26e9111d5
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
Change-Id: I22d614cd7c6868e4c28d894ea2a3fe48f8266457
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
Change-Id: I69ea913c7596017ab2d08dfe67c8376527d01603
2019-09-17 10:17:41 -07:00
Neil Fuller
42b55bc6f6
Merge "Remove use of deprecated Time class" am: b3f8696c4d
...
am: b83ddefb5c
Change-Id: Iafc1b00c254a5f7cc6af80b3eeeaf4418fbdbaf9
2019-09-17 10:06:03 -07:00
Neil Fuller
b83ddefb5c
Merge "Remove use of deprecated Time class"
...
am: b3f8696c4d
Change-Id: Ie6dcfcde7ec223ed83b2d8d33f059924e3a566e9
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
Mady Mellor
82c74accb0
[automerger skipped] Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev
...
am: eac42583a1
-s ours
am skip reason: change_id I58f0287ed99a4daf3758316e4004bca05f17b0d1 with SHA1 ea79e343f0
is in history
Change-Id: I80f853b777590b66aa8689e36864b381a947cb72
2019-09-16 15:22:08 -07:00
Mady Mellor
94e2682ad1
[automerger skipped] qt-r1-bubbles-dev @ build 5835883
...
am: 91ba8e9b66
-s ours
am skip reason: change_id I58f0287ed99a4daf3758316e4004bca05f17b0d1 with SHA1 ea79e343f0
is in history
Change-Id: I4bcd05a7b87d9735c545a4599fffefc82e0c4856
2019-09-16 15:16:35 -07:00
Mady Mellor
eac42583a1
Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev
2019-09-16 21:55:52 +00:00
Bill Yi
e3f5ddcdfe
[automerger skipped] Import translations. DO NOT MERGE
...
am: 1ae748b09f
-s ours
am skip reason: subject contains skip directive
Change-Id: Ibb1bf53b21569e91e4d9e1ce47577fa525aaaec0
2019-09-15 15:28:41 -07:00
Bill Yi
1ae748b09f
Import translations. DO NOT MERGE
...
Change-Id: If6b8f670eb54a3f5b45efa0ba2a540cd25327260
Auto-generated-cl: translation import
2019-09-14 18:38:18 -07:00
Ilya Matyukhin
4dfe356797
Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev
...
am: 3df43a3eae
Change-Id: Iaeaedcde2e27f07cb5849a2cf670219fd143b934
2019-09-13 02:28:52 -07:00
Ilya Matyukhin
3df43a3eae
Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev
2019-09-13 09:10:32 +00:00
Ilya Matyukhin
a95459c640
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
2019-09-13 09:10:15 +00:00
Bill Yi
eeca546428
[automerger skipped] Import translations. DO NOT MERGE am: 86dfbd6254
-s ours
...
am: 5c90432dc1
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic722d4de71c99e005a84f5650c8bf9c82c392cd0
2019-09-12 17:49:20 -07:00
Bill Yi
3590e5d52c
[automerger skipped] Import translations. DO NOT MERGE am: 86dfbd6254
-s ours
...
am: edbddf7f42
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib0eeb1f2ac5bff404717b4550d48c32bc536ef61
2019-09-12 17:42:18 -07:00
Bill Yi
5c90432dc1
[automerger skipped] Import translations. DO NOT MERGE
...
am: 86dfbd6254
-s ours
am skip reason: subject contains skip directive
Change-Id: I9979a3422b5926a7e210ded393484f6eb28e8600
2019-09-12 17:39:37 -07:00
Bill Yi
6ada8629a2
[automerger skipped] Import translations. DO NOT MERGE
...
am: f066797849
-s ours
am skip reason: subject contains skip directive
Change-Id: I83269163f1e1f3752a85cb4eaed860316efba142
2019-09-12 17:28:34 -07:00
Bill Yi
edbddf7f42
[automerger skipped] Import translations. DO NOT MERGE
...
am: 86dfbd6254
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib139ea535e149923d50d835e030636df7edbf7cc
2019-09-12 17:28:33 -07:00
Bill Yi
f066797849
Import translations. DO NOT MERGE
...
Change-Id: I27cfc6c9ffa9def49d83eea920b88a5ce762fb53
Auto-generated-cl: translation import
2019-09-12 16:10:45 -07:00
Bill Yi
86dfbd6254
Import translations. DO NOT MERGE
...
Change-Id: I1cf797286a22443416d4b401e38f8923bb4edd43
Auto-generated-cl: translation import
2019-09-12 15:54:53 -07:00