Commit Graph

18119 Commits

Author SHA1 Message Date
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
Bill Yi
0b39e54783 Import translations. DO NOT MERGE
Change-Id: I92110fede16a12a445efbd96896e17f46f89a203
Auto-generated-cl: translation import
2019-09-22 07:52:20 -07: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
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
Mady Mellor
eac42583a1 Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev 2019-09-16 21:55:52 +00: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
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
deee385ba8 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I1b2826dd790519a2946d8505aec03f72b1815f04
2019-09-11 19:26:07 -07:00
Mady Mellor
91ba8e9b66 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
2019-09-11 22:42:17 +00:00
Mady Mellor
88de4328fd Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev-plus-aosp 2019-09-11 22:40:20 +00:00
Bill Yi
d62965ba03 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 140445577
Change-Id: Ica56884b49d5f16a84096f4c4f34bc0b639ad3e1
2019-09-11 03:03:16 +00:00
Mady Mellor
ea79e343f0 qt-r1-bubbles-dev @ build 5835883
Test: presubmit setup on source branch

Bug: 129158983
Bug: 136034310
Bug: 137876221
Change-Id: I58f0287ed99a4daf3758316e4004bca05f17b0d1
Merged-In: If2b813f24cf5998829fe417e32179c5e8283d308
2019-09-09 21:48:54 +00:00
Miranda Kephart
e9963e37d5 Merge branch 'fetch_qt-qpr1-sysui-dev_5855545' into merge_qt-qpr1-sysui-dev_5855545
Test: manual, presubmit on the source branch

Merged-In: Idc3d5c39427722a5486552312552f7f77ef40980
Change-Id: Ieea5138da3d182735fb92eedd607f52750c91e19
2019-09-09 20:27:44 +00:00
Joshua Mccloskey
0ec126ead9 Merge "Modified text to cancel enrollment" into qt-r1-dev am: fde49ec3ad
am: 820c723e59

Change-Id: Ib3f4d6c66e1cbe2dbdda9b8ae1bbf8ace74877dd
2019-09-05 16:10:01 -07:00
Joshua Mccloskey
b8e4bd45c2 Merge "Modified text to cancel enrollment" into qt-r1-dev am: fde49ec3ad
am: cbeeed9942

Change-Id: I6a62cccc71ce78f49ab85713b162be1395f8769d
2019-09-05 16:10:00 -07:00
Joshua Mccloskey
cbeeed9942 Merge "Modified text to cancel enrollment" into qt-r1-dev
am: fde49ec3ad

Change-Id: I7691e528d2ceb433509558885ad8af750ddc6678
2019-09-05 16:00:59 -07:00
Joshua Mccloskey
820c723e59 Merge "Modified text to cancel enrollment" into qt-r1-dev
am: fde49ec3ad

Change-Id: I9f412f3eebda4dde2995932ad2ca2a16e2d2a82a
2019-09-05 15:59:59 -07:00
Joshua Mccloskey
fde49ec3ad Merge "Modified text to cancel enrollment" into qt-r1-dev 2019-09-05 22:44:12 +00:00
Joshua Mccloskey
763e5588ba Merge "Updated security settings string." into qt-r1-dev am: b7ac44e643
am: 648db67fec

Change-Id: Ie8c9b2a05d6b7ac5d02df2936eaf897fce585f3d
2019-09-05 13:31:50 -07:00
Joshua Mccloskey
27c1468940 Merge "Updated security settings string." into qt-r1-dev am: b7ac44e643
am: 648db67fec

Change-Id: Id42bb590b657ab4e3ae5164f51dcc50abb62a544
2019-09-05 13:22:56 -07:00
Joshua Mccloskey
c542abdcaf Merge "Updated security settings string." into qt-r1-dev
am: b7ac44e643

Change-Id: Ife05eee951852b471138afb3f73fd4e153cc9d43
2019-09-05 13:17:36 -07:00
Joshua Mccloskey
648db67fec Merge "Updated security settings string." into qt-r1-dev
am: b7ac44e643

Change-Id: Ib890b97401801fb5bcea20d1cd4fa284c1dec09f
2019-09-05 12:50:45 -07:00
joshmccloskey
a55cbf036f Modified text to cancel enrollment
Fixes: 140446388
Test: Manual.
Change-Id: If3f0affb390743cd7973957b5dea69d5e012dcb1
2019-09-05 12:23:44 -07:00
Joshua Mccloskey
b7ac44e643 Merge "Updated security settings string." into qt-r1-dev 2019-09-05 19:22:29 +00:00
joshmccloskey
e02042d140 Updated security settings string.
Test: Manual.
Bug: 140445577
Change-Id: Ie31132dcfcc10a8970b32c1a9bd082990560a353
2019-09-03 16:33:39 -07:00
Bill Yi
6cf0558c80 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ife4a90b13e0fea3568f7dd2097184b46cc542237
2019-09-01 23:17:12 -07:00
Bill Yi
67a6005f02 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If0969b48cec65b4596c96c0da99714858a6923a3
2019-08-30 17:35:08 -07:00
Bill Yi
acf9750118 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I893b442565d5ac2caa0607111c523ecef27c7bf6
2019-08-30 17:04:50 -07:00
Bill Yi
d595d265f0 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I59f54fe4b2f22bb52495436350e1c7e3cf02e800
2019-08-30 16:49:34 -07:00
Bill Yi
e3cbf6a8d1 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If0c4f3a5f240a8da2bfd94c4496f4a86fabb02e9
2019-08-26 05:46:44 -07:00
Bill Yi
29e2efdad1 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8f245fc67033985824bbd6e410f0163c39d6c162
2019-08-26 05:32:34 -07:00
Bill Yi
9781a780e4 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Icd19559f196f76e42d29fe3d9e77bf92d7376a07
2019-08-26 05:04:21 -07:00
Bill Yi
18183ad552 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I21b57a34501c5882af563b0026d52940cc70b3bc
2019-08-26 04:50:21 -07:00
Xin Li
bd8030e8b2 DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
Bug: 139893257
Change-Id: I54b340294458df6016b7893838e1b0f6e61daf11
2019-08-23 06:45:17 +00:00
Bill Yi
fdc3164ce7 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I38f3254282525e8874304943e3acd8289168d493
2019-08-22 03:52:06 -07:00
Bill Yi
f8121473ca Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I20e97f9902c0b550ca2c93a87c02243de733428b
2019-08-22 03:38:17 -07:00
Bill Yi
1815f5a534 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 138829927
Change-Id: Ibebcce851f08b7cc14d8707305f2c21b29e7dfc0
2019-08-21 15:12:57 -07:00
Bill Yi
91ca872a44 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ia404cdb510ff6c09446362da5ca1738f20bcc9fe
2019-08-21 12:57:11 -07:00
Bill Yi
1dea02439a Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I79a6c2c9db40e5198b2bbe60f23d4d2e40f5ab19
2019-08-20 15:26:43 -07:00
Kevin Chyn
88b20ce11e Merge "Remove attention controller" into qt-r1-dev am: 41aafab963
am: 88936d4a46

Change-Id: I85afd00691b65f8a13e8e47801f291383656158c
2019-08-20 13:33:52 -07:00
Bill Yi
ba8880dd87 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 139484065
Change-Id: I6c50b4480bec5326951eb809eabc7194d1d06b65
2019-08-20 18:39:09 +00:00
Kevin Chyn
6dc15d7976 Merge "Remove attention controller" into qt-r1-dev am: 41aafab963
am: 88936d4a46

Change-Id: I13b6d8579a5e1c00aa8ac23ae1f8deac05c057cb
2019-08-19 20:06:32 -07:00
Kevin Chyn
645480a4e4 Merge "Remove attention controller" into qt-r1-dev
am: 41aafab963

Change-Id: I31966ea8f672f664a4d1feae8be30eb47d0a2d32
2019-08-19 19:57:37 -07:00
Kevin Chyn
88936d4a46 Merge "Remove attention controller" into qt-r1-dev
am: 41aafab963

Change-Id: Ic5e2b13d6246fe7693a8f1c289d82d43d3fc6efd
2019-08-19 19:57:37 -07:00
Kevin Chyn
7b8e594e5c Merge "Remove attention controller" into qt-r1-dev
am: 41aafab963

Change-Id: Id77bc47085b72bbc04a9cee635fe288f3c8f7ef4
2019-08-19 19:57:30 -07:00
TreeHugger Robot
41aafab963 Merge "Remove attention controller" into qt-r1-dev 2019-08-20 02:37:20 +00:00
Bill Yi
9909286ace Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I0f506526563a88f386ec68d2a31b00b3e5e3b47e
2019-08-19 10:42:35 -07:00
Bill Yi
0bb9d1e153 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie3771d039d46900090a8a4f58f325b9a5eb29e0a
2019-08-17 01:35:46 -07:00