Commits · 91a8a43a5735a720ffb8e21199057c63af43425c · Farzin Kazemzadeh / platform_frameworks_base-old

May 30, 2024

[SB][Sat] Always show satellite carrier text in shade if available. · 91a8a43a

This isn't my favorite way to fix this, but it's what we can do given
the state of the current code and what little time we have left.

Fixes: 341841138
Flag: com.android.internal.telephony.flags.oem_enabled_satellite_flag
Test: In SysUI demo mode, enter satellite mode then open the shade
-> verify the header has the satellite carrier text
Test: atest CarrierTextManagerTest ShareCarrierGroupControllerTest

Change-Id: I1bd7a67d7a2f0f9971ad5fab638adf2d78eac6be

91a8a43a

May 28, 2024

Merge "Adjust width of album art" into main · ee08101f
Michael Mikhail authored 9 months ago

ee08101f
Merge "Disable the trustedOverlay flag for taskview" into main · 309fdfc8
Treehugger Robot authored 9 months ago

309fdfc8
Merge "[SB][Sat] Add verbose log buffer for satellite logs." into main · 034cb5c2
Treehugger Robot authored 9 months ago

034cb5c2

[automerger skipped] Merge "Disable recents gesture when split animation... · 8946f2de

Vinit Nayak authored 9 months ago

[automerger skipped] Merge "Disable recents gesture when split animation running in shell" into 24D1-dev am: b5a10ed9 -s ours

am skip reason: Merged-In I50d52fb8b099a6a000373e04d9a6016bd18e7169 with SHA-1 e0bf32a0 is already in history

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



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

8946f2de

[automerger skipped] Disable recents gesture when split animation running in... · b4121212

Vinit Nayak authored 9 months ago

[automerger skipped] Disable recents gesture when split animation running in shell am: 5445cd49 -s ours

am skip reason: Merged-In I50d52fb8b099a6a000373e04d9a6016bd18e7169 with SHA-1 e0bf32a0 is already in history

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



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

b4121212

Merge "Disable recents gesture when split animation running in shell" into 24D1-dev · b5a10ed9
Vinit Nayak authored 9 months ago

b5a10ed9
Merge "Add strict_mode: false" into main · b4d543f6
Kevin Liu authored 9 months ago

b4d543f6
Merge "User activation > app deactivation" into main · e34d650e
Julia Reynolds authored 9 months ago

e34d650e

Disable the trustedOverlay flag for taskview · 1b48b467

Gaurav Bhola authored 10 months ago

- TaskView is meant to contain app activities which shouldn't have
  trusted overlay set even when itself placed in a window which is
  trusted.

Fix: 339701674
Fix: 342050101
Bug: 320410671
Test: atest WindowUntrustedTouchTest
Change-Id: Ib9e3c73516aba7f407e8bcbf8cb9cd7477f40fa8

1b48b467

Merge "Revert "Settings: add ACTION_NETWORK_PROVIDER_SETTINGS"" into main · 2b83c174
David Jacobo authored 9 months ago

2b83c174

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · 8c255121

Treehugger Robot authored 9 months ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 04e47069 -s ours

am skip reason: contains skip directive

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



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

8c255121

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: -s ours · ce059ccf

Bill Yi authored 9 months ago

am skip reason: contains skip directive

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

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

ce059ccf

Merge "Add CommunalSceneInteractorTest" into main · fc53cbc2
Lucas Silva authored 9 months ago

fc53cbc2
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod · 04e47069
Treehugger Robot authored 9 months ago

04e47069

Merge changes from topic "am-b4bb74a58f87402092f3f68e387c2186" into main · 94186483

Automerger Merge Worker authored 9 months ago

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 3e6cb68f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 119f8c0d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: de0bf53c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74aea35d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: e0cda2b0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f19f6221 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: f2e84d23 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: faa87514 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 3b4bb326 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e60f710a -s ours

94186483

Merge changes I75097a1f,I550b646a into main · 50bc205e

Lucas Silva authored 9 months ago

* changes:
  Remove references to deprecated methods
  Avoid dismissing shade when launching activities from communal hub

50bc205e

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · 363aea70

Bill Yi authored 9 months ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 3e6cb68f -s ours

am skip reason: contains skip directive

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



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

363aea70

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: -s ours · edda3629

Bill Yi authored 9 months ago

am skip reason: contains skip directive

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

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

edda3629

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · 29d68fc1

Bill Yi authored 9 months ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: de0bf53c -s ours

am skip reason: contains skip directive

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



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

29d68fc1

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: -s ours · 5247d9d3

Bill Yi authored 9 months ago

am skip reason: contains skip directive

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

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

5247d9d3

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · 885111fb

Bill Yi authored 9 months ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: e0cda2b0 -s ours

am skip reason: contains skip directive

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



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

885111fb

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: -s ours · ac80582c

Bill Yi authored 9 months ago

am skip reason: contains skip directive

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

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

ac80582c

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · a3cfa4b3

Bill Yi authored 9 months ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: f2e84d23 -s ours

am skip reason: contains skip directive

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



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

a3cfa4b3

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: -s ours · 547bfc1c

Bill Yi authored 9 months ago

am skip reason: contains skip directive

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

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

547bfc1c

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · 25fa1daa

Bill Yi authored 9 months ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 3b4bb326 -s ours

am skip reason: contains skip directive

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



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

25fa1daa

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: -s ours · 046255ee

Bill Yi authored 9 months ago

am skip reason: contains skip directive

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

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

046255ee

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... · e981ecd1

Treehugger Robot authored 9 months ago

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: f55882d2 -s ours

am skip reason: contains skip directive

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



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

e981ecd1

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: -s ours · 8b48aeeb

Bill Yi authored 9 months ago

am skip reason: contains skip directive

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

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

8b48aeeb

Merge "Import translations. DO NOT MERGE ANYWHERE" into main · d1bcb588
Bill Yi authored 9 months ago

d1bcb588
Merge "Import translations. DO NOT MERGE ANYWHERE" into main · c45148a9
Bill Yi authored 9 months ago

c45148a9
Merge "Import translations. DO NOT MERGE ANYWHERE" into main · 0f52cefb
Bill Yi authored 9 months ago

0f52cefb
Merge "Import translations. DO NOT MERGE ANYWHERE" into main · fb2e973f
Bill Yi authored 9 months ago

fb2e973f
Merge "Import translations. DO NOT MERGE ANYWHERE" into main · 55b91c99
Bill Yi authored 9 months ago

55b91c99
Merge "Import translations. DO NOT MERGE ANYWHERE" into main · 7253ffb1
Bill Yi authored 9 months ago

7253ffb1
Merge "Import translations. DO NOT MERGE ANYWHERE" into main · 61ccacd8
Bill Yi authored 9 months ago

61ccacd8
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev · 3e6cb68f
Bill Yi authored 9 months ago

3e6cb68f
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev · de0bf53c
Bill Yi authored 9 months ago

de0bf53c
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev · e0cda2b0
Bill Yi authored 9 months ago

e0cda2b0
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev · f2e84d23
Bill Yi authored 9 months ago

f2e84d23