Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
509,425 Commits 3 Branches 0 Tags
515db50b02495444b75b1fe9e71d2fe447a6fed4
Commit Graph

509425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
515db50b02 Merge "Merge "Adding blur supported check to shared lib" into rvc-dev am: 7775314ff8 am: 3559a13de9" into rvc-d1-dev-plus-aosp 2020-06-12 18:30:35 +00:00
TreeHugger Robot
6e17185056 Merge "Adding blur supported check to shared lib" into rvc-dev am: 7775314ff8 am: 3559a13de9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844114

Change-Id: Ida7e4e2fe042a9b093392e6da533d257cee1b985
 2020-06-12 18:30:27 +00:00
TreeHugger Robot
1790df6885 Merge "Adding blur supported check to shared lib" into rvc-dev am: 7775314ff8 am: 38c9217417 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844114

Change-Id: Ic04da15a62c648977250ead840db5db3b79ba044
 2020-06-12 18:30:22 +00:00
TreeHugger Robot
3559a13de9 Merge "Adding blur supported check to shared lib" into rvc-dev am: 7775314ff8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844114

Change-Id: I7b256492b539c7818b1f245f2924000a2da849e0
 2020-06-12 18:08:10 +00:00
TreeHugger Robot
38c9217417 Merge "Adding blur supported check to shared lib" into rvc-dev am: 7775314ff8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844114

Change-Id: I25a754c1507a879f498544361e78f64cea453375
 2020-06-12 18:07:47 +00:00
Mark Chien
ba2627dd61 Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: 322c525e6b am: dfae0aad30 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348

Change-Id: Ibdc5483f00a8554db0c00e9163b527e6f3973b85
 2020-06-12 18:03:35 +00:00
Mark Chien
be689dc9fa Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: 322c525e6b am: faf2d5524b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348

Change-Id: I802dd4ee567f4210b2ad36287ff20ee706800c6d
 2020-06-12 17:55:55 +00:00
TreeHugger Robot
7775314ff8 Merge "Adding blur supported check to shared lib" into rvc-dev 2020-06-12 17:54:26 +00:00
Mark Chien
dfae0aad30 Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: 322c525e6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348

Change-Id: Ifa96dbf15a2c96b7c1fc9af39c8270707864470b
 2020-06-12 17:45:43 +00:00
Mark Chien
faf2d5524b Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: 322c525e6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348

Change-Id: I9436ba6a4fe7ef3eb38316d831e047957302bc49
 2020-06-12 17:45:36 +00:00
TreeHugger Robot
4913eb2f6b Merge "Controls UI - Tap for NO_TEMPLATE" into rvc-dev am: d6fb5e2151 am: d7c6a998a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11850954

Change-Id: Ib422942997c0593d32aa758e573b54c5db12238b
 2020-06-12 17:34:29 +00:00
Automerger Merge Worker
5a14dec252 Merge "Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev am: d32c56d24d am: fddf37de68" into rvc-d1-dev-plus-aosp 2020-06-12 17:33:59 +00:00
TreeHugger Robot
05b0ccb2ec Merge "Controls UI - Tap for NO_TEMPLATE" into rvc-dev am: d6fb5e2151 am: df58dcf081 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11850954

Change-Id: I2189ec938349b613c9089f414c34ef237e521a9b
 2020-06-12 17:33:49 +00:00
TreeHugger Robot
48afaa9568 Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev am: d32c56d24d am: fddf37de68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11697200

Change-Id: I2364a030a734057bb98f5fac10e66208d9b2d0cd
 2020-06-12 17:33:39 +00:00
Automerger Merge Worker
f1a593037a Merge "Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev am: d32c56d24d am: 8298d0590b" into rvc-d1-dev-plus-aosp 2020-06-12 17:33:37 +00:00
TreeHugger Robot
d4f270f966 Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev am: d32c56d24d am: 8298d0590b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11697200

Change-Id: Ie8584fdb08a00723484256fa46bfb067db8c4746
 2020-06-12 17:33:25 +00:00
Mark Chien
322c525e6b Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev 2020-06-12 17:33:24 +00:00
TreeHugger Robot
9f1878bee0 Merge "Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi" into rvc-dev am: 7883b53e28 am: 147c54f9a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838104

Change-Id: I1e46c794e90487b0166a5fc74bf975fc7cc28f25
 2020-06-12 17:33:18 +00:00
TreeHugger Robot
47e564965b Merge "Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi" into rvc-dev am: 7883b53e28 am: 42c810bd0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838104

Change-Id: Id5c822de5a74a31d153a48c1cbeb390f2676a182
 2020-06-12 17:32:58 +00:00
TreeHugger Robot
d7c6a998a1 Merge "Controls UI - Tap for NO_TEMPLATE" into rvc-dev am: d6fb5e2151 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11850954

Change-Id: Ic31dc28b6a6139ea0b2d9af5576b2fad9e091386
 2020-06-12 17:22:55 +00:00
TreeHugger Robot
df58dcf081 Merge "Controls UI - Tap for NO_TEMPLATE" into rvc-dev am: d6fb5e2151 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11850954

Change-Id: I13e5ed74ac82b79a7b72511b55c02cb6ad4c6573
 2020-06-12 17:22:24 +00:00
TreeHugger Robot
fddf37de68 Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev am: d32c56d24d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11697200

Change-Id: I286cf502d23a94593b6436c0dc281edfda6a60ae
 2020-06-12 17:22:20 +00:00
TreeHugger Robot
8298d0590b Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev am: d32c56d24d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11697200

Change-Id: I798ba177a5daaf4242f4934f36b437b0c681558b
 2020-06-12 17:22:03 +00:00
TreeHugger Robot
d6fb5e2151 Merge "Controls UI - Tap for NO_TEMPLATE" into rvc-dev 2020-06-12 17:21:21 +00:00
TreeHugger Robot
d32c56d24d Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45d6 am: 760c2bccd2 am: bd580a07b4 am: 91e082a90d am: 7f6cc71fe5" into rvc-dev 2020-06-12 17:21:01 +00:00
TreeHugger Robot
147c54f9a0 Merge "Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi" into rvc-dev am: 7883b53e28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838104

Change-Id: If75d4ad04b34ec43542ade9b9589f359007bd10b
 2020-06-12 17:16:51 +00:00
TreeHugger Robot
42c810bd0b Merge "Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi" into rvc-dev am: 7883b53e28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838104

Change-Id: Ic3e7da3351fe93f8df81dd22db7202ec1e08458d
 2020-06-12 17:16:38 +00:00
Jordan Jozwiak
3c38b25d42 Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev am: 7048655cbe am: 5756ae944f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: I852cd55e4769167beff603f4a6b0e7b0005944df
 2020-06-12 16:45:35 +00:00
Jordan Jozwiak
d140dfb3ff DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05 am: a50847e505 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: I971be58e4d2a2b6e53b1b8c07b4f6f59dffbe12e
 2020-06-12 16:45:28 +00:00
TreeHugger Robot
7883b53e28 Merge "Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi" into rvc-dev 2020-06-12 16:44:44 +00:00
Jordan Jozwiak
7d48d460c0 Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev am: 7048655cbe am: 6f60371228 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: I0fd8b8fa83c874edbee446fcf47d479b4345bd5c
 2020-06-12 16:39:52 +00:00
Jordan Jozwiak
412d74f4ea DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05 am: 1c71776f9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: I2115977b5db532c6cce8b09c7eabcf566a72eba4
 2020-06-12 16:39:42 +00:00
Jordan Jozwiak
6f60371228 Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev am: 7048655cbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: Id15bb58fa014cfc1eadedf97d0d13da13dc7ba22
 2020-06-12 16:32:53 +00:00
Jordan Jozwiak
5756ae944f Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev am: 7048655cbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: Ifd628c4df89c2fdb2bbbf069ccda11a0677b1713
 2020-06-12 16:32:48 +00:00
Jordan Jozwiak
1c71776f9b DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: If2799ec77afaf273db94e88bf101da0de28ec9a0
 2020-06-12 16:32:46 +00:00
Jordan Jozwiak
a50847e505 DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739858

Change-Id: Ib5e4bb9400789f5666cd5b8d466afdd89f76e724
 2020-06-12 16:32:43 +00:00
TreeHugger Robot
d67e0ea6e4 Merge "Don't throw exceptions in NotifCollection when initializing" into rvc-dev am: 8cf7a51d3d am: c112078a27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11847539

Change-Id: Icec3df855ea822c448b4b29e048ae37fd6547048
 2020-06-12 16:32:28 +00:00
Neil Fuller
863d8d6ad9 [automerger skipped] Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev am: a95a24a0a0 am: 6e9f2d2a65 -s ours 
am skip reason: Change-Id I67b57e8df8a6d39622999634cefdc267fc07ecae with SHA-1 5fa4955154 is in history

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

Change-Id: I03c38bb6fe0a26650258e830ac0eda3996efa025
 2020-06-12 16:32:19 +00:00
TreeHugger Robot
9f671ae921 Merge "Don't throw exceptions in NotifCollection when initializing" into rvc-dev am: 8cf7a51d3d am: 1d21f39fef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11847539

Change-Id: I2f3af608b90bb80317a505fbb6b9261ae52e0180
 2020-06-12 16:28:50 +00:00
Neil Fuller
ffda3766f6 Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev am: a95a24a0a0 am: 4054090215 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837611

Change-Id: Ic909cbafb10ca466148728060793c9a4a09d5de5
 2020-06-12 16:28:41 +00:00
Jordan Jozwiak
7048655cbe Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev 2020-06-12 16:21:05 +00:00
TreeHugger Robot
1d21f39fef Merge "Don't throw exceptions in NotifCollection when initializing" into rvc-dev am: 8cf7a51d3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11847539

Change-Id: I98c594f46a1d80deddc7fccc91ce901ef1296a13
 2020-06-12 16:15:31 +00:00
TreeHugger Robot
c112078a27 Merge "Don't throw exceptions in NotifCollection when initializing" into rvc-dev am: 8cf7a51d3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11847539

Change-Id: Ia2a780fab71a535078ca92b4d80aedc8738810c0
 2020-06-12 16:15:23 +00:00
Neil Fuller
4054090215 Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev am: a95a24a0a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837611

Change-Id: Id1670738d112ea5f3f66ad89022ab044bd39e0ac
 2020-06-12 16:15:11 +00:00
Neil Fuller
6e9f2d2a65 Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev am: a95a24a0a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837611

Change-Id: I89abda8f1d673334d18e7a022c8db4de89ce09dc
 2020-06-12 16:14:48 +00:00
TreeHugger Robot
8cf7a51d3d Merge "Don't throw exceptions in NotifCollection when initializing" into rvc-dev 2020-06-12 16:04:58 +00:00
Neil Fuller
a95a24a0a0 Merge "Fix a remove*Listener call that doesn't remove" into rvc-dev 2020-06-12 16:02:43 +00:00
Matt Pietal
733d637879 Controls UI - Tap for NO_TEMPLATE 
Allow single taps as well as long press to launch the detail panel
when no template is specified.

Fixes: 158773087
Test: ControlsMockApp, any default type
Change-Id: I4d5451f6a5968d8dd223eb5b10d931ad60aad951
 2020-06-12 11:59:57 -04:00
TreeHugger Robot
12d3fa3276 Merge "Controls UI - Correctly persist seeding state" into rvc-dev am: b278a5c4e4 am: c3b195a8e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817536

Change-Id: I36ac4ce1038ad95c459cd1b86ff9059095ad9956
 2020-06-12 15:50:01 +00:00
Automerger Merge Worker
1940c40e47 Merge "Merge "Controls UI - Correctly persist seeding state" into rvc-dev am: b278a5c4e4 am: 4e68b98b47" into rvc-d1-dev-plus-aosp 2020-06-12 15:49:59 +00:00