am skip reason: Merged-In Iadeb933fb5e5be1ef255fb2ca9fcc69c12147d7d with SHA-1 eb84df6c is already in history

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



Change-Id: I1dc02b032ee24edfa6771549d53b5b6178653bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

* changes:
  [automerger skipped] Merge "Fix uses_libs properties for OneMedia." into aosp-main-future am: 768a8eb8 -s ours
  [automerger skipped] Fix uses_libs properties for OneMedia. am: ca4c93e6 -s ours

[automerger skipped] Merge "Fix uses_libs properties for OneMedia." into aosp-main-future am: 768a8eb8 -s ours

am skip reason: Merged-In I13725bc7dccb1c4cb22f1cb2ea5a875ee927bf13 with SHA-1 a401cbee is already in history

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



Change-Id: I7f8236755c6dfc18f137798e0a78532660908331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: Merged-In I13725bc7dccb1c4cb22f1cb2ea5a875ee927bf13 with SHA-1 a401cbee is already in history

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



Change-Id: Ie051bee3232504f62cfe78a5765c3fc784a8444a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Bug: 299946220

When Views vote for both a category and a
refresh rate, then both should be sent to
SurfaceFlinger.

Now a single View can vote for refresh rate
and category if velocity and category are
both set.

This CL also reduces the overhead of voting
by recalculating the category only one time
rather than for every drawn View. It also
stops Views from calculating frame rate
and category if the maximum has already been
set.

Test: existing and new tests. manual testing
Change-Id: Ia215d3fb0e1239f1ed88f06732d1aec13527757a

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



Change-Id: I842490539e661e6cddcd5b9110c08fda7e7fc1ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Bug: 334177468
Test: make
Flag: NA
Change-Id: I3795f1c85134ffe1aba170709865c30ae2740f72

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



Change-Id: I18cc74f2bbdbfaf34a4c9742541fb56ddbcedcd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge changes from topic "cherrypicker-L63500030002772203:N60600030045907686" into 24D1-dev am: dc331544 -s ours

am skip reason: Merged-In I2160dd17d39bd00a045422e2096d14b9ebb68902 with SHA-1 7f5aea44 is already in history

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



Change-Id: I1f4797cd7eb1561bdb2fff6c2451f0ecf8bc479d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: Merged-In I2160dd17d39bd00a045422e2096d14b9ebb68902 with SHA-1 7f5aea44 is already in history

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



Change-Id: I63363035f4203b907abc6838a96509fb9e601a89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge changes from topic "cherrypicker-L46800030003199711:N12400030051438895" into 24D1-dev am: f2d695e6 -s ours

am skip reason: Merged-In I8c472541ad4c9115480100cf6c05ab02f09f198e with SHA-1 047546e2 is already in history

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



Change-Id: Ibb5bf40070eb152d06bae14b6ce5e7a05a66a70d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: Merged-In I8c472541ad4c9115480100cf6c05ab02f09f198e with SHA-1 047546e2 is already in history

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



Change-Id: Ifa42f403804efb6b532bd9113a33c7a4cb62abc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: Merged-In Ic3871b721b9ecf37abc6d92b0378003806f20ff2 with SHA-1 f47606f1 is already in history

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



Change-Id: I502f0fd9af3aca920346341f6d35fe4320da5c43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

* changes:
  Punch extracted ELF64 files
  Punch holes in extra field in local headers inside apk
  Add Extra field info in ZipFileRO

* changes:
  CallStyle: don't reglue icon+label if never glued
  CallStyle: Also handle null label to glue
  CallStyle: Handle null icon to glue

Cts uses the output from DeviceState toString to determine
if certain states should not be used

Bug: 330658669
Test: Manual toString check
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7303ab84104cce1136886c61137b1af90c29cb97)
Merged-In: I94cd8ea4f53e42190789b1460987fc7bc855e01f
Merged-In: Iadeb933fb5e5be1ef255fb2ca9fcc69c12147d7d
Change-Id: I94cd8ea4f53e42190789b1460987fc7bc855e01f
24D1-dev is based on 24Q2-release. Therefore, we merged this CL to 24D1-dev.

* changes:
  NSSL: requestLayout on split shade change
  NSSL: Apply skinny notifs based on split shade state
  NSSL: Log more about side padding decisions
  NSSL: Log actual orientation on updateSidePadding

Adds seek bar view model work, and modify some fields in view-models.

Flag: ACONFIG media_controls_refactor DISABLED
Bug: 328207006
Test: atest SystemUiRoboTests:MediaControlViewModelTest
Test: build.
Change-Id: I62e5caee4958b1f27c5a0337c53aea4f691e4f16

Merge "Only consider notification launches from keyguard in KeyguardSurfaceBehindInteractor" into main