Michael Wachenschwanz
4a36ff9338
Merge "Add Foreground Service time to battery usage" into oc-mr1-dev
...
am: a47a3f58bf
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
Ajay Nadathur
7af28ecb66
Use fingerprint icons during setupwizard flow
...
Use fingerprint icon when lock screens are loaded on
fingerprint setup's behalf.
bug: 63809908
Test: Manually tested and verified. Also added robolectric tests
Change-Id: I773a1eec2466e7ab626cc3330f5ce987a21b048f
2017-07-24 11:45:13 -07: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
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
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
2017-07-24 18:14:14 +00:00
Lei Yu
d98275c7dc
Merge "Add log for anomaly." into oc-dr1-dev am: 6666bf5605
...
am: 0f9fa63c3a
2017-07-24 18:14:13 +00:00
Lei Yu
0f9fa63c3a
Merge "Add log for anomaly." into oc-dr1-dev
...
am: 6666bf5605
2017-07-24 18:07:13 +00:00
Lei Yu
5e48ea193b
Merge "Add log for anomaly." into oc-dr1-dev
...
am: 6666bf5605
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
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
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
2017-07-24 17:41:47 +00:00
Andrew Sapperstein
7b2efcace8
Add ResultPayload for always-on ambient display. am: eb1a45b95b -s ours
...
am: 8389d669f1
2017-07-24 17:41:42 +00:00
Andrew Sapperstein
cfb2b87d03
Add ResultPayload for always-on ambient display.
...
am: eb1a45b95b
2017-07-24 17:34:10 +00:00
Andrew Sapperstein
8389d669f1
Add ResultPayload for always-on ambient display.
...
am: eb1a45b95b
2017-07-24 17:34:06 +00:00
Andrew Sapperstein
92c100e02d
Add ResultPayload for always-on ambient display. am: 36af00bb21
...
am: e77497ce6a
2017-07-24 17:22:08 +00:00
Andrew Sapperstein
e77497ce6a
Add ResultPayload for always-on ambient display.
...
am: 36af00bb21
2017-07-24 17:08:17 +00:00
Paul Duffin
4862614004
Add dependencies on org.apache.http.legacy where needed
...
Incorporates two main changes:
* Stops statically including the org.apache.http.legacy library. That library is
a stubs library so it makes no sense to statically include it.
* Adds uses-library declaration for org.apache.http.legacy to those packages
that depend on org.apache.http.legacy, either directly or transitively.
The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.
* AndroidManifest.xml
Added <uses-library> for org.apache.http.legacy to ensure classes
are provided at runtime. It is not treated as optional as the
application is not intended to be run on a version that does not
provide the library, i.e. its minSdkVersion is >= M (23)
Bug: 18027885
Test: m -j32 droid && adb reboot bootloader && fastboot flashall -w
Change-Id: I556b54f57ee430b40c4d0870d8179b2cdda43b96
2017-07-24 15:46:40 +01: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
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
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
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
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
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
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
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
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
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
2017-07-22 16:38:28 +00:00
Bill Yi
098c04e781
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 4d7111b0e9
2017-07-22 16:32:30 +00:00
Bill Yi
ccf6996623
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 4d7111b0e9
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
Andrew Sapperstein
4e5a6b988a
Merge "Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am: 59a66d9b77 am: ebd8308698" into oc-mr1-dev-plus-aosp
...
am: cdb44fee84
2017-07-22 00:44:28 +00:00
Fan Zhang
fe70452f51
Merge "Merge "Tweak bluetooth name preference" into oc-dr1-dev am: 03c595ce24 am: 3ecdee573b" into oc-mr1-dev-plus-aosp
...
am: b0431ad1ca
2017-07-22 00:44:07 +00:00
Lei Yu
f1286c1281
Merge "Merge "Make anomaly item refresh in battery" into oc-dr1-dev am: 0ec3e4e626 am: ab7a4db9df" into oc-mr1-dev-plus-aosp
...
am: 1ef1ea17b2
2017-07-22 00:43:47 +00:00
Antony Sargent
46a4a76c90
Merge "Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev am: a6ac4890ed am: 0531bd48e3" into oc-mr1-dev-plus-aosp
...
am: 465871284e
2017-07-22 00:43:28 +00:00
Andrew Sapperstein
5a99deabf2
Merge "Merge "Add help uri for process stats summary and apps." into oc-dr1-dev am: 59a66d9b77 am: 80a5336b25" into oc-mr1-dev-plus-aosp
...
am: 3c6df33d4b
2017-07-22 00:42:57 +00:00
Christine Franks
3c7c330038
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8 -s ours am: 18cd618368
...
am: e147a19773
2017-07-22 00:42:31 +00:00
