Commit Graph

38572 Commits

Author SHA1 Message Date
Kevin Chyn
df872a5f0a Default-off FP Swipe am: 8f5de15ba1 am: 0d378e04ca
am: a3874cf593

Change-Id: Ib2d312d36a5200ed4b677eb2a4d79f9e84b12d75
2017-07-25 01:13:04 +00:00
Kevin Chyn
a3874cf593 Default-off FP Swipe am: 8f5de15ba1
am: 0d378e04ca

Change-Id: I8dd88ec940d3624c5eb7f59facd0c1ed7c4de55e
2017-07-25 01:10:34 +00:00
Kevin Chyn
0d378e04ca Default-off FP Swipe
am: 8f5de15ba1

Change-Id: Iac3a85ac3e0d6f30d32b2823f168f3123d375f08
2017-07-25 01:07:31 +00:00
Fan Zhang
febf70348b Merge "Update string for bluetooth device visibility" into oc-mr1-dev am: c239561da5
am: 3c8b12e2dd

Change-Id: I3eff784da35cbb8713540518c271842945e63d12
2017-07-24 21:49:10 +00:00
Fan Zhang
3c8b12e2dd Merge "Update string for bluetooth device visibility" into oc-mr1-dev
am: c239561da5

Change-Id: Ic124bbed9f9bf3185787444264d063185f9754f6
2017-07-24 21:38:18 +00:00
TreeHugger Robot
c239561da5 Merge "Update string for bluetooth device visibility" into oc-mr1-dev 2017-07-24 21:29:22 +00:00
Kevin Chyn
8f5de15ba1 Default-off FP Swipe
Fixes: 63992836

Test: adb shell settings delete secure system_navigation_keys_enabled
&& make -j RunSettingsRoboTests

Change-Id: I3245c7b8844df5edaea311c1871b1dd05b8b7784
2017-07-24 14:00:18 -07:00
Michael Wachenschwanz
bd891f5813 Merge "Add Foreground Service time to battery usage" into oc-mr1-dev am: a47a3f58bf
am: 4a36ff9338

Change-Id: I2dd6202d0e6650735d4d0f08fac36472ccc4dc08
2017-07-24 19:09:08 +00:00
Michael Wachenschwanz
4a36ff9338 Merge "Add Foreground Service time to battery usage" into oc-mr1-dev
am: a47a3f58bf

Change-Id: Ib34924d8749d7012139ef2e8e48921fe4fc62f2a
2017-07-24 19:06:37 +00:00
Michael Wachenschwanz
a47a3f58bf Merge "Add Foreground Service time to battery usage" into oc-mr1-dev 2017-07-24 19:02:12 +00:00
Fan Zhang
358d30f093 Update string for bluetooth device visibility
Change-Id: I33baa5e72596e10f10f13d2324144ca9036c3fc9
Fix: 62891178
Test: visual
Test: robotests
2017-07-24 18:40:59 +00:00
Lei Yu
09f4ae371e Merge "Merge "Add log for anomaly." into oc-dr1-dev am: 6666bf5605 am: 5e48ea193b" into oc-mr1-dev-plus-aosp
am: 84d82d3d9e

Change-Id: I83cea384c0bcb33ecaf3d3352660e1c5c52ad3b2
2017-07-24 18:23:25 +00:00
Lei Yu
a0b1fa6120 Merge "Add log for anomaly." into oc-dr1-dev am: 6666bf5605 am: 0f9fa63c3a
am: d98275c7dc

Change-Id: I2f619171a42aca61f1d8e913005f9f0d44095118
2017-07-24 18:23:05 +00:00
Android Build Merger (Role)
84d82d3d9e Merge "Merge "Add log for anomaly." into oc-dr1-dev am: 6666bf5605 am: 5e48ea193b" into oc-mr1-dev-plus-aosp 2017-07-24 18:14:28 +00:00
Lei Yu
9e5f170d7f Merge "Add log for anomaly." into oc-dr1-dev am: 6666bf5605
am: 5e48ea193b

Change-Id: Id5d6e02eb05e7a5446c81a1c1ef94c2104ce4902
2017-07-24 18:14:14 +00:00
Lei Yu
d98275c7dc Merge "Add log for anomaly." into oc-dr1-dev am: 6666bf5605
am: 0f9fa63c3a

Change-Id: Ibb11b891799815a3ec2f8c8961b197ffadeaf9db
2017-07-24 18:14:13 +00:00
Lei Yu
0f9fa63c3a Merge "Add log for anomaly." into oc-dr1-dev
am: 6666bf5605

Change-Id: I7ca4b466c6f175192bebb2b9a7807ebf783a249e
2017-07-24 18:07:13 +00:00
Lei Yu
5e48ea193b Merge "Add log for anomaly." into oc-dr1-dev
am: 6666bf5605

Change-Id: I4903e3617b2fab64831b6e0ad8b5214ea5dd5317
2017-07-24 18:07:12 +00:00
Lei Yu
6666bf5605 Merge "Add log for anomaly." into oc-dr1-dev 2017-07-24 17:56:35 +00:00
Andrew Sapperstein
68f252e9bd Merge "Add ResultPayload for always-on ambient display. am: eb1a45b95b am: cfb2b87d03 -s ours" into oc-mr1-dev-plus-aosp
am: 867ee49254  -s ours

Change-Id: Ibb7dee38be7424883002939aae5fe6f3c3d17ff4
2017-07-24 17:48:49 +00:00
Andrew Sapperstein
bc0481fe4c Add ResultPayload for always-on ambient display. am: eb1a45b95b -s ours am: 8389d669f1 -s ours
am: 7b2efcace8  -s ours

Change-Id: Ibff0c7e61d966f668f79d2eb16232d47c02a9549
2017-07-24 17:48:27 +00:00
Android Build Merger (Role)
867ee49254 Merge "Add ResultPayload for always-on ambient display. am: eb1a45b95b am: cfb2b87d03 -s ours" into oc-mr1-dev-plus-aosp 2017-07-24 17:42:01 +00:00
Andrew Sapperstein
0e8ce838ec Add ResultPayload for always-on ambient display. am: eb1a45b95b
am: cfb2b87d03  -s ours

Change-Id: I56bad70b1614cf80c4bb24695902c4fc5fa5dc53
2017-07-24 17:41:47 +00:00
Andrew Sapperstein
7b2efcace8 Add ResultPayload for always-on ambient display. am: eb1a45b95b -s ours
am: 8389d669f1  -s ours

Change-Id: I7d0778edd726966a4e68398b5c14a6144d1ee4af
2017-07-24 17:41:42 +00:00
Andrew Sapperstein
cfb2b87d03 Add ResultPayload for always-on ambient display.
am: eb1a45b95b

Change-Id: Ie00201adc19b7da516e3bb64fe857a17f8282d28
2017-07-24 17:34:10 +00:00
Andrew Sapperstein
8389d669f1 Add ResultPayload for always-on ambient display.
am: eb1a45b95b  -s ours

Change-Id: I67522a734dff97d37f09751817f99e5f8a6bf602
2017-07-24 17:34:06 +00:00
Andrew Sapperstein
92c100e02d Add ResultPayload for always-on ambient display. am: 36af00bb21
am: e77497ce6a

Change-Id: I7690018fb294fddf0322f6eed061e1e3e71683c6
2017-07-24 17:22:08 +00:00
Andrew Sapperstein
e77497ce6a Add ResultPayload for always-on ambient display.
am: 36af00bb21

Change-Id: I4b451605cee675c5949aeb68be27588502ded0d0
2017-07-24 17:08:17 +00:00
Andrew Sapperstein
36af00bb21 Add ResultPayload for always-on ambient display.
Bug: 62022517
Test: robotest
Change-Id: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
2017-07-23 06:11:22 +00:00
Andrew Sapperstein
eb1a45b95b Add ResultPayload for always-on ambient display.
Bug: 62022517
Test: robotest
Change-Id: Ib6382030ffa0c159ab6ca4b45dd966ee9287181f
Merged-In: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
2017-07-22 20:57:07 -07:00
Fan Zhang
2e550c25d5 Merge "Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev am: 6fcc38975c -s ours am: 6cd295af8a -s ours" into oc-mr1-dev-plus-aosp
am: 34e1495b9a  -s ours

Change-Id: I1e8ff08dbdce2eaa450d04e1dc571ae5578bd1d5
2017-07-22 18:06:33 +00:00
Fan Zhang
3ab1481442 Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev am: 6fcc38975c am: 2c7b00d101 -s ours
am: 4bcaef7b0c  -s ours

Change-Id: I5a834f28cc5909d1f451ceb295e8c4921f2ae2c7
2017-07-22 18:06:09 +00:00
Android Build Merger (Role)
34e1495b9a Merge "Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev am: 6fcc38975c -s ours am: 6cd295af8a -s ours" into oc-mr1-dev-plus-aosp 2017-07-22 18:03:23 +00:00
Fan Zhang
85e7ac21d7 Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev am: 6fcc38975c -s ours
am: 6cd295af8a  -s ours

Change-Id: Ib310943f7b0dae93714b01d19cdf08f14b8eeb8e
2017-07-22 18:03:07 +00:00
Fan Zhang
4bcaef7b0c Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev am: 6fcc38975c
am: 2c7b00d101  -s ours

Change-Id: Iaa1c8ef7686c8842becf494d210b08aed097fb50
2017-07-22 18:03:06 +00:00
Fan Zhang
2c7b00d101 Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
am: 6fcc38975c

Change-Id: Iacb3b689d1099bb12e43ff42e2f17166428ddfc5
2017-07-22 17:59:38 +00:00
Fan Zhang
6cd295af8a Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
am: 6fcc38975c  -s ours

Change-Id: I8ab95d4753c9369a4d47c83ade83380d26733b46
2017-07-22 17:59:36 +00:00
TreeHugger Robot
6fcc38975c Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev 2017-07-22 17:54:31 +00:00
Bill Yi
e079b45c81 Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9 -s ours am: ccf6996623 -s ours" into oc-mr1-dev-plus-aosp
am: 47099cf173  -s ours

Change-Id: I70e2aea1799d8b38baa3a50818ac883b6bf37398
2017-07-22 16:47:52 +00:00
Bill Yi
a0a33d158c Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9 -s ours am: 098c04e781 -s ours
am: eca137aa43  -s ours

Change-Id: Ice5b7d4cacd9b6179e1d60dc3a52a4e3798d0679
2017-07-22 16:47:28 +00:00
Android Build Merger (Role)
47099cf173 Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9 -s ours am: ccf6996623 -s ours" into oc-mr1-dev-plus-aosp 2017-07-22 16:38:48 +00:00
Bill Yi
eca137aa43 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9 -s ours
am: 098c04e781  -s ours

Change-Id: Ie43f65cae3a7422bfbb0d95281e30489f1c36365
2017-07-22 16:38:29 +00:00
Bill Yi
4e3ff0501f Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 4d7111b0e9 -s ours
am: ccf6996623  -s ours

Change-Id: I61ebe83e46f7dcaf8ffe3eddc817858c48695b38
2017-07-22 16:38:28 +00:00
Bill Yi
098c04e781 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 4d7111b0e9  -s ours

Change-Id: Ia23869b823b5f9f578eea955f037393960bb02e0
2017-07-22 16:32:30 +00:00
Bill Yi
ccf6996623 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 4d7111b0e9  -s ours

Change-Id: Ida2173d9ce4c4f4aa3efbb24fe0b68d9fa940a29
2017-07-22 16:32:30 +00:00
TreeHugger Robot
4d7111b0e9 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-07-22 16:25:35 +00:00
TreeHugger Robot
06ce58b8d5 Merge "Import translations. DO NOT MERGE" 2017-07-22 16:13:53 +00:00
Bill Yi
555a55210a Import translations. DO NOT MERGE
Change-Id: I0dbb4c3f5c88953469428df5ac70973d18e253ba
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-22 03:57:25 -07:00
Bill Yi
5f049085b9 Import translations. DO NOT MERGE
Change-Id: I72ad5b5a671392c519f7a4ca5fce76404c2240b5
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-22 03:36:18 -07:00
TreeHugger Robot
60bb1d39eb Merge "Post preference update logic to main thread" 2017-07-22 02:23:48 +00:00