Daniel Sandler
c458354096
Merge "Android 1<3." into tm-dev am: 0f8269e68e am: 24650a74b5 am: 4e8afe4a98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18819106
Change-Id: Ic42648bf3e85888b7a8680c5b66c221f68a0e26e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 02:33:53 +00:00
Daniel Sandler
4e8afe4a98
Merge "Android 1<3." into tm-dev am: 0f8269e68e am: 24650a74b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18819106
Change-Id: I857bbfe8bb337fae261354cf77efe9f892273fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 02:17:41 +00:00
Daniel Sandler
0f8269e68e
Merge "Android 1<3." into tm-dev
2022-06-10 01:19:44 +00:00
Dan Sandler
2c57c9c164
Android 1<3.
...
Fixes: 216297617
Test: adb shell am start -n android/com.android.internal.app.PlatLogoActivity
adjust clock to 13:00
for a bonus, long press on the bubbles
Change-Id: I3d32d452c6dd7a7e69aad86a033aba09ae8625d5
2022-06-09 12:54:27 -04:00
TYM Tsai
d0ed601b50
Merge "Fix unbind crash in AbstractRemoteService." into tm-dev am: dc9db874ba am: cd43f8064c am: 1c2cdbab45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18691109
Change-Id: I2cbec39a1322cd815f1f6c06b2d11efe465b4aed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 17:01:57 +00:00
TYM Tsai
5af97d922d
Merge "Fix unbind crash in AbstractRemoteService." into tm-dev am: dc9db874ba am: c3d3577bff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18691109
Change-Id: Ifa3ed59124b1fd321f5a6134b82f4d1a0dd6bb16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 16:38:48 +00:00
TYM Tsai
cd43f8064c
Merge "Fix unbind crash in AbstractRemoteService." into tm-dev am: dc9db874ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18691109
Change-Id: I727b2114ac409a1f33ed92277be4189e45270a77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 16:19:31 +00:00
TYM Tsai
dc9db874ba
Merge "Fix unbind crash in AbstractRemoteService." into tm-dev
2022-06-07 16:00:13 +00:00
Mark Renouf
5ae61e909c
Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev am: 08a70e40fb am: f89b28c4c6 am: e5990a182e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715227
Change-Id: I351ca879cb1c53a1b357b667e5f554d3eb646b20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 13:09:58 +00:00
Mark Renouf
2c108ffdf4
Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev am: 08a70e40fb am: 6c61b6a9e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715227
Change-Id: I3add4d0f4a3fd65b4100f4eb1a197ea5358d3f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 13:02:40 +00:00
Mark Renouf
f89b28c4c6
Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev am: 08a70e40fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715227
Change-Id: I62b7d51c4186e9e17da9539fadc6eeabc22a31e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 12:38:25 +00:00
Mark Renouf
08a70e40fb
Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev
2022-06-04 12:13:21 +00:00
Mark Renouf
9d5f710317
Fix crash in DisplayResolveInfo writeToParcel impl
...
This fixes an incorrect use of List.toArray() leading to a crash
When passed no arguments, toArray returns an Object[] and not T[],
hence the unchecked cast will throw ClassCastException when this is run.
This change cleans up the parcelable implementation by replacing
writeParcelableArray with writeTypedList, which is more efficient and
avoids the conversion to/from an array entirely.
Bug: 200347466
Test: Take screenshot, tap share, long press an app, short press power
Change-Id: I225664c8709502c7e45ac06c2858c0c5ac0b7506
2022-06-03 19:50:38 +00:00
Mike Schneider
2f8402e66f
Merge "Add enum entries for HADE_DIALOG_OPEN and USER_DIALOG_OPEN interactions" into tm-qpr-dev am: 2b75a2405b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18581264
Change-Id: Icfb9fc05c90bbf18a61b8d8273d7230b9d1504f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-03 11:52:34 +00:00
Mike Schneider
2b75a2405b
Merge "Add enum entries for HADE_DIALOG_OPEN and USER_DIALOG_OPEN interactions" into tm-qpr-dev
2022-06-03 11:37:59 +00:00
Iris Yang
e85ccf2c79
Merge "Wire display context for text toasts" into tm-dev am: ca6ef9125d am: 7bb2e73638 am: 8f9b4c1001
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18660549
Change-Id: Ib237dd9f06940990adaf57fa4504502eee84beaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-03 04:26:42 +00:00
Iris Yang
8f9b4c1001
Merge "Wire display context for text toasts" into tm-dev am: ca6ef9125d am: 7bb2e73638
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18660549
Change-Id: I42afc6f189017626af58bd2cd58d197ec68f9a3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-03 03:40:28 +00:00
Iris Yang
3dfec49ea8
Merge "Wire display context for text toasts" into tm-dev am: ca6ef9125d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18660549
Change-Id: I50ed33505cfa726cab10348ee352bfce702db08b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-03 03:16:29 +00:00
Iris Yang
ca6ef9125d
Merge "Wire display context for text toasts" into tm-dev
2022-06-03 02:58:01 +00:00
Mike Schneider
dca1ed7037
Add enum entries for HADE_DIALOG_OPEN and USER_DIALOG_OPEN interactions
...
Bug: 232908404
Test: build pass
Change-Id: I5b4aa1edb32604efa2ca12a121386af9793ffb30
2022-06-02 14:41:50 +02:00
TreeHugger Robot
3944cf3aaf
Merge "Update fgs manager message and remove dot" into tm-dev am: bba9932a6b am: 6b086c70fc am: 56115274cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18705774
Change-Id: Ic907620c5d8f27afa15c538cb78dd1c7321c6629
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 05:34:45 +00:00
TreeHugger Robot
56115274cc
Merge "Update fgs manager message and remove dot" into tm-dev am: bba9932a6b am: 6b086c70fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18705774
Change-Id: Iddb682378a3cbcf65406ec1fde153d6148accd38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 05:34:14 +00:00
TreeHugger Robot
bf40a305ae
Merge "Update fgs manager message and remove dot" into tm-dev am: bba9932a6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18705774
Change-Id: I6dd4241fad27835c6f93b3b3598efa2318ad6c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 05:22:51 +00:00
TreeHugger Robot
bba9932a6b
Merge "Update fgs manager message and remove dot" into tm-dev
2022-06-02 05:18:03 +00:00
Evan Severson
280ea9072d
Update fgs manager message and remove dot
...
Test: Build and start a foreground service
Fixes: 234476539
Change-Id: Ib85f68e5517498c3e6441d246cc9b3feb1c5de1d
2022-06-01 17:45:21 -07:00
Matt Casey
ce5b44f6fd
Merge "Fix ResolverDrawerLayout child measurement" into tm-dev am: a834a9bd52 am: 913908c1ad am: c7b8ee2a96
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18625112
Change-Id: If847db9de8d4fa9fd2a676a23df327160e1c86ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 20:08:36 +00:00
Automerger Merge Worker
4fdd4ef2ef
Merge "Merge "Fix ResolverDrawerLayout child measurement" into tm-dev am: a834a9bd52" into tm-d1-dev am: 487cabc548
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18625112
Change-Id: If7a58bbbef7ea481e6385f3140b0adb6b37686dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 20:07:54 +00:00
Matt Casey
913908c1ad
Merge "Fix ResolverDrawerLayout child measurement" into tm-dev am: a834a9bd52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18625112
Change-Id: I52d01f5563887e911617744bd523fed3c84b7398
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 19:42:25 +00:00
Matt Casey
a834a9bd52
Merge "Fix ResolverDrawerLayout child measurement" into tm-dev
2022-06-01 19:03:44 +00:00
Vadim Caen
7158407cba
Merge "Transfer the actual dispatcher when the window is preserved" into tm-dev am: a147b66f61 am: 5d5f6b1cc1 am: 8406eaa17c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18601925
Change-Id: I1c5646df19c707bc393d27c2725b35198f225709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 16:08:05 +00:00
Vadim Caen
8406eaa17c
Merge "Transfer the actual dispatcher when the window is preserved" into tm-dev am: a147b66f61 am: 5d5f6b1cc1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18601925
Change-Id: I79fd95197414b8cbd8ddc87c45a18866d64f4c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 15:46:26 +00:00
Vadim Caen
e199288f63
Merge "Transfer the actual dispatcher when the window is preserved" into tm-dev am: a147b66f61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18601925
Change-Id: I34b3da192b4cf72d170e0058b8265ec4260cb235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 15:15:46 +00:00
Vadim Caen
a147b66f61
Merge "Transfer the actual dispatcher when the window is preserved" into tm-dev
2022-06-01 14:35:57 +00:00
Iris Yang
c0055b9b7b
Wire display context for text toasts
...
Toast doesn't work correctly for multi-display. When default display's
screen off, the toast wouldn't be able to show on secondary display.
Without this change, default display screen state will cause text toasts
doesn't correctly show up.
Bug: 233717651
Test: atest ToastUITest
Change-Id: I1705bc71062fa28c378bf7cc02d104c0f53ce865
2022-06-01 11:28:15 +08:00
Matt Casey
92e77bbfca
Merge "Fix Chooser enter transition animation" into tm-dev am: 8d5bcaa534 am: 368670caf1 am: 9c949ef5a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18609372
Change-Id: Icf3b71d747bd6cc663388c3869d8b7e6120832cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 02:22:27 +00:00
Ahaan Ugale
67815e4fd8
Fix unbind crash in AbstractRemoteService.
...
Crashes if there's an attempt to unbind when the service isn't already
bound. It's unclear which service is triggering this code path though.
Fix: 230543089
Change-Id: Ia108c709ed3c82ca18e581b464c963d52e108a3e
2022-06-01 02:07:17 +00:00
Matt Casey
9c949ef5a0
Merge "Fix Chooser enter transition animation" into tm-dev am: 8d5bcaa534 am: 368670caf1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18609372
Change-Id: I77da87cc40f8fbea9d6da3ec2f47f79efc9f81f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 01:51:01 +00:00
Matt Casey
d68f10b2f7
Merge "Fix Chooser enter transition animation" into tm-dev am: 8d5bcaa534
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18609372
Change-Id: I6ff40552079bc8b47f1f047982b897b1b5c46345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-01 01:25:29 +00:00
Matt Casey
8d5bcaa534
Merge "Fix Chooser enter transition animation" into tm-dev
2022-06-01 01:13:49 +00:00
Robert Horvath
0a3fef0a32
Merge changes from topic "privacy-type-media-projection" into tm-dev am: d59d17d74a am: b8dbb51759 am: af3680c6a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18375274
Change-Id: I3443266ade486f1990d06ee0c6b6f475061a19dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 18:35:33 +00:00
Robert Horvath
2e83cb0c22
Merge changes from topic "privacy-type-media-projection" into tm-dev am: d59d17d74a am: e9bb088522
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18375274
Change-Id: I90d14241931de639e57f74705f92b2c4e90a95de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 18:28:41 +00:00
Robert Horvath
b8dbb51759
Merge changes from topic "privacy-type-media-projection" into tm-dev am: d59d17d74a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18375274
Change-Id: I03c6e7abd4245653accc4a2fa1a472861dd4f0f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 18:07:18 +00:00
Robert Horvath
d59d17d74a
Merge changes from topic "privacy-type-media-projection" into tm-dev
...
* changes:
Add MediaProjection privacy item type
Extract privacy item monitoring interface, add AppOpsPrivacyItemMonitor
2022-05-30 17:43:32 +00:00
James O'Leary
5d3892f4f2
Merge changes from topic "themesMay2322" into tm-dev am: f5fff77bf8 am: ee60a27cf7 am: edffcc4d43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18581098
Change-Id: I3ae39e9e2cdbe6f9a2f276b7ac2b7b7c55c43719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 17:39:32 +00:00
James O'Leary
edffcc4d43
Merge changes from topic "themesMay2322" into tm-dev am: f5fff77bf8 am: ee60a27cf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18581098
Change-Id: I977b8d363a7e50abd443e037149cbb8652aa5002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 17:11:08 +00:00
James O'Leary
4177945503
Match Android's colors to design intent am: c3cffc8bb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18581096
Change-Id: I0c82674b34177843e47e21582c68697422c6f949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 16:50:09 +00:00
James O'Leary
f5fff77bf8
Merge changes from topic "themesMay2322" into tm-dev
...
* changes:
Update ColorScheme.toString() formatting
Match latest variant spec; update hue rotation logic
Match Android's colors to design intent
2022-05-27 16:40:18 +00:00
Andrey Epin
6123cddc75
Fix Chooser enter transition animation
...
Fix a concurrency issue when we might start activity enter transition
animation from an unprepared layout which caused ocassional visual
artifacts.
Fix: 232963730
Test: Manual testing by launching Chooser with varius intents.
Change-Id: I3962250b53ea8d96b124d1daf964e447600a5e3a
2022-05-27 09:21:39 -07:00
Matt Casey
bf850dea73
Merge "Minimize distance between text and pin in direct share row" into tm-dev am: 59ebb04c78 am: c3e50ddbdf am: ae5f8c09df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18521525
Change-Id: I3226370ac395b356152d867bac3f44893305c104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 03:11:01 +00:00
Matt Casey
ae5f8c09df
Merge "Minimize distance between text and pin in direct share row" into tm-dev am: 59ebb04c78 am: c3e50ddbdf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18521525
Change-Id: I281c2cab88a684ff9067f458d74edb6432a99537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 02:55:45 +00:00