Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
769,193 Commits 3 Branches 0 Tags
65a3d8ebc49af637cff3d1095f599f56fa2b2c8a
Commit Graph

769193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shaowei Shen
65a3d8ebc4 Merge "[Output Switcher] Use Thread-safe list to store mediaDevices in MediaManager" into tm-dev am: 82c3268cbe am: 84612594e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18911999

Change-Id: I379bfaf61110d831a031eb98e88fff2ebb0a87e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 08:55:38 +00:00
Shaowei Shen
84612594e2 Merge "[Output Switcher] Use Thread-safe list to store mediaDevices in MediaManager" into tm-dev am: 82c3268cbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18911999

Change-Id: Iaf65dfd933ddc922a4a8174cd31a6c6825472691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 08:30:21 +00:00
Shaowei Shen
82c3268cbe Merge "[Output Switcher] Use Thread-safe list to store mediaDevices in MediaManager" into tm-dev 2022-06-22 08:01:56 +00:00
TreeHugger Robot
88efc6f72e Merge "Update vibration cancellation policy for notifications" into tm-qpr-dev 2022-06-22 07:06:32 +00:00
Andrii Kulian
4f9b4bec17 [automerger skipped] Merge "Check Task windowing mode when reporting display features" into tm-dev am: cfe0279f69 am: 253f3e886e -s ours 
am skip reason: Merged-In I00f62574124df6df61f121228bd91ff9bc751c2a with SHA-1 2eae3a52a7 is already in history

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

Change-Id: I5bc58444b7647265a939e882a22fa38102101e18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 05:55:30 +00:00
Andrii Kulian
253f3e886e Merge "Check Task windowing mode when reporting display features" into tm-dev am: cfe0279f69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18972307

Change-Id: I0d627b6276108f6801ce36aee60a1820844f879c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 05:39:42 +00:00
Andrii Kulian
cfe0279f69 Merge "Check Task windowing mode when reporting display features" into tm-dev 2022-06-22 05:19:15 +00:00
shaoweishen
84d0224973 [Output Switcher] Use Thread-safe list to store mediaDevices in 
MediaManager

Test: build pass
Bug: 235183673
Change-Id: Ic00c1085f3ddc3c9bf68815a4ef96a5f1391556c
 2022-06-22 01:11:57 +00:00
Daniel (Ying Wai) Fan
5df1f2efd0 Merge "Revert "[Media TTT] Turn the TTT flag off for Android T."" into tm-dev am: fe44acf0d7 am: e4b833b1a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19014905

Change-Id: I19f0037188e0bd89f5eff17f0fe6fe00272abba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 00:36:35 +00:00
Daniel (Ying Wai) Fan
e4b833b1a4 Merge "Revert "[Media TTT] Turn the TTT flag off for Android T."" into tm-dev am: fe44acf0d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19014905

Change-Id: Ib242788c4b29a071c487fb629e50632127ee5db5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 00:10:55 +00:00
Daniel (Ying Wai) Fan
fe44acf0d7 Merge "Revert "[Media TTT] Turn the TTT flag off for Android T."" into tm-dev 2022-06-21 23:52:35 +00:00
Daniel (Ying Wai) Fan
e4e4056d5a Revert "[Media TTT] Turn the TTT flag off for Android T." 
This reverts commit 4da2f8be76.

Reason for revert: The CL is causing test breakage b/236749332.

Change-Id: Iaf922eaa612f6f7d8bfb32dd3575192af039c8cb
Bug: 236749332
 2022-06-21 22:37:45 +00:00
Jeff DeCew
bc8dcaf7c9 Merge "NotificationEntry logging improvements" into tm-qpr-dev 2022-06-21 22:28:17 +00:00
Chavi Weingarten
7534f6e76f Merge "Prevent windows from drawing if they're in an active sync set" into tm-qpr-dev 2022-06-21 21:52:38 +00:00
Andrii Kulian
44ca54f15e Merge "Check Task windowing mode when reporting display features" into tm-qpr-dev 2022-06-21 21:45:30 +00:00
Mariia Sandrikova
3e97a81ac3 Merge "Remove aspect ratio limit for unresizable apps." into tm-qpr-dev 2022-06-21 19:52:51 +00:00
Caitlin Cassidy
ef34020599 Merge "[Media TTT] Turn the TTT flag off for Android T." into tm-dev am: 3b84c43c1e am: 7dc5c76eab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18934573

Change-Id: I6a54e71aad582c55386dac352d7bf8f2184a3bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 19:01:23 +00:00
Shan Huang
314b0fc6c8 [automerger skipped] Merge "Pass the values of the MotionEvent instead of the event instance itself to BackAnimation." into tm-dev am: 1deb1af4a7 am: a79aed78d5 -s ours 
am skip reason: Merged-In I4792debc705536b49d1caafcc43e5466941c1d43 with SHA-1 f89eb1e5b5 is already in history

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

Change-Id: I87d183ebb0f9781be5f13ec7b8480dfa6263be24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 19:01:05 +00:00
Caitlin Cassidy
7dc5c76eab Merge "[Media TTT] Turn the TTT flag off for Android T." into tm-dev am: 3b84c43c1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18934573

Change-Id: I5fcb9c6147ae5b6f63db130a108a867983d2963e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 18:43:11 +00:00
Caitlin Cassidy
3b84c43c1e Merge "[Media TTT] Turn the TTT flag off for Android T." into tm-dev 2022-06-21 18:40:34 +00:00
Shan Huang
a79aed78d5 Merge "Pass the values of the MotionEvent instead of the event instance itself to BackAnimation." into tm-dev am: 1deb1af4a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18963576

Change-Id: I24f8b034e3bfdc15493c8f2a2716985fddc4deab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 18:34:51 +00:00
Shan Huang
1deb1af4a7 Merge "Pass the values of the MotionEvent instead of the event instance itself to BackAnimation." into tm-dev 2022-06-21 18:13:38 +00:00
TreeHugger Robot
cb8c65fef9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 77f103bc32 -s ours am: f6c9d9d376 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98f67d705bf980a9a257edcd72c557e244a9598b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:41:35 +00:00
Bill Yi
c3957f9a7f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 948e3c4e24 -s ours am: e9d06aba26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I074a4c28a6f3638def770f1621cd72d08f843eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:41:33 +00:00
TreeHugger Robot
a197104d07 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 65ded46c54 -s ours am: 9207b9dd83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibabf5616053d3ac7a7f21d4a084d8dce820b49c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:41:19 +00:00
Bill Yi
1be1fc4763 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2685032b2 -s ours am: 110aa26852 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I858fe7d954976c0e2ad2b8417a616072c2d41a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:41:10 +00:00
Ben Miles
fa72dbea82 Merge "Add ANR info to traces for all builds" into tm-dev am: a2b0efdc12 am: be4364610b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18870966

Change-Id: I7589bd5df7a8ed479354c9354a38f2b58e88f856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:39:24 +00:00
TreeHugger Robot
f6c9d9d376 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 77f103bc32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05fe706949b4967447bdf00e1e9618ca65566d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:23:59 +00:00
Bill Yi
e9d06aba26 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 948e3c4e24 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If5dad3baf3ec2160baf3678dcff6b88142c737b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:23:50 +00:00
TreeHugger Robot
9207b9dd83 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 65ded46c54 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2fdfe82d9ba382504a98ace0ae67e7f435dc4a0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:23:38 +00:00
Bill Yi
110aa26852 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2685032b2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9a143f1163f5e634bbe396b24d67eee8830205c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:23:24 +00:00
TreeHugger Robot
77f103bc32 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-21 16:17:20 +00:00
TreeHugger Robot
65ded46c54 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-21 16:17:20 +00:00
Ben Miles
be4364610b Merge "Add ANR info to traces for all builds" into tm-dev am: a2b0efdc12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18870966

Change-Id: I0fb498af70f3d5858d9bf0c2b54d39c5c513189c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:13:32 +00:00
Shan Huang
1ab6263c4d Merge "Pass the values of the MotionEvent instead of the event instance itself to BackAnimation." into tm-qpr-dev 2022-06-21 15:54:21 +00:00
Ben Miles
a2b0efdc12 Merge "Add ANR info to traces for all builds" into tm-dev 2022-06-21 15:52:58 +00:00
Caitlin Cassidy
f38fba3e92 Merge "[Media TTT] Update timeout to take accessibility settings into account. This will extend the timeout for the chip to at least 10s if a11y is on, or longer if the user has it set to longer." into tm-qpr-dev 2022-06-21 15:36:58 +00:00
Caitlin Cassidy
ea89edc011 Merge "[Media TTT] Update text to take the rest of the width, so that it will spill onto a second line if it needs it." into tm-qpr-dev 2022-06-21 15:35:56 +00:00
Riddle Hsu
4b29372fb1 Merge "Use top activity for fixed rotation from snapshot starting window" into tm-dev am: d6ad543b7c am: ff3c85f51b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18924772

Change-Id: I267f4eac181e8aa6a5c7d95b12eeef52ce02a958
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 15:18:32 +00:00
Jernej Virag
9efc9fa305 Merge "Size restrict right icon size in notification" into tm-qpr-dev 2022-06-21 15:03:45 +00:00
Riddle Hsu
ff3c85f51b Merge "Use top activity for fixed rotation from snapshot starting window" into tm-dev am: d6ad543b7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18924772

Change-Id: I1d1621dc2aa8cac0e9b34ceb66b65e4f607e07f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 15:03:36 +00:00
Riddle Hsu
d6ad543b7c Merge "Use top activity for fixed rotation from snapshot starting window" into tm-dev 2022-06-21 14:40:15 +00:00
Riddle Hsu
832730d33a Use top activity for fixed rotation from snapshot starting window 
Assume T=trampoline activity, M=main activity.
When launching T into an existing task which contains the existing M:
The task will have
 Top    = T (no window)  = 'activity'
 Bottom = M (has window) = 'topFullscreenActivity'
Because the real top launching activity is T, we should use it
for checking whether to apply fix rotation. Otherwise fixed rotation
will be skipped because M is not the current top activity, which
will cause the snapshot starting window to be half cropped.

Also make sure the trampoline activity has the same rotation as
the snapshot. Because the snapshot starting window will be shown
on the trampoline first and then transfer to the existing activity.

This relates to commit a95bd4a that enables snapshot starting window
to take effect across trampoline activity.

Bug: 236200669
Test: Assume A,B are landscape singleTask activities with the same
      task affinity. A will be finished (clear-task-stack) after
      starting B. Launch the app and return to home and launch it
      again. The starting window should not be cropped.

Change-Id: I11cea671c0e6b9a58ba28f28ce0f735eb576c55d
 2022-06-21 20:15:21 +08:00
Joanne Chung
721da615e8 Merge "RESTRICT AUTOMERGE Disable the Trusted Hotword requirement" into tm-qpr-dev 2022-06-21 09:54:11 +00:00
Bill Yi
d2685032b2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idd7b2a6aca4fa6a96e30a0c1c8fbcad28e987cd5
 2022-06-21 01:47:44 -07:00
Bill Yi
948e3c4e24 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3568d46d9bbe92ad76f7f0d2d91b68706b9f51d2
 2022-06-20 23:58:14 -07:00
Yunfan Chen
d9fa425f92 Merge "Print layout extended by cutout private flag in toString()" into tm-qpr-dev 2022-06-21 05:43:03 +00:00
Jerry Chang
eecdde1839 Merge "Prevent setting position to a surface attached to leash" into tm-qpr-dev 2022-06-21 01:20:00 +00:00
Cyril Lee
8700cb4b2e Merge "Offer the bugreport button in debug mode" into tm-qpr-dev 2022-06-21 01:12:05 +00:00
Louis Chang
1f2487e2a0 Merge "Use the TaskFragment override screenLayout for fix rotation" into tm-qpr-dev 2022-06-21 00:37:54 +00:00