Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
768,828 Commits 3 Branches 0 Tags
7c2c2000a08a93fec3d3a3e2b91c070384fe1b93
Commit Graph

768828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
7c2c2000a0 Merge "Keep OEM defined DisplayAreaPolicy.Provider" into tm-dev am: bbecbbeeb0 am: e3113a0ccf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18869756

Change-Id: Ib7b4acde811a110fc3fb986688c9a31c94aab962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 03:02:10 +00:00
TreeHugger Robot
e3113a0ccf Merge "Keep OEM defined DisplayAreaPolicy.Provider" into tm-dev am: bbecbbeeb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18869756

Change-Id: I9440cfa3b05cb7615cd6e733443b58c2e43957d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 02:44:31 +00:00
TreeHugger Robot
bbecbbeeb0 Merge "Keep OEM defined DisplayAreaPolicy.Provider" into tm-dev 2022-06-16 02:05:54 +00:00
Beth Thibodeau
a3dfcbed6f [automerger skipped] Merge "Forward device updates when info changes" into tm-dev am: a2b34c4c21 am: 4ee64c742b -s ours 
am skip reason: Merged-In Iefd7ce0e8859b89db2bc75c243b3a04a0cb3915d with SHA-1 4c8144ee84 is already in history

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

Change-Id: I9fcf5789aa4e55273dbef8cb75890c46728904ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 01:19:12 +00:00
Beth Thibodeau
4ee64c742b Merge "Forward device updates when info changes" into tm-dev am: a2b34c4c21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18878115

Change-Id: I6d43d20198da900da0db332abf1473129a340229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 00:45:08 +00:00
Beth Thibodeau
a2b34c4c21 Merge "Forward device updates when info changes" into tm-dev 2022-06-16 00:17:04 +00:00
Hai Zhang
5efb142e0d [automerger skipped] Don't remove SYSTEM_FIXED for intentional fixed grants to critical apps. am: 74a6adb8e0 -s ours am: c39d9728d6 -s ours am: b5a2fdd6ca -s ours am: 00e915341c -s ours 
am skip reason: Merged-In Iaf5e2a0d86259805a9ef03f8f1baa14dd8c58da0 with SHA-1 b0b2863467 is already in history

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

Change-Id: I2144d58b2d7e8e85e06e3301f5fac08b0a411ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 22:50:36 +00:00
Hai Zhang
00e915341c [automerger skipped] Don't remove SYSTEM_FIXED for intentional fixed grants to critical apps. am: 74a6adb8e0 -s ours am: c39d9728d6 -s ours am: b5a2fdd6ca -s ours 
am skip reason: Merged-In Iaf5e2a0d86259805a9ef03f8f1baa14dd8c58da0 with SHA-1 b0b2863467 is already in history

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

Change-Id: If29b12a0cfb5e7db10263485725d2bab9f0684ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 22:18:07 +00:00
Hai Zhang
b5a2fdd6ca [automerger skipped] Don't remove SYSTEM_FIXED for intentional fixed grants to critical apps. am: 74a6adb8e0 -s ours am: c39d9728d6 -s ours 
am skip reason: Merged-In Iaf5e2a0d86259805a9ef03f8f1baa14dd8c58da0 with SHA-1 b0b2863467 is already in history

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

Change-Id: I06fb52192cd75431efc22b54cb4e3109a3728729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 21:48:24 +00:00
Hai Zhang
c39d9728d6 [automerger skipped] Don't remove SYSTEM_FIXED for intentional fixed grants to critical apps. am: 74a6adb8e0 -s ours 
am skip reason: Merged-In Iaf5e2a0d86259805a9ef03f8f1baa14dd8c58da0 with SHA-1 b0b2863467 is already in history

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

Change-Id: Icbdb2192ef3326a81dc712393a40c6469654eb67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 21:30:19 +00:00
An An Yu
37b3f06461 Merge "Setup T style clear top transition animation for ActivityEmbedding." into tm-qpr-dev 2022-06-15 21:21:21 +00:00
Beth Thibodeau
9e7c760329 Merge "Forward device updates when info changes" into tm-qpr-dev 2022-06-15 20:05:31 +00:00
Jayant Chowdhary
1b0e8d7fe3 Merge "Add PREVIEW_STABILIZATION to StaticMetadata.java" into tm-dev am: 565f6d457f am: 889ba092a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18820310

Change-Id: Id7d2952eda4632ecd5f77988a5abe69118b5984c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 19:46:08 +00:00
Jayant Chowdhary
889ba092a6 Merge "Add PREVIEW_STABILIZATION to StaticMetadata.java" into tm-dev am: 565f6d457f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18820310

Change-Id: I7038550f3a49683b81aee0455e767dcb7d4c54ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 19:06:51 +00:00
Jayant Chowdhary
565f6d457f Merge "Add PREVIEW_STABILIZATION to StaticMetadata.java" into tm-dev 2022-06-15 18:38:03 +00:00
Beth Thibodeau
4c8144ee84 Forward device updates when info changes 
In some cases, the device/route name could change without also updating
the ID. This updates the check to include all fields of MediaDeviceData except
for the icon (which can change reference more frequently than is necessary
to reload). Now if the name, status, or intent has changed, listeners
will be updated to have the new info.

Bug: 235627592
Test: manual
Test: atest MediaDataManagerTest
Change-Id: Iefd7ce0e8859b89db2bc75c243b3a04a0cb3915d
Merged-In: Iefd7ce0e8859b89db2bc75c243b3a04a0cb3915d
 2022-06-15 18:15:30 +00:00
Lucas Silva
513cc27dc7 Merge "Implement air quality dream complication" into tm-qpr-dev 2022-06-15 17:39:26 +00:00
Hongwei Wang
d6579ac1b7 Merge "Avoid conflict surface reset on auto-enter-pip" into tm-qpr-dev 2022-06-15 16:55:41 +00:00
Sergey Serokurov
86d2469d1e Merge "Do not update pointer postion when stack is going to collapse" into tm-qpr-dev 2022-06-15 16:51:46 +00:00
TreeHugger Robot
57d423f62e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 741849d549 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib730e5f418a004f3cf715e7b649573fa9ed2b488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:48:26 +00:00
Bill Yi
71bb4b9ce1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5a7a0fdbac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I31f11a23ae7c4d5edf7059f5c397989377548455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:48:23 +00:00
TreeHugger Robot
56e4d4dbc6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bfd5deda01 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic98d8c732c9af3d1166b7136974fb0545c87e205
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:48:21 +00:00
Bill Yi
7ba48e071b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 500df881b8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id1ee359e60d15595a0039157b5f707cbf9947582
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:48:20 +00:00
TreeHugger Robot
b1ded7d631 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: afe51d7746 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4cff5205041526cff53d2dcfb1257a4c80e8841
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:48:18 +00:00
Bill Yi
1df9789b19 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1df35a5403 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff55a7544d3cec9e197ccbaf635cb77f027640ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:48:15 +00:00
TreeHugger Robot
4c5e2e8be7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: b3b6ba9b70 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iac76c6331065143f53eb0580be019e90e4780fc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:48:04 +00:00
Bill Yi
c0bf34bfa6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d45ee46f37 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11ea04aaf4023788b18dbea2673ffc720f202bbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:47:53 +00:00
TreeHugger Robot
ad54097027 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 9ed9f8068a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I336adc818fee7ac9dae8d2eb61ab0f373b4caeb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:47:30 +00:00
Bill Yi
2856444005 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eb4f714308 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idfbef33dd37f4c3b41db82c17cf99b11423198e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:47:17 +00:00
TreeHugger Robot
741849d549 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-15 16:39:16 +00:00
TreeHugger Robot
bfd5deda01 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-15 16:39:16 +00:00
TreeHugger Robot
afe51d7746 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-15 16:39:16 +00:00
TreeHugger Robot
b3b6ba9b70 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-15 16:39:16 +00:00
TreeHugger Robot
9ed9f8068a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-15 16:39:16 +00:00
Ming-Shin Lu
ed645fac59 Merge "Fix the startingWindow may clipped during AR#transferStartingWindow" into tm-dev am: 016c6a7320 am: b7c2ea64c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18869511

Change-Id: I608864a36d4b78f27bf85c3f9be26f361f29b3ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 15:44:04 +00:00
Hawkwood Glazier
3bbea73f63 Merge "Media transition must crossfade when transitioning to transparent" into tm-dev am: 8b5e8952aa am: e771fcf2cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18883841

Change-Id: I39814d09c4cfe0d37276566152682a459b648f6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 15:43:42 +00:00
Ming-Shin Lu
b7c2ea64c7 Merge "Fix the startingWindow may clipped during AR#transferStartingWindow" into tm-dev am: 016c6a7320 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18869511

Change-Id: Id90ba0c72c43b6ab4eb9dc1a16a24208332d62fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 15:23:40 +00:00
Ming-Shin Lu
016c6a7320 Merge "Fix the startingWindow may clipped during AR#transferStartingWindow" into tm-dev 2022-06-15 15:14:16 +00:00
Hawkwood Glazier
e771fcf2cf Merge "Media transition must crossfade when transitioning to transparent" into tm-dev am: 8b5e8952aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18883841

Change-Id: Ibe9687a3ae5e9aa46e72aa1a5bcb36a482107246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 15:13:54 +00:00
Beth Thibodeau
f35cfddd03 Forward device updates when info changes 
In some cases, the device/route name could change without also updating
the ID. This updates the check to include all fields of MediaDeviceData except
for the icon (which can change reference more frequently than is necessary
to reload). Now if the name, status, or intent has changed, listeners
will be updated to have the new info.

Bug: 235627592
Test: manual
Test: atest MediaDataManagerTest
Change-Id: Iefd7ce0e8859b89db2bc75c243b3a04a0cb3915d
Merged-In: Iefd7ce0e8859b89db2bc75c243b3a04a0cb3915d
 2022-06-15 15:08:27 +00:00
Hawkwood Glazier
8b5e8952aa Merge "Media transition must crossfade when transitioning to transparent" into tm-dev 2022-06-15 14:59:32 +00:00
Alex Chau
054aae3db4 Merge "Revert^2 "Revert "Do not send updates for disabled displays.""" into tm-qpr-dev 2022-06-15 14:16:10 +00:00
TreeHugger Robot
ad5b95a679 Merge "Only notify listeners when actual height changes" into tm-qpr-dev 2022-06-15 13:49:03 +00:00
Jason Parks
e2438acb46 Merge "Add method to check to see if the component is the supervison component." into tm-dev am: 4492604de8 am: 44effc426c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18815896

Change-Id: I2983c6a801e99290d26dff7983027ba68831ba6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 13:42:02 +00:00
Beverly Tai
3d521bf431 Merge "Don't reregister AoD UDFPS gesture after trigger" into tm-qpr-dev 2022-06-15 13:15:02 +00:00
Jason Parks
44effc426c Merge "Add method to check to see if the component is the supervison component." into tm-dev am: 4492604de8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18815896

Change-Id: I7a59f9a5a22f5b73453a7bfaa7cd4d41a1a34cc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 13:14:53 +00:00
Jason Parks
4492604de8 Merge "Add method to check to see if the component is the supervison component." into tm-dev 2022-06-15 12:54:00 +00:00
Jeff DeCew
527d13ae79 Merge "Fix notifications disappearing when shade fully expands." into tm-dev am: 1a4f7b8bc3 am: da4c70fb0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18890946

Change-Id: I112a868ce3d2b31b13868c6d2bcf97f94cc74eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 10:48:43 +00:00
Jeff DeCew
da4c70fb0b Merge "Fix notifications disappearing when shade fully expands." into tm-dev am: 1a4f7b8bc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18890946

Change-Id: I3f4934872c5e48427b6f5d41adedb65dcfffcbd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 10:31:34 +00:00
Alex Chau
937ca4b396 Revert^2 "Revert "Do not send updates for disabled displays."" 
Bug: 221071695
Reason for revert: b/235889652
Reverted Changes:
I966d2c07d:Update IDisplayManager proxy.
Idfba84d5a:Revert "Revert "Do not send updates for disabled d...
Change-Id: I8c6c23bbf0c41aaeb576ad2917759fe8d782d02f
 2022-06-15 10:16:57 +00:00