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
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
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
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
Matt Casey
cb002db9c3
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: I610bc7f21235f264e2b12508cd09de9b9620ffaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 02:55:44 +00:00
Matt Casey
2254cd9acb
Merge "Minimize distance between text and pin in direct share row" into tm-dev am: 59ebb04c78
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18521525
Change-Id: I4a3112147b4812494701378a4c17b542dc88f189
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 02:38:03 +00:00
Matt Casey
59ebb04c78
Merge "Minimize distance between text and pin in direct share row" into tm-dev
2022-05-27 02:13:03 +00:00
Andrey Epin
c91318ace9
Fix ResolverDrawerLayout child measurement
...
ResoverDrawerLayout didn't take into account its horizontal paddints
when measured its children.
Plus a trivial refactoring.
Fix: 223775954
Test: Manual test: open Chooser in landscape mode on a phone with
3-button navigation.
Change-Id: Ia4835a2ddb52bff4ba36597dea3a3d7bf83967aa
2022-05-26 16:05:00 -07:00
James O'Leary
c3cffc8bb6
Match Android's colors to design intent
...
May 2021 HCT code in Android ("CAM") gives results inconsistent with
HCT in design tooling. Using HCT solver ensures they match, allowing
design to verify their specs against the results in Android, derisking
the launch of theme variants.
HCT Solver is a standalone class that is easily integrated with Android
& Cam: when Cam.get(hue,chroma,tone) is called, it now calls
HctSolver.get(hue, chroma, tone).
HCT Solver was imported from google3, where it is tested against _all_
hex codes, both forward and reverse conversions. A number
of other tests cover all parts of the theming system, giving us high
confidence that there won't be a regression.
Test: atest ColorSchemeTest (unit test); atest SystemPaletteTest (CTS).
Spent ~4 hours trying a variety of wallpapers, and seed colors, and
used dumpsys to verify results match UX spec. Verify hex codes and HCT
values output by Android match those in design tooling via putting
hex codes into Monet Studio, and confirming the resulting HCT values
match the HCT values generated by Android.
Bug: 213314628
Change-Id: I95da1efacc2d61f19ce7f20efa3e7f70736258a9
2022-05-26 19:31:55 +00:00
Matt Casey
2078d3125f
Minimize distance between text and pin in direct share row
...
When the TextView takes up multiple lines, the layout acts as if the
full width is used, thus pushing the pin all the way to the left.
This change measures the text itself and computes an ideal width for the
TextView based upon the line measurements.
Test: Visual inspection: pin several targets: single line, first line
longer, second line longer, etc. Observe spacing.
Bug: 232445263
Change-Id: Id7601c58aae1e28c66c5311ba66b288443d73272
2022-05-26 17:32:21 +00:00
Vadim Caen
13048f123b
Transfer the actual dispatcher when the window is preserved
...
When recreating the Activity, if the window is preserved,
onAttachedToWindow won't be called and PhoneWindow.onViewRootImplSet
won't be called either, where we set the actual dispatcher to the
Activiy's proxy dispatcher.
So when the window is preserved, we directly assign the actual Dispatcher
from the preserved Window to the new PhoneWindow
Fixes: 228571903
Test: In progress
Test: Open an app with OnBackInvokedCallback enabled, split to top,
close the other application, do a back gesture
Change-Id: I050247501df8f6cf6cd0024a6233f88a035f6279
2022-05-25 19:46:37 +02:00
Calvin Pan
2ed75106b8
Merge "Fix using incorrect view in app language selection" into tm-dev am: fa264b81be am: ca00515971 am: 2d12af96a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18579445
Change-Id: Ie749945ef27b3a0d00b776c1259562e93f6f9a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 08:10:18 +00:00
Calvin Pan
17a7bb10bb
Merge "Fix using incorrect view in app language selection" into tm-dev am: fa264b81be am: 8a677d4a0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18579445
Change-Id: I24d2060057bfb208ba2c7d6981f540848ecc7cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 07:45:27 +00:00
Calvin Pan
ca00515971
Merge "Fix using incorrect view in app language selection" into tm-dev am: fa264b81be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18579445
Change-Id: I3f794e4add28c46c7e2f77ea39eb12db82f683a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 07:08:48 +00:00
Calvin Pan
fa264b81be
Merge "Fix using incorrect view in app language selection" into tm-dev
2022-05-25 06:51:35 +00:00
Calvin Pan
2ec2b19531
Merge "Fix app language show "Und" when all languages in the suggestion list" into tm-dev am: 8848ca6f3b am: 62d3c47058 am: 3a4d63e705
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18570256
Change-Id: I33a1a1949714be68bd7eee03f0cca8a268f1f40b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 03:54:28 +00:00
Matt Casey
aa31ee16fd
Merge "Align outer edge of profile tabs and icons" into tm-dev am: 4a191d7fad am: 198c72adcd am: 961e34c520
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18566767
Change-Id: I501fb33941de14470cd43a27738fa157299792a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 03:53:09 +00:00
Calvin Pan
3a4d63e705
Merge "Fix app language show "Und" when all languages in the suggestion list" into tm-dev am: 8848ca6f3b am: 62d3c47058
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18570256
Change-Id: Id7cdf33691e8328743b80624854d4a75aaebfd1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 03:18:35 +00:00
Matt Casey
961e34c520
Merge "Align outer edge of profile tabs and icons" into tm-dev am: 4a191d7fad am: 198c72adcd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18566767
Change-Id: I5627df947969c77e169d8dd257bfbe8ef0bf46a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 03:18:10 +00:00
Calvin Pan
5f8fa45e80
Fix using incorrect view in app language selection
...
Bug: 233175025
Test: By manual
Change-Id: Idd5b277cdfb737acf9262ff5efbeca93afaa100f
2022-05-25 03:15:19 +00:00