Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
810,977 Commits 3 Branches 0 Tags
a13520b42fceda09afa163502c4708a7bfe67442
Commit Graph

810977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jordan Demeulenaere
a13520b42f Reconcile Expandable.kt on master/tm-qpr-dev-plus-aosp and tm-qpr-dev 
This CL reconciles the content of Expandable.kt in the
tm-qpr-dev-plus-aosp branch and tm-qpr-dev. This CL being on
tm-qpr-dev-plus-aosp, this will also be merged in master.

Currently the files are different because the androidx.savedstate
library was updated in tm-qpr-dev-plus-aosp in http://ag/19946745, and
removed the ViewTreeSavedStateRegistryOwner APIs. Ideally, instead of
this CL, we would update the androidx.savedstate library in tm-qpr-dev
but I'm getting build errors in http://ag/20708667 that might take a
while to fix. Until I manage to get that CL in, I suggest we work around
it in this CL by re-introducing the ViewTreeSavedStateRegistryOwner API
used by tm-qpr-dev, which forwards calls to the API that replaced it.
That way we can unblock the few CLs like http://ag/20256703 and
http://ag/20711619 which currently have conflicts with master and
tm-qpr-dev-plus-aosp.

Bug: 262222023
Test: Builds
Change-Id: I97660c5a9a2758c5e19d037e635c21456b6085c3
 2022-12-15 13:22:23 +01:00
Jordan Demeulenaere
ebf8a06ff7 Merge "Remove the <application> tag from SystemUIComposeFeatures" into tm-qpr-dev am: 4c42ecfeb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20708647

Change-Id: I5bcc34643526d650347e20c7e0cd3f8e7ec4c978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 11:09:42 +00:00
Jordan Demeulenaere
4c42ecfeb1 Merge "Remove the <application> tag from SystemUIComposeFeatures" into tm-qpr-dev 2022-12-15 10:51:13 +00:00
Piotr Wilczyński
915a4d6ca8 Merge "Make DPC listen to auto-brightness mode changes" into tm-qpr-dev am: fd4bed64d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20339748

Change-Id: I4a5213ac33cc98c1e18da1a339f1b8d8b399ac48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 10:32:50 +00:00
Vania Januar
5a8d230d22 Merge "Low battery notifications for USI styluses." into tm-qpr-dev am: 206392b411 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20608953

Change-Id: Ic61d520a905d37a6def6771c2f27162e5e9d59d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 10:31:13 +00:00
Tony Huang
ad5b466034 Merge "Fix failed while running same pair again" into tm-qpr-dev am: 9e656e7c3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20742170

Change-Id: I41cee4f86de6d701b19cfc6be2ce23894bcabdb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 10:30:32 +00:00
Johannes Gallmann
5d598c5ecd Merge "Fix notification launch animation for split shade" into tm-qpr-dev am: e068bb37e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20665669

Change-Id: I52012129ee126327b7be3385fb043a886e9fba34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 10:28:41 +00:00
Piotr Wilczyński
fd4bed64d6 Merge "Make DPC listen to auto-brightness mode changes" into tm-qpr-dev 2022-12-15 10:26:33 +00:00
Vania Januar
206392b411 Merge "Low battery notifications for USI styluses." into tm-qpr-dev 2022-12-15 10:18:31 +00:00
Tony Huang
9e656e7c3c Merge "Fix failed while running same pair again" into tm-qpr-dev 2022-12-15 10:15:23 +00:00
Johannes Gallmann
e068bb37e4 Merge "Fix notification launch animation for split shade" into tm-qpr-dev 2022-12-15 09:36:44 +00:00
Luca Zuccarini
d5b2b20bc8 Merge "Make ActivityLaunchAnimator.Runner usable independently." into tm-qpr-dev am: ea07279ebb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20710346

Change-Id: I6093b112758aaf1f3da3f32a0b2a9b57b69fc6d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 09:08:12 +00:00
Luca Zuccarini
ea07279ebb Merge "Make ActivityLaunchAnimator.Runner usable independently." into tm-qpr-dev 2022-12-15 08:29:40 +00:00
TreeHugger Robot
e651d4d8b6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2fafc8df65 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iac8419e97da02a581cab50e58a9252d211dec064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 07:55:48 +00:00
Bill Yi
d15f7f44cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 89cd665a8f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I33cf6247f3ce7ec099b63fadf1ab9735eeacfb04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 07:55:22 +00:00
TreeHugger Robot
555ad3c502 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c0a472c0cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I38313ce549bbbdb947ba9aa84fea446b37f2bc6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 07:55:02 +00:00
Bill Yi
8886d94117 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b32bef9a7e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic01e635b7120c538b4e3dbfcb0976cd4539f824a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 07:54:49 +00:00
TreeHugger Robot
eb5751e361 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1fcef083b5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I589ceb2c202d76eeacfb411d79b32a5183e4aab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 07:54:26 +00:00
Bill Yi
9af10cf9c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9816684392 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9626e70620805b0a7a912d2b0a51ea8602d68da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 07:54:05 +00:00
TreeHugger Robot
2fafc8df65 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-15 07:32:24 +00:00
TreeHugger Robot
c0a472c0cf Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-15 07:32:24 +00:00
TreeHugger Robot
1fcef083b5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-15 07:32:24 +00:00
Riddle Hsu
3b1cd4771a Merge "Inherit smallest width if TF is not multi-window without bounds override" into tm-qpr-dev am: c7237c1b0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20729658

Change-Id: Iccc577aa2e7acada99f06bbfc84fdeaa30f497df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 07:15:23 +00:00
Junyu Lai
8b6e7bb613 [automerger skipped] Merge "Do not crash when duplication found in merged imsi list" into tm-qpr-dev am: 46c7d694aa -s ours 
am skip reason: Merged-In I69d332ee0acde6cdd7582d1aa18c82576f7090f2 with SHA-1 fe5f1e99e3 is already in history

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

Change-Id: I01acc1bd7a944c68f2b721525e2982ec5f039378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 07:14:51 +00:00
Junyu Lai
adf9c4d039 [automerger skipped] Do not crash when duplication found in merged imsi list am: a4b025f771 -s ours 
am skip reason: Merged-In I69d332ee0acde6cdd7582d1aa18c82576f7090f2 with SHA-1 fe5f1e99e3 is already in history

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

Change-Id: I398cbe319ec71aa44fb00529809750196676bfa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 07:14:29 +00:00
Riddle Hsu
c7237c1b0e Merge "Inherit smallest width if TF is not multi-window without bounds override" into tm-qpr-dev 2022-12-15 07:11:10 +00:00
Junyu Lai
46c7d694aa Merge "Do not crash when duplication found in merged imsi list" into tm-qpr-dev 2022-12-15 06:21:58 +00:00
Tony Huang
724294eaf9 Fix failed while running same pair again 
The exitSplit called while we launch the same split pair caused
it cannot enter split successful then lead to tests failed.

Add check isEnteringSplit check for that exitSplit.

Fix: 262595710
Test: atest NexusLauncherTests
Change-Id: I8666476ff76e3912542d30441b144c67baed9f38
 2022-12-15 06:07:02 +00:00
Joanne Chung
5f8309a0b9 Merge "Hotword: Add uid into the original metrics" into tm-qpr-dev am: aff32206e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20717790

Change-Id: I02b53f84b891c565a5119669247c11b85863649d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 04:40:32 +00:00
Joanne Chung
aff32206e9 Merge "Hotword: Add uid into the original metrics" into tm-qpr-dev 2022-12-15 04:16:07 +00:00
Rupesh Bansal
b95226c0e0 Merge "Add support to read refresh rate thresholds and controls from the DisplayDeviceConfig" into tm-qpr-dev am: 3b7ae930fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20713016

Change-Id: I0ae0d2a5e4ea542fb99839613a81cdf7bf912f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 04:01:18 +00:00
Rupesh Bansal
3b7ae930fa Merge "Add support to read refresh rate thresholds and controls from the DisplayDeviceConfig" into tm-qpr-dev 2022-12-15 03:26:04 +00:00
Bill Yi
89cd665a8f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I42494363523060cc89c17fdc8f53a0261c5909a1
 2022-12-14 18:08:24 -08:00
Yan Yan
843653af00 Merge "Fix a typo and use ArraySet in VCN" am: e60e0a8b75 am: bd0882f00f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2355953

Change-Id: If81baa3160a66a6805cf70b4bd042f185f83aa5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 01:59:14 +00:00
Bill Yi
b32bef9a7e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I106203ff9613d5d0c6ee41095e7d473c06d1e4c1
 2022-12-14 17:57:56 -08:00
Bill Yi
9816684392 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I838f9b11028dfd9994fb0aca4ebc93cd4fed0f2c
 2022-12-14 17:42:51 -08:00
Yan Yan
bd0882f00f Merge "Fix a typo and use ArraySet in VCN" am: e60e0a8b75 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2355953

Change-Id: I87aa88c561109ccbc24c88dfa00e84905d2e9d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 01:25:29 +00:00
TreeHugger Robot
0aecd3da5b Merge "WindowManager#getPossibleMaximumWindowMetrics for disabled displays" into tm-qpr-dev am: 99970b1959 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19239592

Change-Id: I57326c96549613f49fc003730d5afd95321eaf27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 00:51:51 +00:00
Chet Haase
e37c62ff60 Merge "Revert "DO NOT MERGE Revert "Fix activity leak bug""" into tm-qpr-dev am: a424fc32ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20737991

Change-Id: Ie467c5bc23690feaa791f04e12f71b139b61e31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 00:49:28 +00:00
Chet Haase
8aa4c1e0d3 Revert "DO NOT MERGE Revert "Fix activity leak bug"" am: b9ed093976 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20737991

Change-Id: I5eb93a0d150d877c36634c163a7d4304cac78f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 00:48:51 +00:00
Treehugger Robot
cc79cea33c Merge "Refine keep rules for Java classes w/ native methods" am: 170a9ababb am: 38f2d28610 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2355959

Change-Id: I5bcb07772780e20ef344ee202b115b58db7240d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 00:43:46 +00:00
Yan Yan
e60e0a8b75 Merge "Fix a typo and use ArraySet in VCN" 2022-12-15 00:39:05 +00:00
Treehugger Robot
38f2d28610 Merge "Refine keep rules for Java classes w/ native methods" am: 170a9ababb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2355959

Change-Id: I72b8cd4f7e6a51f1f40332923de4b67d87684129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-15 00:08:12 +00:00
TreeHugger Robot
99970b1959 Merge "WindowManager#getPossibleMaximumWindowMetrics for disabled displays" into tm-qpr-dev 2022-12-14 23:54:40 +00:00
Chet Haase
a424fc32ca Merge "Revert "DO NOT MERGE Revert "Fix activity leak bug""" into tm-qpr-dev 2022-12-14 23:50:42 +00:00
Derek Jedral
7c06a1561d Merge "Fix TrustAgent showing unclear string." into tm-qpr-dev am: 06cbc8c0f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20555844

Change-Id: Ie1ef2e87eb7677647b9d40fd4753af1213c9f4cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-14 23:30:35 +00:00
Michael Mikhail
0af60b86d0 Merge "[Media TTT] Add @SystemApis for new states of receiver devices" into tm-qpr-dev am: 860d469829 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20667967

Change-Id: Ia9bdb2a9ef8e6d388bf13770eeb1967fc3382d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-14 23:28:46 +00:00
Treehugger Robot
170a9ababb Merge "Refine keep rules for Java classes w/ native methods" 2022-12-14 23:25:01 +00:00
Derek Jedral
06cbc8c0f5 Merge "Fix TrustAgent showing unclear string." into tm-qpr-dev 2022-12-14 23:12:07 +00:00
Michael Mikhail
860d469829 Merge "[Media TTT] Add @SystemApis for new states of receiver devices" into tm-qpr-dev 2022-12-14 23:04:06 +00:00