Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
762,946 Commits 3 Branches 0 Tags
cd32e4651feb1724b39c19f2b41fbbcfd8c424dc
Commit Graph

762946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jon Eckenrode
cd32e4651f Merge "Revised API documentation of getLocationOnScreen, getLocationInWindow, and getLocationInSurface to include multiple-screen behavior and remove mentions of "global" coordinate space." into tm-dev am: d2b8731f93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17826643

Change-Id: I14e1cb718cab9ed515b770ec36f912aa73f92d0b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 14:22:41 +00:00
Jon Eckenrode
d2b8731f93 Merge "Revised API documentation of getLocationOnScreen, getLocationInWindow, and getLocationInSurface to include multiple-screen behavior and remove mentions of "global" coordinate space." into tm-dev 2022-04-25 13:48:48 +00:00
TreeHugger Robot
9aa676cfd1 Merge "Advise use of InputDeviceListener when using pointer capture" into tm-dev am: b49c8b3a3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17756693

Change-Id: I7c40509113e1767d8e4cbd111ad1412f1781b716
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 12:08:55 +00:00
TreeHugger Robot
b49c8b3a3a Merge "Advise use of InputDeviceListener when using pointer capture" into tm-dev 2022-04-25 11:42:16 +00:00
Betty Chang
ee95f5a49f Merge "[LE] Add api to check the media device is BT LE device" into tm-dev am: 9e4a0c1ac3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17752390

Change-Id: I61e7ae136df9e17f9fda87e2af73142e6857e537
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 10:55:28 +00:00
Betty Chang
9e4a0c1ac3 Merge "[LE] Add api to check the media device is BT LE device" into tm-dev 2022-04-25 10:39:43 +00:00
Chris Li
0c6e3c417f Merge "Add TaskFragmentOrganizer#onActivityReparentToTask" into tm-dev am: 0b91be7283 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17817304

Change-Id: Iddab13ed4a211df042774481a905b8b1b2645cf1
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 10:32:55 +00:00
Chris Li
0b91be7283 Merge "Add TaskFragmentOrganizer#onActivityReparentToTask" into tm-dev 2022-04-25 10:11:33 +00:00
joneckenrode
f71eddec34 Revised API documentation of getLocationOnScreen, getLocationInWindow, and getLocationInSurface to include multiple-screen behavior and remove mentions of "global" coordinate space. 
Test: Built API docs
Bug: 172573956
Signed-off-by: joneckenrode <joneckenrode@google.com>
Change-Id: If2200f9daebaa7eb106340bcc5707c20a3df34e6
 2022-04-25 10:06:14 +00:00
Jerry Chang
07a74a65f4 Merge "Fix flicker while resizing split screen" into tm-dev am: b80800cc9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17751850

Change-Id: Ib773349366e3fb6d8865d97cb2825948bd918485
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 08:29:24 +00:00
Jerry Chang
b80800cc9e Merge "Fix flicker while resizing split screen" into tm-dev 2022-04-25 08:15:55 +00:00
Yunfan Chen
45bfe31d3a [automerger skipped] Merge "[DO NOT MERGE] Force extra nav bar provide side gesture insets" into sc-v2-dev am: c0bcb303e8 -s ours am: 9f46a6ec82 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I52ae11c28489e5e1de1bc82e6aef706ca9649b13
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 07:26:25 +00:00
Yunfan Chen
da6211dc8d [automerger skipped] [DO NOT MERGE] Force extra nav bar provide side gesture insets am: 1921f8c1dc -s ours am: f324331080 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2f1005c9e8a1364cf740de7aa49db822e8efedb5
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 07:26:18 +00:00
Yunfan Chen
9f46a6ec82 [automerger skipped] Merge "[DO NOT MERGE] Force extra nav bar provide side gesture insets" into sc-v2-dev am: c0bcb303e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf74d2b5748cc0cb842201dc12f6fec00f9171a8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 07:00:04 +00:00
Yunfan Chen
f324331080 [automerger skipped] [DO NOT MERGE] Force extra nav bar provide side gesture insets am: 1921f8c1dc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If5ed4bc450721727edac7b3553693e758b411934
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 06:59:54 +00:00
Riddle Hsu
db4f119262 Merge "Do not change created-by-organizer task to different organizer" into tm-dev am: d263c04887 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17887803

Change-Id: I73f840f081e5c8676071bfa0d250ef5fbb250319
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 06:46:12 +00:00
Yunfan Chen
c0bcb303e8 Merge "[DO NOT MERGE] Force extra nav bar provide side gesture insets" into sc-v2-dev 2022-04-25 06:45:38 +00:00
Riddle Hsu
d263c04887 Merge "Do not change created-by-organizer task to different organizer" into tm-dev 2022-04-25 06:20:46 +00:00
Riddle Hsu
d5215310e1 Merge "Consider requested orientation for snapshot compatible" into tm-dev am: 17bfd524d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17856864

Change-Id: Iaf18166d2fa6da3eafb470a434d3d332841cde81
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 06:11:08 +00:00
Riddle Hsu
17bfd524d9 Merge "Consider requested orientation for snapshot compatible" into tm-dev 2022-04-25 05:43:47 +00:00
Trevor Black
d165a566ca Merge "Add Vulkan 1.2 and 1.3 to getVulkanVersion()" into tm-dev am: 3f598fadcd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17891135

Change-Id: Ia818cd811660c3d4dcbb8777a94d2bbcee9e225e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 05:26:10 +00:00
Trevor Black
3f598fadcd Merge "Add Vulkan 1.2 and 1.3 to getVulkanVersion()" into tm-dev 2022-04-25 05:07:39 +00:00
Prabal Singh
4a4e842b20 Merge "Add util methods for WorkPolicy in SettingsLib" into tm-dev am: f69119a170 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907943

Change-Id: Ia3b6992772dddbb6fef34bd983365fdc0a905e77
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 03:23:24 +00:00
Chris Li
debbcadf03 Merge "Fix transition wait when ActivityEmbedding enters PiP" into tm-dev am: 849cb51470 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17801185

Change-Id: Ic4e4d09aa6664b2f3e04daea49e00cb474511f7f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 03:21:25 +00:00
Prabal Singh
f69119a170 Merge "Add util methods for WorkPolicy in SettingsLib" into tm-dev 2022-04-25 03:17:01 +00:00
Chris Li
849cb51470 Merge "Fix transition wait when ActivityEmbedding enters PiP" into tm-dev 2022-04-25 02:46:53 +00:00
Bill Yi
0b8c7e2c70 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-23 23:26:54 +00:00
Bill Yi
682641dd31 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-23 23:26:54 +00:00
Bill Yi
dca98af2d4 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-23 23:26:54 +00:00
Bill Yi
95b64ad7e1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-23 23:26:54 +00:00
Bill Yi
3cf326ba45 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-23 23:26:54 +00:00
TreeHugger Robot
8831cc07bc Merge "Use buffer to log media timeout events" into tm-dev am: 6037653177 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17900544

Change-Id: I53246104b8fc1230ffb2684d2767ede9cd4acc55
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 19:56:05 +00:00
TreeHugger Robot
6037653177 Merge "Use buffer to log media timeout events" into tm-dev 2022-04-23 19:43:23 +00:00
Prabal Singh
d9d8a96821 Add util methods for WorkPolicy in SettingsLib 
Moving logic for WorkPolicyInfo to SettingLib so that they can be
accessed from PermissionController

Bug: b/229889270
Test: manual
Change-Id: I282a4e05791a8d738795999ca5c3ab68e0cd0985
 2022-04-23 20:13:15 +01:00
TreeHugger Robot
4de5a40d9d Merge "Do not apply taskbar insets for overlay case." into tm-dev am: 33a3299540 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567820

Change-Id: Ic8a02f3084de9cddec452ad039f2548bfab799d7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 10:41:31 +00:00
TreeHugger Robot
33a3299540 Merge "Do not apply taskbar insets for overlay case." into tm-dev 2022-04-23 10:04:12 +00:00
Issei Suzuki
f5271f10de Merge "Add timestamp to ActivityOptions.OnAnimation*Listener" into tm-dev am: 408b90ffad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17860344

Change-Id: I6eea73a00edbecb83dec4f0cd8c584ed0a8819f8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 04:39:08 +00:00
Issei Suzuki
408b90ffad Merge "Add timestamp to ActivityOptions.OnAnimation*Listener" into tm-dev 2022-04-23 04:29:09 +00:00
TreeHugger Robot
5fe43d772e Merge "Fix missing Release for GetStringUTFChars calls." into tm-dev am: 6ccdee38b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17917124

Change-Id: I819990c99414e0cff664b9f65c8eaafac854dcd6
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 03:00:45 +00:00
TreeHugger Robot
6ccdee38b5 Merge "Fix missing Release for GetStringUTFChars calls." into tm-dev 2022-04-23 02:50:04 +00:00
Xiaowen Lei
015dabf6e3 Merge "Revert "Icon: make Icon's Bitmaps immutable"" into tm-dev am: 4e8c47efbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17919920

Change-Id: I434fed1f3e6586e7aea98f0e7783f9289d6ba9b5
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 02:48:41 +00:00
TreeHugger Robot
3c357ff205 Merge "Checks that state requested from top app is a state we allow" into tm-dev am: 6758035315 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17653729

Change-Id: I2cc1a02ad341ebdd771615c3929452df9b283912
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 02:48:23 +00:00
Xiaowen Lei
4e8c47efbb Merge "Revert "Icon: make Icon's Bitmaps immutable"" into tm-dev 2022-04-23 02:12:46 +00:00
TreeHugger Robot
6758035315 Merge "Checks that state requested from top app is a state we allow" into tm-dev 2022-04-23 02:02:13 +00:00
Joe Bolinger
1eeeedb772 [automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-qpr1-dev am: 5cdb1689bb -s ours am: c0d3a87af0 -s ours am: 320c2e6622 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I36763231159f2cfd5a7a571806d028906cabb6c3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 00:43:30 +00:00
Joe Bolinger
c36ca77974 [automerger skipped] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. am: 8175c6a005 -s ours am: 1cf3ad5fc4 -s ours am: 4a5f22611a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I50f900da92c7a64b11622cceab74a4c500e16638
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 00:43:28 +00:00
Joe Bolinger
40d461897b [automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev am: c8347811b2 am: 2f91e4e8d5 -s ours am: 67c38a0f5e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia96c37b99b6eaa6d4d8f845e2163c240a18ca1e2
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 00:43:21 +00:00
Joe Bolinger
9e758c966e Merge changes from topic "cve-fp-sc-v2-dev-sc-qpr1-dev-sc-dev" into sc-mainline-prod am: 110c9b4c1e am: 7f4a849c98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662

Change-Id: Ie4755316367849b677d1f3916e061780b3b86962
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 00:43:06 +00:00
Presubmit Automerger Backend
da4c11d150 [automerger skipped] [automerge] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. 2p: ac89f8682f am: a3744e1b2c -s ours am: 16c3412734 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I15fe5f56e8f44d517e1d02ea8b470c1d299d4655
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 00:42:58 +00:00
Joe Bolinger
320c2e6622 [automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-qpr1-dev am: 5cdb1689bb -s ours am: c0d3a87af0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I61d2ef1b560ef711293a66a5148479a437599ba4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-23 00:42:32 +00:00