Jiewen Lei
61d5e9fba7
Merge "Fix sessionCommitEvent's commit_reason logging." into udc-dev am: 939888da9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23220444
Change-Id: I42f8f0d2509b93945c37ddf3abd711cc6fee6047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 06:05:59 +00:00
Kenneth Ford
84512ef4bb
Merge "Fixes IllegalStateException through getSupportedStates" into udc-dev am: 2e089374d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23183923
Change-Id: I58f8487414407645c2cd0c472e6e2ca3bbbfff03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 06:04:15 +00:00
Jiewen Lei
939888da9a
Merge "Fix sessionCommitEvent's commit_reason logging." into udc-dev
2023-05-13 05:57:20 +00:00
Kenneth Ford
2e089374d7
Merge "Fixes IllegalStateException through getSupportedStates" into udc-dev
2023-05-13 05:30:33 +00:00
David Liu
46e54925ac
Merge "Update text color on MainSwitch" into udc-dev am: c6b780a5c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23175931
Change-Id: Ic797b7c882e0c498577e50c0f729eb1b63cfcf50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 04:40:13 +00:00
David Liu
c6b780a5c0
Merge "Update text color on MainSwitch" into udc-dev
2023-05-13 04:27:03 +00:00
Chandru S
4b6ba436bc
Merge "Add a hack that ensures face auth failed message is not shown after face lockout" into udc-dev am: 963c07498c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23198657
Change-Id: I1898e06d83de0502cbc75d16ffc6d91351cccf72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 04:22:25 +00:00
Christine Franks
8104694f79
Merge changes I02fb643b,If62d66bc into udc-dev am: b9de8fb70d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23177051
Change-Id: I0c9ee62c4d3bc183ccaba91d6dce54be36dc7b46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 04:22:02 +00:00
Jeff Chang
88be75e105
Merge "Update the split layout while density changed" into udc-dev am: c3662a31de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22120409
Change-Id: I3cfeaee818e7bb52487f75ea5bd6023ea38595fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 04:20:46 +00:00
Treehugger Robot
06a0f1e4a6
Merge "Apply transaction before calling onFinish" into udc-dev am: 766485bece
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22613584
Change-Id: I25326d54363f61b20b708e9d05f05d754d0d48e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 04:19:39 +00:00
Chandru S
963c07498c
Merge "Add a hack that ensures face auth failed message is not shown after face lockout" into udc-dev
2023-05-13 04:04:27 +00:00
Christine Franks
b9de8fb70d
Merge changes I02fb643b,If62d66bc into udc-dev
...
* changes:
Sync facilitators on transport ready
Small context sync telecom bugfixes
2023-05-13 03:49:42 +00:00
jiewenlei
84ec522ab1
Fix sessionCommitEvent's commit_reason logging.
...
Test: m
Bug: 278920289
Change-Id: I452d9f00d92f5833c8638cb9848b108a3fdc22da
2023-05-13 03:45:31 +00:00
Jeff Chang
c3662a31de
Merge "Update the split layout while density changed" into udc-dev
2023-05-13 03:32:35 +00:00
Treehugger Robot
766485bece
Merge "Apply transaction before calling onFinish" into udc-dev
2023-05-13 03:30:44 +00:00
Jiewen Lei
ba75ebc425
Merge "Fix user interaction logging for both fill dialog and save ui." into udc-dev am: cf918bef89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23221336
Change-Id: I5216eef413a04a25991e5af5b608ed6773601f0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 03:17:06 +00:00
Jiewen Lei
cf918bef89
Merge "Fix user interaction logging for both fill dialog and save ui." into udc-dev
2023-05-13 03:02:00 +00:00
Shaowei Shen
54e016669c
Merge "[Output Switcher] Remove sysui flag for Output Switcher in U" into udc-dev am: 6ba91bb562
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23107802
Change-Id: I87847d8a0a3cfa8ad85cbddb60bf708a59c45485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 02:55:05 +00:00
Matt Casey
b91e2b0f23
Merge "Remove old ChooserActivity from manifest" into udc-dev am: 39b0b95d3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23213280
Change-Id: I17b2fce7673ab14c5c036534bc8c04b20f5e3a16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 02:54:08 +00:00
Shaowei Shen
6ba91bb562
Merge "[Output Switcher] Remove sysui flag for Output Switcher in U" into udc-dev
2023-05-13 02:38:08 +00:00
Matt Casey
39b0b95d3d
Merge "Remove old ChooserActivity from manifest" into udc-dev
2023-05-13 02:36:21 +00:00
Christina Tao
0aabfbded0
Merge "[TTC] Override touch feedback haptic settings" into udc-dev am: 4fac2a56a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23118760
Change-Id: Iaa6221f3a245aca09a36516b3914d486d019bccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 02:33:07 +00:00
Simranjit Kohli
f6308988cb
Merge "[Autofill PCC]: Add pick reason to datasets." into udc-dev am: b749e98b2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23168098
Change-Id: I8bd9bf927876e12e1e620544ca1d2a7d22cb9420
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 02:31:59 +00:00
Kenneth Ford
c43ded6329
Fixes IllegalStateException through getSupportedStates
...
Fixes an IllegalStateException by returning a DeviceStateInfo
even if there is no base state or committed state present.
Previous changes made this safer through gating callback
responses with base and committed state checks. This exception
would occur previously by requesting the DeviceStateInfo
before a state has been committed on the device.
Bug: 260876135
Test: DeviceStateManagerServiceTest#getDeviceStateInfo_baseStateAndCommittedStateNotSet
Change-Id: I3ef620d523d590b0b482f331af984998f60e3766
2023-05-13 02:16:03 +00:00
Christina Tao
4fac2a56a3
Merge "[TTC] Override touch feedback haptic settings" into udc-dev
2023-05-13 01:48:09 +00:00
Simranjit Kohli
b749e98b2b
Merge "[Autofill PCC]: Add pick reason to datasets." into udc-dev
2023-05-13 01:44:34 +00:00
Ming-Shin Lu
5de2174438
Merge "Fix a NPE in InputMonitor#updateInputFocusRequest" into udc-dev am: 6979ba4278
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23160490
Change-Id: Ib116649197c5e1fc19ce4a96ac58ac87d07b8660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 00:47:33 +00:00
Matt Sziklay
0070c2f172
Merge "Sync resize veil hide to app draw." into udc-dev am: 2202444446
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23089457
Change-Id: I9ed1a53c2360d48f49072a5a7f4208408ef0441e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 00:46:58 +00:00
Ming-Shin Lu
6979ba4278
Merge "Fix a NPE in InputMonitor#updateInputFocusRequest" into udc-dev
2023-05-13 00:39:13 +00:00
Matt Sziklay
2202444446
Merge "Sync resize veil hide to app draw." into udc-dev
2023-05-13 00:39:03 +00:00
Jeremy Sim
2f780b082a
Merge "Allows splitscreen with work & personal version of the same app" into udc-dev am: 11e4f30b36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23183679
Change-Id: I47dec6296725eb446e302a764cf62ce4b903e2f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 00:32:18 +00:00
Automerger Merge Worker
bd4e3b2fb4
Merge "Merge "Do not allow focus on invisible buttons" into udc-dev am: 123057466d" into udc-d1-dev
2023-05-13 00:31:44 +00:00
Beth Thibodeau
e019721e80
Merge "Do not allow focus on invisible buttons" into udc-dev am: 123057466d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23215701
Change-Id: Id46dc1dfc254a2049f9c25d9280c139213fbf49c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 00:30:36 +00:00
Automerger Merge Worker
681c751a0a
Merge "Merge "Do not allow focus on invisible buttons" into udc-dev am: 123057466d" into udc-d1-dev
2023-05-13 00:29:20 +00:00
Beth Thibodeau
cfa3db2d7d
Merge "Do not allow focus on invisible buttons" into udc-dev am: 123057466d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23215701
Change-Id: I194c9e35d24968afa59b0824ef0b7ebe2cdd7cbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 00:28:09 +00:00
Mateusz Cicheński
c04b7a53f1
Merge "Fix Maps PiP entrance to not bounce down and up" into udc-dev am: 0a3b65233d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23183762
Change-Id: I4e974c4279767c1f6ae95fc5a782fe6e69166d13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 00:26:01 +00:00
Jeremy Sim
11e4f30b36
Merge "Allows splitscreen with work & personal version of the same app" into udc-dev
2023-05-13 00:23:21 +00:00
Beth Thibodeau
123057466d
Merge "Do not allow focus on invisible buttons" into udc-dev
2023-05-13 00:14:02 +00:00
Mateusz Cicheński
0a3b65233d
Merge "Fix Maps PiP entrance to not bounce down and up" into udc-dev
2023-05-13 00:11:08 +00:00
Beth Thibodeau
2e27842bd3
Merge "Allow apps with BLUETOOTH permission to control system routing" into udc-dev am: 0871ce45cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23135277
Change-Id: I00c7098c96f6fb33077727eb0c52750cecb07877
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 00:06:28 +00:00
Mady Mellor
8a31e5b96c
Merge "Fix misplaced surface from fold -> unfold while bubbles are expanded" into udc-dev am: f9be53278f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23217640
Change-Id: I846aec3aa4e9743c3fedc53d531b7134c6d1fc6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 23:42:53 +00:00
jiewenlei
38faddb58d
Fix user interaction logging for both fill dialog and save ui.
...
Test: m
Bug: 278920289
Change-Id: I6fd7370d65413ca2be40847ba0d302142d4d2f8b
2023-05-12 16:36:51 -07:00
Beth Thibodeau
0871ce45cf
Merge "Allow apps with BLUETOOTH permission to control system routing" into udc-dev
2023-05-12 23:36:06 +00:00
Chandru S
72808e6439
Add a hack that ensures face auth failed message is not shown after face lockout
...
Bug: 270090188
Test: atest KeyguardUpdateMonitorTest
Test: manually,
1. enroll a friend's face for auth
2. Lock the phone
3. Try face auth 3 times
4. on the first lockout, we should see too many attempts
5. after that, we should see face unlock unavailable.
Change-Id: I1354f5f6159fb371313ecac3905c545e2af6a62d
2023-05-12 23:24:39 +00:00
Mady Mellor
f9be53278f
Merge "Fix misplaced surface from fold -> unfold while bubbles are expanded" into udc-dev
2023-05-12 23:13:59 +00:00
Evan Rosky
98821cf0f3
Merge "Fix graphical glitches on keyguard-unlock with PIP" into udc-dev am: c8196383a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23154372
Change-Id: Ie7e1dcc1ff2aa63969bc82fb1ebcb2a12d0c1f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 23:00:35 +00:00
Sumedh Sen
52ca1aac6f
Merge "Replacing overlapping flag value" into udc-dev am: e0a5db492f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23204701
Change-Id: Ibb549035ebde9804ec17a27cc0138d8a398f0584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:59:33 +00:00
Evan Rosky
c8196383a2
Merge "Fix graphical glitches on keyguard-unlock with PIP" into udc-dev
2023-05-12 22:53:32 +00:00
Sumedh Sen
e0a5db492f
Merge "Replacing overlapping flag value" into udc-dev
2023-05-12 22:51:02 +00:00
Treehugger Robot
e891421c12
Merge "Remove persistentPreferrredActivity policy on activity removal" into udc-dev am: 7cc9a4bbc1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23213920
Change-Id: I2cf1dc067f67639eee4f90fcde70167a264f14cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:43:14 +00:00