Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
888,242 Commits 3 Branches 0 Tags
0ea777dc2e9fed613d5b46fcd405371825cd74f3
Commit Graph

888242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Kantek
0ea777dc2e Merge "Improve error message in WMS#isInTouchMode" into udc-dev am: a69c3fe77a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22913696

Change-Id: Id47e60bac1ad273307d9038585f29ab91f218a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 23:50:58 +00:00
Antonio Kantek
a69c3fe77a Merge "Improve error message in WMS#isInTouchMode" into udc-dev 2023-05-02 23:35:05 +00:00
Winson Chung
fc63282f70 Merge "Revert to using nano protos for shell side tracing" into udc-dev am: 9c5f02450a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22938207

Change-Id: I1a66997902920e7a015389776daa9822959cff0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 23:33:18 +00:00
Alec Mouri
904530e9d9 Merge "Make TextureView's HDR definitions the same as ColorSpace's" into udc-dev am: 024968cb52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22899325

Change-Id: I7b545dce7b0c931b069f6e348e20e85700ddb0ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 23:31:51 +00:00
Winson Chung
9c5f02450a Merge "Revert to using nano protos for shell side tracing" into udc-dev 2023-05-02 23:25:21 +00:00
Alec Mouri
024968cb52 Merge "Make TextureView's HDR definitions the same as ColorSpace's" into udc-dev 2023-05-02 23:22:37 +00:00
Helen Qin
7c00cfa992 Merge "Update strings based on new product decisions" into udc-dev am: 51a83871f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22976516

Change-Id: I27cb13cedc9ab1df00539f3e4422aa686e6daf07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 23:09:39 +00:00
Treehugger Robot
3ee4bf8eef Merge "Add 144Hz display available FPS" into udc-dev am: 7f6635d193 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22975741

Change-Id: If1931b59a16abfa9b6a8c0670d908deea3fd5ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 23:09:08 +00:00
TreeHugger Robot
87f4a950de Merge "Fix possible num format exception when logging bubble stack position" into udc-dev am: 4c897660f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22973207

Change-Id: Ida124da89a3fc7ce8a544785975365d2b4db3a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 23:08:16 +00:00
Helen Qin
51a83871f9 Merge "Update strings based on new product decisions" into udc-dev 2023-05-02 23:07:13 +00:00
Treehugger Robot
7f6635d193 Merge "Add 144Hz display available FPS" into udc-dev 2023-05-02 23:06:10 +00:00
TreeHugger Robot
4c897660f8 Merge "Fix possible num format exception when logging bubble stack position" into udc-dev 2023-05-02 22:51:27 +00:00
Vaibhav Devmurari
428368784b Merge "Fix: Cache key should include Layout type" into udc-dev am: 9ae95fb783 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22960760

Change-Id: I08a783cef0288c86443cb25637b37aa7d273ad5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 22:47:23 +00:00
Vaibhav Devmurari
9ae95fb783 Merge "Fix: Cache key should include Layout type" into udc-dev 2023-05-02 22:34:01 +00:00
Sarah Kim
ab96b07cfa Merge "SlicePurchaseActivity don't send canceled on manual finish" into udc-dev am: 5f3efd4039 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22580893

Change-Id: Ibc45a52ae582c3f523a7b607a67618a47acc040a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 22:07:39 +00:00
Sarah Kim
5f3efd4039 Merge "SlicePurchaseActivity don't send canceled on manual finish" into udc-dev 2023-05-02 21:57:54 +00:00
Mady Mellor
182ed04f7e Merge "Protect against NPE when updating state" into udc-dev am: ec5540c745 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22972200

Change-Id: Ibb086ab500ecd777ea2ffe54ba87b04e30617c12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 21:46:47 +00:00
Mady Mellor
ec5540c745 Merge "Protect against NPE when updating state" into udc-dev 2023-05-02 21:28:46 +00:00
Evan Chen
fa77f60e37 Merge "Do not annouce Collapse/Expand if there are less or equal to 2 permissions in the list" into udc-dev am: 0bd4117a76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22973017

Change-Id: Iee553bca174cf52ce88cf57444c7009ddf69f967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 21:24:54 +00:00
Evan Chen
0bd4117a76 Merge "Do not annouce Collapse/Expand if there are less or equal to 2 permissions in the list" into udc-dev 2023-05-02 21:16:03 +00:00
Maryam Dehaini
73c5e080de Merge "Fix add and remove times for visual indicator" into udc-dev am: ed2c114460 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22499848

Change-Id: Iae8ec43b088e747a606d006f9c7878de69f1fec2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 21:05:31 +00:00
Treehugger Robot
d847e507fe Merge "Add timeouts to animations in UserSwitchingDialog." into udc-dev am: d3446e4eb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22967258

Change-Id: Iab492af11b41ef8867b1e0f3d04da3fa9331e479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 21:05:12 +00:00
Maryam Dehaini
ed2c114460 Merge "Fix add and remove times for visual indicator" into udc-dev 2023-05-02 21:03:49 +00:00
Brian Isganitis
7d55b46323 Merge "Remove light theme support for split screen surface." into udc-dev am: 9779b22cd9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22955244

Change-Id: If612a2e3e78a287b2b69981334cbed679d90235b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 21:03:39 +00:00
Helen Qin
f5a594e617 Update strings based on new product decisions 
1. New use case "Use your saved password for <app>"?
2. "Save another way" to replace "More options"

Bug: 280483679
Bug: 280472145
Test: manual test & local build
Change-Id: I95a570fa5c5f740c1ecca5c2fc7de9ff55bb2227
 2023-05-02 20:50:38 +00:00
Sarah Chin
1e26c2445b SlicePurchaseActivity don't send canceled on manual finish 
onDestroy is called when the user closes the app or when finish() is
called programatically. We call finish after sending a response from the
slice purchase activity, but we shouldn't send the canceled response
because the user didn't close the application. Add a check to see
whether onDestroy was called programatically or due to user action.

Test: manual, CTS
Bug: 276703840
Change-Id: Iae1f5e77a1b6d75b911f4bd5314869b36157afda
 2023-05-02 13:29:55 -07:00
Treehugger Robot
d3446e4eb8 Merge "Add timeouts to animations in UserSwitchingDialog." into udc-dev 2023-05-02 20:10:39 +00:00
Brian Isganitis
9779b22cd9 Merge "Remove light theme support for split screen surface." into udc-dev 2023-05-02 20:06:53 +00:00
Evan Chen
0ad17875b7 Do not annouce Collapse/Expand if there are less or equal to 2 permissions in the list 
Test: CTS
Fix: 278638141
Change-Id: Ia22ccb8972ddd980fbd15bc4aaa4709d611a94b2
 2023-05-02 19:46:13 +00:00
Andy Yu
0794867be6 Add 144Hz display available FPS 
Include 144Hz and its divisor frame rates to game mode list

Bug: 279728073
Test: atest GameManagerServiceTests
Test: atest FrameRateOverrideHostTest
Change-Id: I8e05292fc5c59252fe991df95412e3b74f366715
 2023-05-02 12:34:51 -07:00
Sherry Zhou
c64348e00d Merge "Fix clock translation on lockscreen" into udc-dev am: cf3cbe8a0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22939135

Change-Id: Ifa89f588bc5434c34a3f31a7dd659cb0704991cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 19:33:56 +00:00
Christine Franks
9840a0318f Merge "Change id type to string and extract control enum" into udc-dev am: ea854aec00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22959086

Change-Id: I689fd11ed99b3b96f0da92199c575484cc56f31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 19:33:25 +00:00
Ajinkya Chalke
f9a7925798 Merge "Ignore configComponentName_shouldResolve as it is failing for cf_gwear_x86-userdebug." into udc-dev am: 1892bddf99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22930479

Change-Id: Ia017235477e48f5c7ee8f074ab9dc673642b4be4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 19:32:44 +00:00
Michael Wright
62ddc3e740 Merge "Don't crash system_server due to bad event time stamps." into udc-dev am: 3588c993d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22761826

Change-Id: I93ade13593fe6c65e4e9f9df66203a516afc70ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 19:32:04 +00:00
John Reck
3259050cec Merge "Have GrContext hold a strong ref to VulkanManager" into udc-dev am: 2a3fda26ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22958359

Change-Id: Ib056ecc24e18d8e18281600bbc90f7f8f3e79440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 19:31:28 +00:00
Sherry Zhou
cf3cbe8a0b Merge "Fix clock translation on lockscreen" into udc-dev 2023-05-02 19:09:02 +00:00
Christine Franks
ea854aec00 Merge "Change id type to string and extract control enum" into udc-dev 2023-05-02 19:06:32 +00:00
Ajinkya Chalke
1892bddf99 Merge "Ignore configComponentName_shouldResolve as it is failing for cf_gwear_x86-userdebug." into udc-dev 2023-05-02 19:06:22 +00:00
Mady Mellor
c0ce2e312a Fix possible num format exception when logging bubble stack position 
Test: treehugger
Bug: 280455228
Change-Id: I6a647e10ab86a90c9b052e543a691642df0a3637
 2023-05-02 11:46:24 -07:00
Maryam Dehaini
cc1f82538c Fix add and remove times for visual indicator 
This task fixes two visual indicator bugs:
1. Currently, the visual indicator is added as soon as the task is dragged below the status bar. This change will make the DesktopTasksController wait for the task to be dragged below the status bar to draw the visual indicator.
2. Wait for the animation to grow or shrink a window during fullscreen and freeform transitions before removing so that the visual indicator does not disappear too early.

Bug: 276979555
Test: Manual Testing
Change-Id: Ib1c9a477feaa327f7a2430dd995b12b0bad255b4
 2023-05-02 11:41:57 -07:00
Michael Wright
3588c993d8 Merge "Don't crash system_server due to bad event time stamps." into udc-dev 2023-05-02 18:37:39 +00:00
John Reck
2a3fda26ee Merge "Have GrContext hold a strong ref to VulkanManager" into udc-dev 2023-05-02 18:37:28 +00:00
Raphael Kim
b83632d391 Merge "Add USE_ATTESTATION_VERIFICATION_SERVICE permission to shell for GTS test" into udc-dev am: 30d70c98fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22759014

Change-Id: If7fb2a10a9b6336926f9ede5585f645f6daa6034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 17:50:35 +00:00
Vaibhav Devmurari
03ddad768b Fix: Cache key should include Layout type 
Test: atest VirtualKeyboardLayoutTest
Bug: 280418656
Change-Id: I3b495e24c5bafbb70e3352811b77540efc91592b
 2023-05-02 17:48:08 +00:00
Raphael Kim
30d70c98fb Merge "Add USE_ATTESTATION_VERIFICATION_SERVICE permission to shell for GTS test" into udc-dev 2023-05-02 17:39:33 +00:00
Rubin Xu
252ef2f94c Merge "Always clear password reset token when removing device owner" into udc-dev am: 65108620c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22938376

Change-Id: I9d3c3b2e3e6a39425bcc9f8fc091f9cd1f9600cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 17:36:59 +00:00
Anna Bauza
d1789ce4cb Merge "fix: Refactor User Lifecycle Event and Report metrics logging" into udc-dev am: 03238a8af4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21469411

Change-Id: Id63fd1ef89527b306fa964906270dda1f05f8369
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 17:35:59 +00:00
Austin Borger
0ef35d0020 Merge "UidObserver / Camera: Track the OOM adj of a uid via UidObserver." into udc-dev am: 34ee2b8e60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22366514

Change-Id: Idcf03ed8ecd685bf2f1f9343fa415806e5dfbf17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 17:31:50 +00:00
Winson Chung
d9a2c7f2b8 Revert to using nano protos for shell side tracing 
- Unblock sysui-studio by using nano protos directly

Bug: 278691227
Test: adb shell dumpsys activity service SystemUIService WMShell transitions tracing start
Test: adb shell dumpsys activity service SystemUIService WMShell transitions tracing stop
Test: adb pull /data/misc/wmtrace/shell_transition_trace.winscope
Change-Id: If0cb2b339edbed191497b139302d76f910d2362e
 2023-05-02 17:31:14 +00:00
Rubin Xu
65108620c4 Merge "Always clear password reset token when removing device owner" into udc-dev 2023-05-02 17:25:18 +00:00