Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
811,939 Commits 3 Branches 0 Tags
87bec3764f148b1e44a3f1005ab44a1cb2547a91
Commit Graph

811939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jakub Pawłowski
87bec3764f Merge "Add missing HAP_CONNECTION_STATE_CHANGED intent" am: ca6da43fc1 am: c05149b946 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2367808

Change-Id: I2d674ba63e72745caf936f470ebe772375e3a63d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-24 10:48:28 +00:00
Jakub Pawłowski
c05149b946 Merge "Add missing HAP_CONNECTION_STATE_CHANGED intent" am: ca6da43fc1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2367808

Change-Id: I956a74a1a7c2719d8367cb70d668c819b1e61659
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-24 10:13:43 +00:00
Jakub Pawłowski
ca6da43fc1 Merge "Add missing HAP_CONNECTION_STATE_CHANGED intent" 2022-12-24 09:37:00 +00:00
Treehugger Robot
0e3c3efc73 Merge "Add keylayout mapping for Dualsense Edge gamepad" am: ae04dc29af am: e54abbb3f2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2363669

Change-Id: I31f7e49231b8381953f1fcd589c03a91ae47d5f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-24 09:15:46 +00:00
Treehugger Robot
e54abbb3f2 Merge "Add keylayout mapping for Dualsense Edge gamepad" am: ae04dc29af 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2363669

Change-Id: I2e148c7582f629e72a7eb53914c61742c6547691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-24 08:40:11 +00:00
Treehugger Robot
ae04dc29af Merge "Add keylayout mapping for Dualsense Edge gamepad" 2022-12-24 08:05:48 +00:00
Lyn Han
fd93610d22 Merge "Add FSI view binder and wm config" into tm-qpr-dev am: f6436573b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20708234

Change-Id: Idbe81b2cd8359253fc5bf9b555cdae37748c1c00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-24 04:35:32 +00:00
Lyn Han
f6436573b4 Merge "Add FSI view binder and wm config" into tm-qpr-dev 2022-12-24 04:01:06 +00:00
Jordan Demeulenaere
8142b837a2 Merge "Fix PeopleSpace when showing only priority or recent conversations (1/2)" into tm-qpr-dev am: d5a4b9e514 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20795170

Change-Id: Ide1a98ecada9661c9e4bb25b5a54840be89d3f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-23 13:55:46 +00:00
Jordan Demeulenaere
6feb852c65 Merge "Add the option to disable lazy notifications (2/2)" into tm-qpr-dev am: f9748a4c24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20794246

Change-Id: Iebb5f29c0b027983fd59eb663b363bfa1af6a0b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-23 13:55:01 +00:00
Jordan Demeulenaere
3553ea8ea5 Merge changes from topic "compose-build-flag" into tm-qpr-dev am: 93df848cf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20759151

Change-Id: I6106efa4b1842fb57deb0522ca47b2c1314a6d08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-23 13:53:43 +00:00
Jordan Demeulenaere
d5a4b9e514 Merge "Fix PeopleSpace when showing only priority or recent conversations (1/2)" into tm-qpr-dev 2022-12-23 13:22:35 +00:00
Jordan Demeulenaere
f9748a4c24 Merge "Add the option to disable lazy notifications (2/2)" into tm-qpr-dev 2022-12-23 13:21:00 +00:00
Jordan Demeulenaere
93df848cf1 Merge changes from topic "compose-build-flag" into tm-qpr-dev 
* changes:
  Show the Compose implementation of PeopleSpace when Compose is available
  Add SystemUI build flag for Compose code (1/3)
 2022-12-23 13:20:26 +00:00
Massimo Carli
95039f5798 Merge "[2/n] Makes EduAnimationController generic" into tm-qpr-dev am: 1bca22be0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20764908

Change-Id: I61c352efb91cc142fdd3425a9321ff7f05e384f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-23 11:13:38 +00:00
Massimo Carli
a857dec598 Merge "[1/n] Create Configuration for CompatUX Enhancements" into tm-qpr-dev am: 9a7c0d617e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20597071

Change-Id: I8c2572bc29264e24f632ba47b9bec969977f2ed4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-23 11:11:36 +00:00
Massimo Carli
1bca22be0e Merge "[2/n] Makes EduAnimationController generic" into tm-qpr-dev 2022-12-23 10:05:21 +00:00
Massimo Carli
9a7c0d617e Merge "[1/n] Create Configuration for CompatUX Enhancements" into tm-qpr-dev 2022-12-23 10:01:25 +00:00
Hongwei Wang
72fd1f7e31 Merge "Do not reset surface when entering PiP" into tm-qpr-dev am: a6c8c2af5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20738721

Change-Id: Ic6ea2b0cb7fb21c923d710671f755aa06f2b6cac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-23 04:56:02 +00:00
Hongwei Wang
a6c8c2af5a Merge "Do not reset surface when entering PiP" into tm-qpr-dev 2022-12-23 04:27:24 +00:00
Lyn Han
092a66477b Add FSI view binder and wm config 
Bug: 243421660
Test: visual
Change-Id: I39ede9bc83ebd6710ff4441282dc2072165c7521
 2022-12-23 01:42:37 +00:00
TreeHugger Robot
bdf24e1c3b [automerger skipped] Merge "Revert "Implement a global maximum on number of shortcuts an app can publish"" into sc-dev am: 7ce81bda11 -s ours am: 7de9ed79fc -s ours am: 3f1534eb77 -s ours am: 5b6d285de8 -s ours am: 4aea16bab3 -s ours am: 21ce858e1f -s ours 
am skip reason: Merged-In I1d7c265160389e45cf57a4bf8ce756376068d5b7 with SHA-1 a8047ca3df is already in history

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

Change-Id: Ia463959d1b3a112a60671ed8bfb78afaab36c77e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 22:27:50 +00:00
Presubmit Automerger Backend
2381e94dcc [automerger skipped] [automerge] Revert "Implement a global maximum on number of shortcuts an app can publish" 2p: a8047ca3df am: 66172edd88 -s ours am: 74cb12fef9 -s ours am: 56ddde2f4f -s ours am: 8a2c66c57a -s ours am: 9240b791e4 -s ours 
am skip reason: Merged-In I1d7c265160389e45cf57a4bf8ce756376068d5b7 with SHA-1 b71ba5fbf7 is already in history

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

Change-Id: Ie9b38c50243609c1e276f005bd7f0f763c5fdd2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 22:27:16 +00:00
TreeHugger Robot
21ce858e1f [automerger skipped] Merge "Revert "Implement a global maximum on number of shortcuts an app can publish"" into sc-dev am: 7ce81bda11 -s ours am: 7de9ed79fc -s ours am: 3f1534eb77 -s ours am: 5b6d285de8 -s ours am: 4aea16bab3 -s ours 
am skip reason: Merged-In I1d7c265160389e45cf57a4bf8ce756376068d5b7 with SHA-1 a8047ca3df is already in history

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

Change-Id: Icba225bd3e0e7243f6b2e2d736fd8962b5f659f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 21:34:02 +00:00
Presubmit Automerger Backend
9240b791e4 [automerger skipped] [automerge] Revert "Implement a global maximum on number of shortcuts an app can publish" 2p: a8047ca3df am: 66172edd88 -s ours am: 74cb12fef9 -s ours am: 56ddde2f4f -s ours am: 8a2c66c57a -s ours 
am skip reason: Merged-In I1d7c265160389e45cf57a4bf8ce756376068d5b7 with SHA-1 b71ba5fbf7 is already in history

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

Change-Id: I21a7e51fcd862b76aae0b6ec795b3db1598fd6f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 21:33:39 +00:00
Ale Nijamkin
b0ed1ed4bd Merge "Quick affordance gesture polish and haptics." into tm-qpr-dev am: 1746734f5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20808866

Change-Id: Ica48ca6117919ecf9e392874428df6c57c3a452e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 21:18:55 +00:00
Shan Huang
6eda890a0e Merge "Allow IME to register callbacks with negative priorities." into tm-qpr-dev am: 77bef7e1d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20766528

Change-Id: If1f98148d0b1457fab3ea1852113e8f387e58807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 21:17:59 +00:00
Miranda Kephart
57b3112ebd Merge "Switch to "quiet" screenshot success when window destroyed" into tm-qpr-dev am: 9abbc3a37a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20708875

Change-Id: Ifd6b68e3bffe7b3504cb92e185c4feffea861fa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 21:17:12 +00:00
Evan Laird
5543e25ffc Merge changes from topic "demo-mode-flow" into tm-qpr-dev am: c65b0f05ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20769736

Change-Id: I9836bddd5a22fa165084f28f477ec1e61417d447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 21:16:09 +00:00
Evan Laird
880c361bb6 [Sb refactor] Add a demo command flow method am: 2775b3b39e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20769735

Change-Id: I6a2363b871663f446f38dc5918f10e6a1348c31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 21:15:45 +00:00
TreeHugger Robot
98634c47e7 Merge changes from topic "wifi-constants" into tm-qpr-dev am: 5bba501a33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20761388

Change-Id: Ib195aabcd9ab779db888c5bb6d1727f475c96f3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 21:13:08 +00:00
TreeHugger Robot
4aea16bab3 [automerger skipped] Merge "Revert "Implement a global maximum on number of shortcuts an app can publish"" into sc-dev am: 7ce81bda11 -s ours am: 7de9ed79fc -s ours am: 3f1534eb77 -s ours am: 5b6d285de8 -s ours 
am skip reason: Merged-In I1d7c265160389e45cf57a4bf8ce756376068d5b7 with SHA-1 a8047ca3df is already in history

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

Change-Id: I65980689b3bcf90fe65fca3286a683d73a692447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 20:58:09 +00:00
Presubmit Automerger Backend
8a2c66c57a [automerger skipped] [automerge] Revert "Implement a global maximum on number of shortcuts an app can publish" 2p: a8047ca3df am: 66172edd88 -s ours am: 74cb12fef9 -s ours am: 56ddde2f4f -s ours 
am skip reason: Merged-In I1d7c265160389e45cf57a4bf8ce756376068d5b7 with SHA-1 b71ba5fbf7 is already in history

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

Change-Id: I90271fb8879f990ce12fcf00618d05ad474507a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 20:57:59 +00:00
Ale Nijamkin
1746734f5d Merge "Quick affordance gesture polish and haptics." into tm-qpr-dev 2022-12-22 20:51:47 +00:00
Shan Huang
77bef7e1d5 Merge "Allow IME to register callbacks with negative priorities." into tm-qpr-dev 2022-12-22 20:41:46 +00:00
Miranda Kephart
9abbc3a37a Merge "Switch to "quiet" screenshot success when window destroyed" into tm-qpr-dev 2022-12-22 20:24:15 +00:00
Evan Laird
c65b0f05ce Merge changes from topic "demo-mode-flow" into tm-qpr-dev 
* changes:
  [Sb refactor] Wifi demo mode
  [Sb refactor] Add a demo command flow method
 2022-12-22 20:23:46 +00:00
TreeHugger Robot
5bba501a33 Merge changes from topic "wifi-constants" into tm-qpr-dev 
* changes:
  [Sb refactor] Mobile icon view model logging
  [Sb refactor] Add logging to mobile connections pipeline
  [Sb refactor] Move shouldShowActivityConfig to ConnectivityConstants
  [Sb refactor] Add location to mobile view models
 2022-12-22 20:23:23 +00:00
Yan Yan
61ada77fb0 Merge "Add and expose IPsec tunnel migration feature flag" am: bbed027319 am: ab0be118c1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634879

Change-Id: Ib4efe0e2258cfab8cd1c58b21ada013db287c106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 20:06:58 +00:00
TreeHugger Robot
5b6d285de8 [automerger skipped] Merge "Revert "Implement a global maximum on number of shortcuts an app can publish"" into sc-dev am: 7ce81bda11 -s ours am: 7de9ed79fc -s ours am: 3f1534eb77 -s ours 
am skip reason: Merged-In I1d7c265160389e45cf57a4bf8ce756376068d5b7 with SHA-1 a8047ca3df is already in history

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

Change-Id: I48567c4612616682a96ea3f85fe6a22ac387a921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 20:04:43 +00:00
Presubmit Automerger Backend
56ddde2f4f [automerger skipped] [automerge] Revert "Implement a global maximum on number of shortcuts an app can publish" 2p: a8047ca3df am: 66172edd88 -s ours am: 74cb12fef9 -s ours 
am skip reason: Merged-In I1d7c265160389e45cf57a4bf8ce756376068d5b7 with SHA-1 b71ba5fbf7 is already in history

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

Change-Id: I9866c9f68425f1367107ccb1d0c7ae3139d2dc31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 20:03:52 +00:00
Yan Yan
ab0be118c1 Merge "Add and expose IPsec tunnel migration feature flag" am: bbed027319 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634879

Change-Id: I4473dab2b23610cbea857be00de5a3a41ad05b85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 19:46:14 +00:00
Yixiao Luo
981b79f30b Merge "Support TvInputInfo#getHdmiDeviceInfo() for HDMI physical inputs" am: eeda8def35 am: fac490ccb5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2360419

Change-Id: I7bbc4e513264e78d87f2fe57475a83aefcfe1760
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 19:44:11 +00:00
Yuri Lin
579d4f6fac Merge "Limit the size of lists in ZenPolicy" into tm-qpr-dev am: 3e92172c8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20788986

Change-Id: I42aec613c178569f678a5eb873f11ba538c55b1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 19:27:26 +00:00
Lucas Silva
4331d04e3f Merge "Add new flag for enabling lowlight in direct boot" into tm-qpr-dev am: 4962938a32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20806334

Change-Id: I307105952c511f81f9e08742b753194a98176614
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 19:25:47 +00:00
Lucas Silva
87ee883a39 Merge "Catch error thrown by WindowManager if window has already been detached" into tm-qpr-dev am: a79ea05f59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20799177

Change-Id: I93efcd1944f8c96a6825b35a9939112247d626fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 19:25:26 +00:00
TreeHugger Robot
3f1534eb77 [automerger skipped] Merge "Revert "Implement a global maximum on number of shortcuts an app can publish"" into sc-dev am: 7ce81bda11 -s ours am: 7de9ed79fc -s ours 
am skip reason: Merged-In I1d7c265160389e45cf57a4bf8ce756376068d5b7 with SHA-1 a8047ca3df is already in history

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

Change-Id: Id359ba12f16deb49a527d345ede780441d0ccae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 19:25:01 +00:00
Presubmit Automerger Backend
74cb12fef9 [automerger skipped] [automerge] Revert "Implement a global maximum on number of shortcuts an app can publish" 2p: a8047ca3df am: 66172edd88 -s ours 
am skip reason: Merged-In I1d7c265160389e45cf57a4bf8ce756376068d5b7 with SHA-1 b71ba5fbf7 is already in history

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

Change-Id: Icd3a3ad8600254fcb2b5e8f8d2048a3fdbc9ea8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 19:24:52 +00:00
TreeHugger Robot
7de9ed79fc [automerger skipped] Merge "Revert "Implement a global maximum on number of shortcuts an app can publish"" into sc-dev am: 7ce81bda11 -s ours 
am skip reason: Merged-In I1d7c265160389e45cf57a4bf8ce756376068d5b7 with SHA-1 a8047ca3df is already in history

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

Change-Id: Id4a5fe4fddcb022aa8ab4bc134e7a8f4ed76175d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-22 19:21:48 +00:00
Yan Yan
bbed027319 Merge "Add and expose IPsec tunnel migration feature flag" 2022-12-22 19:21:10 +00:00