Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
546,661 Commits 3 Branches 0 Tags
1238356d995826008b4bd6862dd57571f37ba95d
Commit Graph

546661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Lin
1238356d99 Merge "Run HOVER_EXIT event only if there's no BUTTON_PRESS event after." into rvc-dev am: e01198edec am: 111909aac1 am: 5fdc7bdd57 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12049437

Change-Id: I0bed1c3d78376c1848a9b7d60dee3b640527d603
 2020-07-06 22:00:49 +00:00
Riddle Hsu
b0c8da05ae Merge "Fix extra configuration change when unlocking directly" into rvc-dev am: 54e3542b96 am: a35ab2884a am: 755dc09dc0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12055451

Change-Id: I41a66b297fee74e5f2c532e042ea6d9a4a76ae07
 2020-07-06 22:00:30 +00:00
Ben Lin
2d56c9fcb9 Merge "Run HOVER_EXIT event only if there's no BUTTON_PRESS event after." into rvc-dev am: e01198edec am: a9914ea6df am: 837f6a99e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12049437

Change-Id: Ic7db5fbaa1c9e56fd4441f6e48aa9c945c9aa674
 2020-07-06 22:00:05 +00:00
Automerger Merge Worker
8a12dfac36 Merge "Merge "Run HOVER_EXIT event only if there's no BUTTON_PRESS event after." into rvc-dev am: e01198edec am: a9914ea6df am: e3302b4f7f" into rvc-qpr-dev-plus-aosp 2020-07-06 21:59:57 +00:00
Ben Lin
1bf9110ec7 Merge "Run HOVER_EXIT event only if there's no BUTTON_PRESS event after." into rvc-dev am: e01198edec am: a9914ea6df am: e3302b4f7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12049437

Change-Id: Ie47da02795c4048a5ca660b1df2b73bbc8dd90a8
 2020-07-06 21:59:42 +00:00
Tracy Zhou
2c8e8a432b Add setRelativeLayer to TransactionCompat am: 972ace00d0 am: 9681782f4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12089062

Change-Id: I9c0bbc2d24a5b9b8f2cd49d0c52bfbd622c8b90e
 2020-07-06 21:59:39 +00:00
Tracy Zhou
a466a6afa1 Add setRelativeLayer to TransactionCompat am: 972ace00d0 am: e0ba52c77d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12089062

Change-Id: Idd4bfffb7068d6c6c695d44975e9884074c7811d
 2020-07-06 21:59:07 +00:00
Ben Lin
5fdc7bdd57 Merge "Run HOVER_EXIT event only if there's no BUTTON_PRESS event after." into rvc-dev am: e01198edec am: 111909aac1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12049437

Change-Id: I245ab1664a7f800ae0e1d946e5fca083d71267f0
 2020-07-06 21:54:07 +00:00
Riddle Hsu
755dc09dc0 Merge "Fix extra configuration change when unlocking directly" into rvc-dev am: 54e3542b96 am: a35ab2884a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12055451

Change-Id: I40161076e4d26ef91dde8ddf308ca61094150de9
 2020-07-06 21:47:05 +00:00
Ben Lin
837f6a99e9 Merge "Run HOVER_EXIT event only if there's no BUTTON_PRESS event after." into rvc-dev am: e01198edec am: a9914ea6df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12049437

Change-Id: If04f0dd88f7ea62d6ef2a4d684c23c171d1456fe
 2020-07-06 21:46:48 +00:00
Ben Lin
e3302b4f7f Merge "Run HOVER_EXIT event only if there's no BUTTON_PRESS event after." into rvc-dev am: e01198edec am: a9914ea6df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12049437

Change-Id: Ib934fd0326d2d3aa205f2c276dd83c5d5d117dcc
 2020-07-06 21:46:47 +00:00
Tracy Zhou
9681782f4e Add setRelativeLayer to TransactionCompat am: 972ace00d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12089062

Change-Id: I019d142400acc6e446f3b43a63dcba7c9248b9ca
 2020-07-06 21:46:37 +00:00
Tracy Zhou
e0ba52c77d Add setRelativeLayer to TransactionCompat am: 972ace00d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12089062

Change-Id: Ic1194e5746e3fa14154961a8bce0d18d76845654
 2020-07-06 21:46:31 +00:00
Danny Epstein
540434e856 Clean up FocusParkingViews am: 3ea519db54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040150

Change-Id: Ie03dbe2ec81f9419f1f0bbf5860781bf31fc91f2
 2020-07-06 21:40:50 +00:00
Riddle Hsu
a35ab2884a Merge "Fix extra configuration change when unlocking directly" into rvc-dev am: 54e3542b96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12055451

Change-Id: Iff4d865222a9b03b137062dca0da476d93660d01
 2020-07-06 21:40:39 +00:00
Ben Lin
a9914ea6df Merge "Run HOVER_EXIT event only if there's no BUTTON_PRESS event after." into rvc-dev am: e01198edec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12049437

Change-Id: Ia1cf052b7b1b508e3037c781a285cb16f75e2036
 2020-07-06 21:39:54 +00:00
Ben Lin
111909aac1 Merge "Run HOVER_EXIT event only if there's no BUTTON_PRESS event after." into rvc-dev am: e01198edec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12049437

Change-Id: Ie42217b6dc8a001b72ef8203bed088daa5933a48
 2020-07-06 21:39:45 +00:00
Riddle Hsu
54e3542b96 Merge "Fix extra configuration change when unlocking directly" into rvc-dev 2020-07-06 20:49:57 +00:00
Ben Lin
e01198edec Merge "Run HOVER_EXIT event only if there's no BUTTON_PRESS event after." into rvc-dev 2020-07-06 20:45:58 +00:00
Tracy Zhou
972ace00d0 Add setRelativeLayer to TransactionCompat 
Bug: 160361464
Test: N/A
Change-Id: Ib1931cc52511ad0a27b580ac8431facf34dbb48d
 2020-07-06 19:58:01 +00:00
Danny Epstein
3ea519db54 Clean up FocusParkingViews 
Put FocusParkingView first rather than last and update comment to
indicate that the FocusParkingView must be first. Use start rather
than left to position FocusParkingView first.

Bug: 131421840
Bug: 154540419
Test: manual

Change-Id: I89b9977e1be4722c1e922e360332aa9d631b9540
 2020-07-06 11:42:17 -07:00
TreeHugger Robot
40baa2365d [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: c83b93b3f1 -s ours am: 75c3356103 -s ours am: 22810521eb -s ours am: 5d3e2c1e42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibab07de03b81b844e581c235a282aec7ac4790b0
 2020-07-06 17:39:16 +00:00
Automerger Merge Worker
ce237e39de Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: c83b93b3f1 -s ours am: 75c3356103 -s ours am: 22810521eb -s ours am: 81d4133de9 -s ours" into rvc-qpr-dev-plus-aosp 2020-07-06 17:39:10 +00:00
TreeHugger Robot
a0d5e03b0e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: c83b93b3f1 -s ours am: 75c3356103 -s ours am: bf3bab9dea -s ours am: 40c4b483e2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I885f8fc1ce945df75c4bb64b5bf05e96255d555e
 2020-07-06 17:38:56 +00:00
TreeHugger Robot
623eb02389 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: c83b93b3f1 -s ours am: 75c3356103 -s ours am: 22810521eb -s ours am: 81d4133de9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie45d4f6b671bfeea765c01fe00deb273de84ebe1
 2020-07-06 17:38:54 +00:00
TreeHugger Robot
81d4133de9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: c83b93b3f1 -s ours am: 75c3356103 -s ours am: 22810521eb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5d0168f36f733b5578fd283f71c73ed10a27d29
 2020-07-06 17:16:21 +00:00
TreeHugger Robot
5d3e2c1e42 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: c83b93b3f1 -s ours am: 75c3356103 -s ours am: 22810521eb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ide0af78fbcc0da652c7781523af7ad8d93925fe8
 2020-07-06 17:16:18 +00:00
TreeHugger Robot
40c4b483e2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: c83b93b3f1 -s ours am: 75c3356103 -s ours am: bf3bab9dea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f17077fad912eaf02fad85a886fefb7bde02735
 2020-07-06 17:16:09 +00:00
TreeHugger Robot
bf3bab9dea [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: c83b93b3f1 -s ours am: 75c3356103 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I352d1b7530587dfb725e617513ba03325df7f45c
 2020-07-06 17:03:29 +00:00
TreeHugger Robot
22810521eb [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: c83b93b3f1 -s ours am: 75c3356103 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idecbc8c696fd4d2ce2f5f3179efdfe78fef38cd6
 2020-07-06 17:03:15 +00:00
Automerger Merge Worker
41fd845d6e Merge "Merge "Merge "Add support for PO on corp owned device for QS disclosure dialog" into rvc-dev am: 5c201b0360 am: 837bc8abfc" into rvc-d1-dev-plus-aosp am: bfc7c35e88" into rvc-qpr-dev-plus-aosp 2020-07-06 16:53:51 +00:00
Automerger Merge Worker
321b8714e3 Merge "Merge "Add support for PO on corp owned device for QS disclosure dialog" into rvc-dev am: 5c201b0360 am: 837bc8abfc" into rvc-d1-dev-plus-aosp am: bfc7c35e88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034935

Change-Id: I4bd384129c5c7c58daa23802987dffdc3a4002a1
 2020-07-06 16:53:37 +00:00
Antoan Angelov
9fafc4b3a6 Merge "Add support for PO on corp owned device for QS disclosure dialog" into rvc-dev am: 5c201b0360 am: 837bc8abfc am: 6e82ce0d72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034935

Change-Id: Iae3284b3c4a85ae039405195d09f0802da84f380
 2020-07-06 16:53:23 +00:00
Antoan Angelov
b7d10233ed Merge "Add support for PO on corp owned device for QS disclosure dialog" into rvc-dev am: 5c201b0360 am: 09e6559d7e am: 9447649835 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034935

Change-Id: I83e50f111e109e89ce7715630687f7c2d7774805
 2020-07-06 16:52:52 +00:00
TreeHugger Robot
75c3356103 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: c83b93b3f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf676b0275f6509193eb947e6ee1b060dc0fd766
 2020-07-06 16:48:06 +00:00
Automerger Merge Worker
bfc7c35e88 Merge "Merge "Add support for PO on corp owned device for QS disclosure dialog" into rvc-dev am: 5c201b0360 am: 837bc8abfc" into rvc-d1-dev-plus-aosp 2020-07-06 16:40:58 +00:00
Antoan Angelov
9447649835 Merge "Add support for PO on corp owned device for QS disclosure dialog" into rvc-dev am: 5c201b0360 am: 09e6559d7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034935

Change-Id: Ib220fbe4b75b7225ecba8d925beba5af1e39ac00
 2020-07-06 16:40:39 +00:00
Antoan Angelov
5d0be4cef2 Merge "Add support for PO on corp owned device for QS disclosure dialog" into rvc-dev am: 5c201b0360 am: 837bc8abfc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034935

Change-Id: Iec71ed7ada7529800bd2b3d579104dd256508169
 2020-07-06 16:40:39 +00:00
Antoan Angelov
6e82ce0d72 Merge "Add support for PO on corp owned device for QS disclosure dialog" into rvc-dev am: 5c201b0360 am: 837bc8abfc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034935

Change-Id: I894e0c73ff0a03efe1fda71181cb315473c62f4b
 2020-07-06 16:40:38 +00:00
TreeHugger Robot
c83b93b3f1 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2020-07-06 16:32:23 +00:00
Antoan Angelov
09e6559d7e Merge "Add support for PO on corp owned device for QS disclosure dialog" into rvc-dev am: 5c201b0360 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034935

Change-Id: Ib2d8229dabcccaf8243684d77312e528305a3e08
 2020-07-06 16:28:37 +00:00
Antoan Angelov
837bc8abfc Merge "Add support for PO on corp owned device for QS disclosure dialog" into rvc-dev am: 5c201b0360 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034935

Change-Id: Idc343d7d907025ad9ed710aabb36688e9ca0ee89
 2020-07-06 16:28:31 +00:00
Antoan Angelov
5c201b0360 Merge "Add support for PO on corp owned device for QS disclosure dialog" into rvc-dev 2020-07-06 16:10:06 +00:00
Miranda Kephart
fd0a609cbe Merge "Rearrange/rename GlobalScreenshot methods" into rvc-qpr-dev am: 1785587c24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12060265

Change-Id: Iaeb76ff08dc5ebce34cde49ff9fe59ec1f0428e8
 2020-07-06 14:37:40 +00:00
Miranda Kephart
1785587c24 Merge "Rearrange/rename GlobalScreenshot methods" into rvc-qpr-dev 2020-07-06 14:37:12 +00:00
TreeHugger Robot
85d390abbc [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: cc4a65b365 -s ours am: e861ab7cb2 -s ours am: b5de0ccd47 -s ours am: 1bfa101792 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic83cfc45de309c7bb6163553c8a5217d2df8169f
 2020-07-06 14:36:25 +00:00
TreeHugger Robot
bfb339a098 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 1cdb57b79a -s ours am: cce78f1da7 -s ours am: d5ee9d3d5f -s ours am: 2d130de097 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d1b221be2953c66a514c96e96006ef7c65fb179
 2020-07-06 14:36:15 +00:00
Automerger Merge Worker
b578f40416 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: cc4a65b365 -s ours am: e861ab7cb2 -s ours am: 4b4922186a -s ours" into rvc-d1-dev-plus-aosp am: b1ee63639f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib7364bebef5a6381186eef9f979f12c1364e035e
 2020-07-06 14:36:05 +00:00
TreeHugger Robot
0832e15d77 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8adc4f7f3f -s ours am: e9ae85a025 -s ours am: 04c0296a72 -s ours am: 44d9cd3f52 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I30054bebed6349472b9ee4468787bfeaff9916d9
 2020-07-06 14:35:57 +00:00
Automerger Merge Worker
77c1916528 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 9f7daa495f -s ours am: 69c10a41ac -s ours am: a44b9c4c08 -s ours" into rvc-d1-dev-plus-aosp am: 16df259b0a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I45147edecd628051f5e9fe709649d0e9359aa19b
 2020-07-06 14:35:49 +00:00