Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
508,477 Commits 3 Branches 0 Tags
9be4e4324c15e0a4c417edcc5eccfc4efea58d6c
Commit Graph

508477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick Baumann
9be4e4324c Merge "Revert "Pre-cache filter results"" into rvc-dev am: c357f2cafd am: facf8bcd10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820080

Change-Id: I1a2d2b73f3acde7c8e711a9b9a53d6311c6c216c
 2020-06-10 15:45:22 +00:00
Automerger Merge Worker
30c6bd29c7 Merge "[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 50440f899e am: 0e1b6cb520 -s ours" into rvc-d1-dev-plus-aosp 2020-06-10 15:45:11 +00:00
Lorenzo Colitti
8412249a07 [automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 50440f899e am: 0e1b6cb520 -s ours 
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 55882575de is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745979

Change-Id: I88b0cfec19209ee77b3d98e67eda1100e13f156a
 2020-06-10 15:45:06 +00:00
Lorenzo Colitti
1fab9c087a [automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 50440f899e -s ours am: 956a9bc9e1 -s ours 
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 55882575de is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745979

Change-Id: I9a58214b06884b92dde316a9c554b9ebcf500604
 2020-06-10 15:45:01 +00:00
Patrick Baumann
facf8bcd10 Merge "Revert "Pre-cache filter results"" into rvc-dev am: c357f2cafd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820080

Change-Id: Idcfebbbfc84a3a53667655bd4790e2f2c4b875c8
 2020-06-10 15:33:50 +00:00
Patrick Baumann
c357f2cafd Merge "Revert "Pre-cache filter results"" into rvc-dev 2020-06-10 15:33:35 +00:00
Lorenzo Colitti
956a9bc9e1 [automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 50440f899e -s ours 
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 55882575de is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745979

Change-Id: Iee50671a7363ed0e820494cbbb06b71063d01f6a
 2020-06-10 15:33:04 +00:00
Lorenzo Colitti
0e1b6cb520 Merge "Update extra info before registering" into rvc-dev am: 50440f899e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745979

Change-Id: I7b68541f2cf1b3367b5aa6b6221b636f54c2e53e
 2020-06-10 15:32:55 +00:00
Louis Chang
04dfbf4d61 Merge "Prevent NPE while finishing activity" into rvc-dev am: 1dbee3e34b am: 3884ae8712 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788494

Change-Id: I77a74e7828652515b6bbd91becd2f30f405c633d
 2020-06-10 15:17:52 +00:00
TreeHugger Robot
14265e0f6c Merge "Add myself to OWNERS" into rvc-dev am: 6588fc44ca am: 3a55ef5cc2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11813191

Change-Id: I20d8d605187e7b4da7a06a0a10b179eb21d503c3
 2020-06-10 15:17:40 +00:00
Lorenzo Colitti
50440f899e Merge "Update extra info before registering" into rvc-dev 2020-06-10 15:17:38 +00:00
Automerger Merge Worker
fe66cdae46 Merge "Merge "Prevent NPE while finishing activity" into rvc-dev am: 1dbee3e34b am: b9bd2da6f2" into rvc-d1-dev-plus-aosp 2020-06-10 15:17:18 +00:00
Automerger Merge Worker
72cb98e40f Merge "Merge "Animate the priority ring in the onboarding" into rvc-dev am: 675d4a78cb am: efcd0de64b" into rvc-d1-dev-plus-aosp 2020-06-10 15:17:17 +00:00
Louis Chang
0bcc0475b7 Merge "Prevent NPE while finishing activity" into rvc-dev am: 1dbee3e34b am: b9bd2da6f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788494

Change-Id: Ic2270be05f1acc7f2b24da4a421fd7865f7ec1e2
 2020-06-10 15:17:07 +00:00
TreeHugger Robot
c3b0938d80 Merge "Animate the priority ring in the onboarding" into rvc-dev am: 675d4a78cb am: efcd0de64b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11795077

Change-Id: I6a052a3e5587f185c0a17f6b88f31efd5e9ab82f
 2020-06-10 15:17:00 +00:00
TreeHugger Robot
8aa51da295 Merge "Add myself to OWNERS" into rvc-dev am: 6588fc44ca am: 26705cc483 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11813191

Change-Id: I9d34e9b7d6c087468f5bdeeb4ce4fdb94556be9a
 2020-06-10 15:16:57 +00:00
TreeHugger Robot
4f159ad57f Merge "Animate the priority ring in the onboarding" into rvc-dev am: 675d4a78cb am: 77b1adcacf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11795077

Change-Id: I00011d452cae3b94dae1f80b5b7c4a3aa5c43eb2
 2020-06-10 15:16:37 +00:00
Patrick Baumann
860502cb42 Revert "Pre-cache filter results" 
This reverts commit c68d8124bb.

Reason for revert: Broken test

Change-Id: I91bc693f508a947dea95ee3483045790927f88c9
Fixes: 158626593
 2020-06-10 15:13:44 +00:00
Louis Chang
b9bd2da6f2 Merge "Prevent NPE while finishing activity" into rvc-dev am: 1dbee3e34b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788494

Change-Id: Ia0f5dfb2c7495c892cb9bfa3da06dd5592994a07
 2020-06-10 15:09:32 +00:00
Louis Chang
3884ae8712 Merge "Prevent NPE while finishing activity" into rvc-dev am: 1dbee3e34b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788494

Change-Id: Ifab02f6f178bc587717434c704ce5edcab5014b2
 2020-06-10 15:09:30 +00:00
Louis Chang
1dbee3e34b Merge "Prevent NPE while finishing activity" into rvc-dev 2020-06-10 15:04:05 +00:00
TreeHugger Robot
3a55ef5cc2 Merge "Add myself to OWNERS" into rvc-dev am: 6588fc44ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11813191

Change-Id: Ic045792f7e581ba5d9109105a3ae9d41ac4aafd5
 2020-06-10 15:03:41 +00:00
TreeHugger Robot
26705cc483 Merge "Add myself to OWNERS" into rvc-dev am: 6588fc44ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11813191

Change-Id: I088e8162f92eb70bafbb6fb944d3c8cfeab44a1f
 2020-06-10 15:03:41 +00:00
TreeHugger Robot
efcd0de64b Merge "Animate the priority ring in the onboarding" into rvc-dev am: 675d4a78cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11795077

Change-Id: Id6fad7790eb0a8c70568acf4444af23a62b3f539
 2020-06-10 15:03:28 +00:00
TreeHugger Robot
77b1adcacf Merge "Animate the priority ring in the onboarding" into rvc-dev am: 675d4a78cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11795077

Change-Id: Id942d251c84e28b8cb2950842facda444023e6bc
 2020-06-10 15:03:06 +00:00
TreeHugger Robot
6588fc44ca Merge "Add myself to OWNERS" into rvc-dev 2020-06-10 14:51:21 +00:00
TreeHugger Robot
675d4a78cb Merge "Animate the priority ring in the onboarding" into rvc-dev 2020-06-10 14:51:03 +00:00
Josh Tsuji
6618668f5f [automerger skipped] Merge "ActivityView animations!" into rvc-dev am: ab0ffd1d48 am: 56fbd2cb6d -s ours 
am skip reason: Change-Id I0b01dab4bb0c82873afc55d054bafc672bacc8bf with SHA-1 06785ab656 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11793537

Change-Id: If14960b763ca88e6fc5e3c65f7ec33a39b02b576
 2020-06-10 13:49:07 +00:00
Josh Tsuji
8956216702 Merge "ActivityView animations!" into rvc-dev am: ab0ffd1d48 am: 61d58dcf0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11793537

Change-Id: Ia7c38c3949adf6010eb7cfc197876d158f5d17b6
 2020-06-10 13:48:53 +00:00
Josh Tsuji
56fbd2cb6d Merge "ActivityView animations!" into rvc-dev am: ab0ffd1d48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11793537

Change-Id: I09bf418b06f30beb06ae6469543e9a643d613629
 2020-06-10 13:38:54 +00:00
Josh Tsuji
61d58dcf0a Merge "ActivityView animations!" into rvc-dev am: ab0ffd1d48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11793537

Change-Id: I73010d1cdfe621de7a30022a0febee23df00dbf6
 2020-06-10 13:38:43 +00:00
TreeHugger Robot
029fc756cc Merge "Tweak Sharesheet DS icon rendering to ignore system shapes" into rvc-dev am: f6793af032 am: 4512999c22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11814420

Change-Id: I632ab6ba8b9fa1ce15228918f575dcf6c818ccc7
 2020-06-10 13:26:22 +00:00
Automerger Merge Worker
294dd5c993 Merge "Merge "Switch service-permissions to java_sdk_library" into rvc-dev am: 5a807e6de3 am: 1500abdf06" into rvc-d1-dev-plus-aosp 2020-06-10 13:25:46 +00:00
Paul Duffin
b6fc4f0f2b Merge "Switch service-permissions to java_sdk_library" into rvc-dev am: 5a807e6de3 am: 1500abdf06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689589

Change-Id: I171a20d0583eee7899e2e26fecbf1c5944302d48
 2020-06-10 13:25:40 +00:00
TreeHugger Robot
1db2e60d38 Merge "Tweak Sharesheet DS icon rendering to ignore system shapes" into rvc-dev am: f6793af032 am: 5722d5f2c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11814420

Change-Id: Id52baf043a112e2b7c1b7314c764add9575f242f
 2020-06-10 13:25:38 +00:00
Paul Duffin
eea09ddc23 Merge "Switch service-permissions to java_sdk_library" into rvc-dev am: 5a807e6de3 am: 221cc54bda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689589

Change-Id: Ibfdf6a62103f6a406597799853da07ec2e655761
 2020-06-10 13:25:23 +00:00
Josh Tsuji
ab0ffd1d48 Merge "ActivityView animations!" into rvc-dev 2020-06-10 13:24:37 +00:00
TreeHugger Robot
4512999c22 Merge "Tweak Sharesheet DS icon rendering to ignore system shapes" into rvc-dev am: f6793af032 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11814420

Change-Id: Id11801611054f88a91c81107497e0d0434f82a8f
 2020-06-10 13:13:12 +00:00
TreeHugger Robot
5722d5f2c4 Merge "Tweak Sharesheet DS icon rendering to ignore system shapes" into rvc-dev am: f6793af032 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11814420

Change-Id: I5a123dc0fc28a84c33edb2cd86cabd735d7d1b5f
 2020-06-10 13:12:57 +00:00
Paul Duffin
1500abdf06 Merge "Switch service-permissions to java_sdk_library" into rvc-dev am: 5a807e6de3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689589

Change-Id: I88fe63bc31a2d7b3cb44b73d409c095226fe6028
 2020-06-10 13:12:51 +00:00
Paul Duffin
221cc54bda Merge "Switch service-permissions to java_sdk_library" into rvc-dev am: 5a807e6de3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689589

Change-Id: Iabb1dcacf51bad8a281fc769e4c5d4944c45b554
 2020-06-10 13:12:06 +00:00
TreeHugger Robot
f6793af032 Merge "Tweak Sharesheet DS icon rendering to ignore system shapes" into rvc-dev 2020-06-10 13:04:23 +00:00
Paul Duffin
5a807e6de3 Merge "Switch service-permissions to java_sdk_library" into rvc-dev 2020-06-10 13:01:29 +00:00
Automerger Merge Worker
1ee1266972 Merge "Merge "Sharesheet - Disable delegate" into rvc-dev am: a4614b0f1f am: 2a76a6928b" into rvc-d1-dev-plus-aosp 2020-06-10 12:35:17 +00:00
Matt Pietal
757bf8e885 Merge "Sharesheet - Disable delegate" into rvc-dev am: a4614b0f1f am: 2a76a6928b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11814085

Change-Id: I5ba7c68e20f4e0c0e5ae67640085b4991c08bf76
 2020-06-10 12:35:11 +00:00
Matt Pietal
f8a46b6ff1 Merge "Sharesheet - Disable delegate" into rvc-dev am: a4614b0f1f am: 9e1353668b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11814085

Change-Id: Ibee5a36b677df2115f0ae39e651dc6d1d4bb552b
 2020-06-10 12:34:56 +00:00
Matt Pietal
2a76a6928b Merge "Sharesheet - Disable delegate" into rvc-dev am: a4614b0f1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11814085

Change-Id: I15493708dd65c138ab449bbb81cb27cb87e20df7
 2020-06-10 12:21:58 +00:00
Matt Pietal
9e1353668b Merge "Sharesheet - Disable delegate" into rvc-dev am: a4614b0f1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11814085

Change-Id: I3f0519ebdbe4fe3436ff98c66188d8d3506ac0b9
 2020-06-10 12:21:41 +00:00
Matt Pietal
a4614b0f1f Merge "Sharesheet - Disable delegate" into rvc-dev 2020-06-10 12:06:23 +00:00
TreeHugger Robot
79fd3d77c5 Merge "Added data share event types to ContentCaptureServiceEvents atom" into rvc-dev am: 853191032f am: 34df14649a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11755898

Change-Id: Ib4509b3f5be55da47c022831e71036d46cd5036d
 2020-06-10 11:47:34 +00:00