Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
929,105 Commits 3 Branches 0 Tags
1f7cb0ce08459aba3adaee36278c72c842f110bc
Commit Graph

929105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jordan Demeulenaere
1f7cb0ce08 Merge changes from topic "scene-transition-layout" into udc-qpr-dev am: 497b75bb1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24006844

Change-Id: I1b7ce38233856653b99e5a371d5f9f6aae0c3d24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 08:16:04 +00:00
Jordan Demeulenaere
fc59292e8c Fix child constraints in (Horizontal|Vertical)Grid am: 3d5bf056c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24006843

Change-Id: I3c28331fb3cdeefbe246b525e8755edab1fc885f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 08:15:41 +00:00
Jordan Demeulenaere
497b75bb1d Merge changes from topic "scene-transition-layout" into udc-qpr-dev 
* changes:
  Introduce SceneTransitionLayout (1/2)
  Fix child constraints in (Horizontal|Vertical)Grid
 2023-07-21 07:34:45 +00:00
Angela Wang
96ed97fb18 Merge "Initialize hearing aid info if the device matches hearing aid scan filters" into udc-qpr-dev am: ae83ae7713 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23749452

Change-Id: I5c41dbaa301a6b45f7ea472dedf04fafe69628cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 03:25:14 +00:00
Treehugger Robot
97d45ba73d [automerger skipped] Merge "Allow shell to control transition animations" into udc-d1-dev am: c1590ab67f am: e51ab075e3 -s ours 
am skip reason: Merged-In Iffe5625ae57c21874805ef98b67faac9f56f87f5 with SHA-1 a349203788 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24132906

Change-Id: I3856e62ec254abeb432b1cbd43293682db0cb67d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 03:22:53 +00:00
Treehugger Robot
3dc0855881 Merge "Allow shell to control transition animations" into udc-d1-dev am: c1590ab67f am: 0e1f71e56b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24132906

Change-Id: I32161f67463028f0e184cef7e1c9aa6dda306d66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 03:22:03 +00:00
Angela Wang
ae83ae7713 Merge "Initialize hearing aid info if the device matches hearing aid scan filters" into udc-qpr-dev 2023-07-21 02:38:08 +00:00
Treehugger Robot
e51ab075e3 Merge "Allow shell to control transition animations" into udc-d1-dev am: c1590ab67f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24132906

Change-Id: I309a372541781dbad2263350658cc0946adda4d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 02:37:43 +00:00
Treehugger Robot
0e1f71e56b Merge "Allow shell to control transition animations" into udc-d1-dev am: c1590ab67f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24132906

Change-Id: Ic662867fd5806e55c180255782e81043a4b45a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 02:36:10 +00:00
Achim Thesmann
aa205d597b Merge "Apply BAL hardening to system" into udc-qpr-dev am: 833f22163c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23816772

Change-Id: I3b56ce9f36394f286d0c8e6d844c138dff02ef28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 01:57:52 +00:00
Wei Sheng Shih
45db011242 Merge "Revert^2 Do not enter pip during transient launch" into udc-qpr-dev am: 05b23f1e52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24124445

Change-Id: I7ac06f553646da6f30509c63f69742e0b571afb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 01:54:22 +00:00
Treehugger Robot
c1590ab67f Merge "Allow shell to control transition animations" into udc-d1-dev 2023-07-21 01:51:38 +00:00
Achim Thesmann
833f22163c Merge "Apply BAL hardening to system" into udc-qpr-dev 2023-07-21 01:26:50 +00:00
Wei Sheng Shih
05b23f1e52 Merge "Revert^2 Do not enter pip during transient launch" into udc-qpr-dev 2023-07-21 01:23:18 +00:00
Matt Sziklay
e8a99bb82e Merge "Align caption touch area with width of caption." into udc-qpr-dev am: a3a8f22a29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24152822

Change-Id: Ib05fbb8f156a9c8a6c7a189cd14cad5734ee2292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 00:26:25 +00:00
William Leshner
f9751c030c Merge "Revert "Adding padding to display the full clock for Burmese language"" into udc-qpr-dev am: eaf5ec33ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24154810

Change-Id: I9c50f5690ba92666641199e1347b6054531a1e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-21 00:24:47 +00:00
Matt Sziklay
a3a8f22a29 Merge "Align caption touch area with width of caption." into udc-qpr-dev 2023-07-21 00:03:29 +00:00
William Leshner
eaf5ec33ca Merge "Revert "Adding padding to display the full clock for Burmese language"" into udc-qpr-dev 2023-07-20 23:54:55 +00:00
William Leshner
a6c6e18756 Revert "Adding padding to display the full clock for Burmese language" 
This reverts commit a7ef0aca52.

Reason for revert: Causes a crash in SystemUI when starting a dream on tangor.

Change-Id: Ifec36f5e3be035f2c61517ff2256fefbd3c233e7
 2023-07-20 23:29:45 +00:00
Treehugger Robot
0c4208d943 Merge "Notify the change in collection items by passing the old RemoteViews" into udc-qpr-dev am: 8e9efbfbf4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24119398

Change-Id: Ic60f7f541d7a30ff2e343d60d96f12d800e10d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 23:15:55 +00:00
Treehugger Robot
8e9efbfbf4 Merge "Notify the change in collection items by passing the old RemoteViews" into udc-qpr-dev 2023-07-20 22:50:31 +00:00
mattsziklay
73314f871f Align caption touch area with width of caption. 
Matches the width of caption's touch area to the width of caption
itself.

Bug: 292091407
Test: Manual, attempt interacting with caption slightly to the left or
right of it.

Change-Id: I4ab4d5237c81b071ea4c8f0fbd613ff010625411
 2023-07-20 14:58:22 -07:00
Ewout van Bekkum
2e10d9468f Merge "Revert "Revert "FingerprintSensorProperties refactor - ui layer""" into udc-qpr-dev am: cbbde14c21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24149342

Change-Id: I6d6cf677b493f89ce9c200b86642c02d020a2a8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 21:54:27 +00:00
Treehugger Robot
9443a9f0c6 Merge "Add logs to debug flakiness of the test" into udc-qpr-dev am: 83cb8256c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24135250

Change-Id: I495145015207bd82e156b373180bc3bd90075a74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 21:52:16 +00:00
Ewout van Bekkum
cbbde14c21 Merge "Revert "Revert "FingerprintSensorProperties refactor - ui layer""" into udc-qpr-dev 2023-07-20 21:23:03 +00:00
Sihua Ma
0936127763 Notify the change in collection items by passing the old RemoteViews 
Also tuning the meta parameter a bit to mitigate the parcel exception

Bug: 245950570
Test: Manual
Change-Id: I1c34e8cf1b30f8a24dddafeed0eec50415457d0b
 2023-07-20 21:21:10 +00:00
Ewout van Bekkum
e4631eb16c Revert "Revert "FingerprintSensorProperties refactor - ui layer"" 
This reverts commit 3e0236df97.

Reason for revert: DroidMonitor: Potential culprit for b/292126117 verifying through ABTD before revert submission

Bug: 292126117
Change-Id: Ia6478ea713ebb186735e806a989a062c50383923
 2023-07-20 21:21:01 +00:00
Treehugger Robot
83cb8256c7 Merge "Add logs to debug flakiness of the test" into udc-qpr-dev 2023-07-20 21:15:03 +00:00
Julia Reynolds
54a41f9fb1 [automerger skipped] Allow additional reason/surface combinations for cancel am: 4c39ad7c8f am: 3568caef1b -s ours am: 86e984c284 -s ours 
am skip reason: Merged-In I054969dc82da5277002049d063abdb044dcc811e with SHA-1 80ce161ff1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24147764

Change-Id: Id7e7c72212adf2d2d95fae8f86384e3b389d75cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 21:03:36 +00:00
Julia Reynolds
46d348151c [automerger skipped] Allow additional reason/surface combinations for cancel am: 4c39ad7c8f am: 3568caef1b -s ours am: 59c41e47a0 -s ours 
am skip reason: Merged-In I054969dc82da5277002049d063abdb044dcc811e with SHA-1 4c39ad7c8f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24147764

Change-Id: I754f6074b210f51428471d4a8b16aeef88dbfcf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 21:02:54 +00:00
Julia Reynolds
86e984c284 [automerger skipped] Allow additional reason/surface combinations for cancel am: 4c39ad7c8f am: 3568caef1b -s ours 
am skip reason: Merged-In I054969dc82da5277002049d063abdb044dcc811e with SHA-1 80ce161ff1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24147764

Change-Id: Id5113f147f42604047aa4d45ac077ddb0d1812cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 20:43:38 +00:00
Julia Reynolds
59c41e47a0 [automerger skipped] Allow additional reason/surface combinations for cancel am: 4c39ad7c8f am: 3568caef1b -s ours 
am skip reason: Merged-In I054969dc82da5277002049d063abdb044dcc811e with SHA-1 4c39ad7c8f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24147764

Change-Id: Ie2faa329eac66d3f473974f6d9cf5d43b2b2abef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 20:42:37 +00:00
Julia Reynolds
e32e644121 [automerger skipped] Allow additional reason/surface combinations for cancel am: 4c39ad7c8f am: c57749a767 am: 75a9657762 -s ours 
am skip reason: Merged-In I054969dc82da5277002049d063abdb044dcc811e with SHA-1 80ce161ff1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24147764

Change-Id: Iaaa7d0612e7a7d8f674e73e50382bc7a5db2bb47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 20:40:44 +00:00
Treehugger Robot
714a5287ed [automerger skipped] Merge "Use -Xjvm-default=all instead of -Xjvm-default=enable or @JvmDefault" into main am: 2e93187332 am: e4de34bd6c -s ours am: 3bfc21bea8 -s ours am: 9aad669f63 -s ours 
am skip reason: Merged-In I473e578b92482fbd6c8812c4d32acc1a4c27a84a with SHA-1 25a05fe4e3 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2662657

Change-Id: I9f3e422a6bc3e690ca93225ecd997d701ae51b3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 20:39:04 +00:00
Treehugger Robot
60bdbbeff2 Merge "Update udfps icon interpolator for transition to AlternateBouncer" into udc-qpr-dev am: 9a35c76454 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24059669

Change-Id: Iec2975ceaece0347bc39e35fa25b7bf372a9fd79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 20:21:46 +00:00
Treehugger Robot
4c50257874 Merge "Fade out UDFPS on shadeExpand & dialogProgress" into udc-qpr-dev am: 09311d9d90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24059668

Change-Id: I3bd6abd6f89eb9ae060d8190cac7ac8ec2292771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 20:20:02 +00:00
Beverly Tai
d7d2089a52 Merge "Revert "FingerprintSensorProperties refactor - ui layer"" into udc-qpr-dev am: 410e1d090d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24133165

Change-Id: I32f778404d002286ff3871bd0fa39adfc6812d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 20:17:52 +00:00
Treehugger Robot
9a35c76454 Merge "Update udfps icon interpolator for transition to AlternateBouncer" into udc-qpr-dev 2023-07-20 20:02:53 +00:00
Treehugger Robot
09311d9d90 Merge "Fade out UDFPS on shadeExpand & dialogProgress" into udc-qpr-dev 2023-07-20 20:02:50 +00:00
Julia Reynolds
75a9657762 Allow additional reason/surface combinations for cancel am: 4c39ad7c8f am: c57749a767 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24147764

Change-Id: I2db795b7ec8fc2e20478b1674f6549a4a65f9fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 19:59:07 +00:00
Julia Reynolds
c57749a767 Allow additional reason/surface combinations for cancel am: 4c39ad7c8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24147764

Change-Id: Ie6698821c28e7459f928947b7dccce5bc8fe1976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 19:57:45 +00:00
Treehugger Robot
9aad669f63 [automerger skipped] Merge "Use -Xjvm-default=all instead of -Xjvm-default=enable or @JvmDefault" into main am: 2e93187332 am: e4de34bd6c -s ours am: 3bfc21bea8 -s ours 
am skip reason: Merged-In I473e578b92482fbd6c8812c4d32acc1a4c27a84a with SHA-1 25a05fe4e3 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2662657

Change-Id: I49e9d576f341d0f26a613db86c1c0bb2821842ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 19:57:26 +00:00
Julia Reynolds
3568caef1b Allow additional reason/surface combinations for cancel am: 4c39ad7c8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24147764

Change-Id: I8fec81b35461bbc91d09ba7b4d913423c8bca2a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 19:52:56 +00:00
Beverly Tai
410e1d090d Merge "Revert "FingerprintSensorProperties refactor - ui layer"" into udc-qpr-dev 2023-07-20 19:36:28 +00:00
Treehugger Robot
3bfc21bea8 [automerger skipped] Merge "Use -Xjvm-default=all instead of -Xjvm-default=enable or @JvmDefault" into main am: 2e93187332 am: e4de34bd6c -s ours 
am skip reason: Merged-In I473e578b92482fbd6c8812c4d32acc1a4c27a84a with SHA-1 25a05fe4e3 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2662657

Change-Id: I4bf64a64116907ec6a2cc6fd59275785665c14a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 19:13:13 +00:00
Treehugger Robot
e4de34bd6c Merge "Use -Xjvm-default=all instead of -Xjvm-default=enable or @JvmDefault" into main am: 2e93187332 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2662657

Change-Id: I27954227a029beeff89d4579f6709e0c3b0fc146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 18:06:59 +00:00
Maryam Dehaini
bf92edaaba Merge "Remove caption when keyguard is visible" into udc-qpr-dev am: 2e4f665635 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23924914

Change-Id: I88806207e02f04dd8bd6b6681058d992cbc4e7db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 18:06:51 +00:00
Darrell Shi
b4c51d64e3 Merge "Log dream_setting_changed to statsd" into udc-qpr-dev am: bd019a8693 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24136085

Change-Id: Ib5565abcdf698c57de946f5b041d861829c5d611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 18:05:48 +00:00
Justin Weir
ab33c814df Merge "Update modules to allow empty impls" into udc-qpr-dev am: 1509cd7aa0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24101804

Change-Id: I80a4159b181db992fb0134292ea4c4441c4fecec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 18:03:54 +00:00
Maryam Dehaini
2e4f665635 Merge "Remove caption when keyguard is visible" into udc-qpr-dev 2023-07-20 17:44:58 +00:00