Louis Chang
966a4e4e81
Merge "Do nothing when a finishing Activity configuration changed" into tm-dev am: 725d1534ad am: 3ff8feac5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19008927
Change-Id: I88bad53e137f2fe321928ba8b833f0f8b2ecea22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 01:07:10 +00:00
Louis Chang
3ff8feac5a
Merge "Do nothing when a finishing Activity configuration changed" into tm-dev am: 725d1534ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19008927
Change-Id: I8d671b66969befd1ce37ad4e8b9984603213e805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 00:49:18 +00:00
Shaowei Shen
1e9a1d54b5
[automerger skipped] Merge "[Output Switcher] Sets TemporaryAllowList when transfer from local to remote (or oppsite way)" into tm-dev am: 3a4731d949 am: 2ff2c21158 -s ours
...
am skip reason: Merged-In I32a823919b48fd784d354858c7e3b1070a723e28 with SHA-1 ab7e8ff236 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18156225
Change-Id: I38f6067cb7e75e9c994012f5473cf8b5eb9b533c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 00:41:10 +00:00
Louis Chang
725d1534ad
Merge "Do nothing when a finishing Activity configuration changed" into tm-dev
2022-06-23 00:30:19 +00:00
Shaowei Shen
2ff2c21158
Merge "[Output Switcher] Sets TemporaryAllowList when transfer from local to remote (or oppsite way)" into tm-dev am: 3a4731d949
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18156225
Change-Id: I0d19de0171dbe78d07716d26d8110b08716895da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 00:16:30 +00:00
Shaowei Shen
23d883bc4c
Merge "[Output Switcher] Sets TemporaryAllowList when transfer from local to remote (or oppsite way)" into tm-qpr-dev
2022-06-22 23:53:24 +00:00
Shaowei Shen
3a4731d949
Merge "[Output Switcher] Sets TemporaryAllowList when transfer from local to remote (or oppsite way)" into tm-dev
2022-06-22 23:53:24 +00:00
Issei Suzuki
6ac7eb3669
Merge "Ignore overriding pending animaiton for unlock transition." into tm-dev am: 6eaacb50f2 am: 96a6b4aa02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18918937
Change-Id: I07f653a44483d343397f086e0da603a70dc7ba6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 21:54:54 +00:00
Issei Suzuki
96a6b4aa02
Merge "Ignore overriding pending animaiton for unlock transition." into tm-dev am: 6eaacb50f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18918937
Change-Id: Ie992b3089356f239624af71496b4670914ac9e1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 21:37:58 +00:00
Issei Suzuki
6eaacb50f2
Merge "Ignore overriding pending animaiton for unlock transition." into tm-dev
2022-06-22 21:18:21 +00:00
Oriol Prieto Gascó
bbb13e732f
Merge "Use com.android.bluetooth as the bluetooth stack APK" into tm-dev am: 75c201f935 am: 14d022ad70
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18977517
Change-Id: I2f02ac7c84214dd0785ca9723f435c7f1fc3348b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 18:12:28 +00:00
Oriol Prieto Gascó
14d022ad70
Merge "Use com.android.bluetooth as the bluetooth stack APK" into tm-dev am: 75c201f935
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18977517
Change-Id: Iabf3f5798bc5b3d66fddd7ec48fe53e18a9b67a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 17:45:16 +00:00
Oriol Prieto Gascó
75c201f935
Merge "Use com.android.bluetooth as the bluetooth stack APK" into tm-dev
2022-06-22 17:18:46 +00:00
Hongwei Wang
3d29930505
Merge "Get PiP state from Shell in EdgeBackGestureHandler" into tm-qpr-dev
2022-06-22 16:56:57 +00:00
Michał Brzeziński
3a98dbf919
Merge "1/2 Making bouncer shift on double tap when user chooser is visible" into tm-qpr-dev
2022-06-22 16:56:06 +00:00
shaoweishen
ab7e8ff236
[Output Switcher] Sets TemporaryAllowList when transfer from local to
...
remote (or oppsite way)
app will create new UMO when transfer between local and remote,
and it will produce Exception if app is background, so set it
to TemporaryAllowList before start transferring.
Bug: 235339353
Test: atest atest MediaOutputAdapterTest MediaOutputControllerTest MediaOutputBaseDialogTest MediaOutputDialogTest MediaOutputGroupAdapterTest MediaOutputGroupDialogTest
Change-Id: I32a823919b48fd784d354858c7e3b1070a723e28
2022-06-22 15:55:35 +00:00
shaoweishen
547f613a80
[Output Switcher] Sets TemporaryAllowList when transfer from local to
...
remote (or oppsite way)
app will create new UMO when transfer between local and remote,
and it will produce Exception if app is background, so set it
to TemporaryAllowList before start transferring.
Bug: 235339353
Test: atest atest MediaOutputAdapterTest MediaOutputControllerTest MediaOutputBaseDialogTest MediaOutputDialogTest MediaOutputGroupAdapterTest MediaOutputGroupDialogTest
Change-Id: I32a823919b48fd784d354858c7e3b1070a723e28
Merged-In: I32a823919b48fd784d354858c7e3b1070a723e28
2022-06-22 15:55:02 +00:00
Jeff DeCew
fd4f5f106d
Merge "Enable DynamicPrivacy whenever notifications are visible." into tm-qpr-dev
2022-06-22 13:29:46 +00:00
Jeff DeCew
12f23952ed
Merge "Code cleanup and visual polish for hybrid views" into tm-qpr-dev
2022-06-22 13:29:24 +00:00
TreeHugger Robot
52f51d89f1
Merge "Add metrics for software and external source detections." into tm-qpr-dev
2022-06-22 12:15:08 +00:00
Lorenzo Colitti
0a431804fa
Merge changes from topic "cherrypicker-L33200000955045139:N22000001272520181" into tm-qpr-dev
...
* changes:
Add a retry mechanism when error is recoverable
Enable MOBIKE in IKEv2 VPN
Use token to identify IKE Session
2022-06-22 09:55:49 +00:00
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
Hongwei Wang
e9e4ca3ecd
Get PiP state from Shell in EdgeBackGestureHandler
...
We use to rely on the onActivityPinned and onActivityUnpinned callbacks
from Window Manager in EdgeBackGestureHandler to determine the current
PiP state and it will always be reset to false when
EdgeBackGestureHandler is being re-created, for instance, as a result of
folded state change.
Deprecated also the Pip#setPinnedStackAnimationListener interface method
since it's not in use and it may cause confusions over
IPip#setPinnedStackAnimationListener.
Bug: 174702196
Bug: 198651351
Test: stash in unfolded state -> fold -> drag to unstash \
stash in folded state -> unfold -> drag to unstash
Test: atest WMShellUnitTests:PipControllerTest
Change-Id: Id874056415011ee8a55dadcd4ec6af6e1b568092
2022-06-21 18:19:10 -07: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
Michal Brzezinski
fd8aa55ee3
1/2 Making bouncer shift on double tap when user chooser is visible
...
This change makes bouncer/security swap sides with multi user view without proper animation. Adding animation will come in follow up CL.
The main change is extracting double tap and shift logic to SidedSecurityMode superclass so both "one handed mode" and "multi user mode" can inherit from it and behave in a similar way.
Bug: 220872694
Test: KeyguardSecurityContainerTest
Test: open bouncer with user chooser on the side, double tap on the other side of the bouncer, see views swap positions
Change-Id: Ic7e32412edd4c25dde709db0544e60ec9ab951e5
2022-06-21 14:49:54 -04: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
Issei Suzuki
6920cf5546
Ignore overriding pending animaiton for unlock transition.
...
System app can request to override app transition animation using
the following hidden APIs.
- IWindowManager#overridePendingAppTransitionRemote
- Activity#registerRemoteAnimations
- IActivityTaskManager#registerRemoteAnimationsForDisplay
We usually give the lowest priority for the overrides registered by
the last API, since it defines default transition animaiton for a given
transition type and others are used to overide more specific cases.
However remote animation for unlock transition is also used to sync
keyguard status between server_process and system ui, even system app
must not override it.
Bug: 231556392
Test: manual
1. Press Power button to display the lock screen.
2. Press Power button and the volume down button at the same time to
take a screenshot.
3. Tap the screenshot preview that appears in the lower left corner
of the screen.
4. Execute Fingerprint authentication to unlock the screen.
Change-Id: I16593c1aa7e7799e355aafbe47832e5c3b23c0cc
2022-06-21 18:24:07 +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