Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
781,408 Commits 3 Branches 0 Tags
b9321663d76d5097e4ee56f9b97fae8731fac4be
Commit Graph

781408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jordan Demeulenaere
8c222cabb6 Define the SystemUI typography 
This CL defines the material typography that is going to be used by
Compose code in SystemUI. Most of the code from this CL was forked from
the Google Material implementation in google3 [1, 2, 3, 4], so that our
typography is consistent from 1P apps (and with the Google Material
spec). For this reason, I changed only what I had to + reformatted the
files using ktfmt. The direct references to "google-sans" will be
removed in http://ag/19500381 to keep this CL as close as possible from
the google3 classes.

Note that this new typography might not be 100% consistent with the
current text styles used in SystemUI, given that they are not consistent
with the new M3 spec. Those kind of inconsistencies will be fixed later,
as we figure out how SystemUI is going to be aligned with M3 in general
(and not w.r.t. Compose in particular).

[1] http://google3/java/com/google/android/libraries/material/compose/Typography.kt
[2] http://google3/java/com/google/android/libraries/material/compose/tools/tokens/library/md/first_party/TypographyTokens.kt
[3] http://google3/java/com/google/android/libraries/material/compose/tools/tokens/library/md/first_party/TypeScaleTokens.kt
[4] http://google3/java/com/google/android/libraries/material/compose/tools/tokens/library/md/first_party/asynctype/TypefaceTokens.kt

Bug: 230605885
Test: Manual
Change-Id: I116ef944c79e09fb0d4b0914c3da71a946fc169a
 2022-12-08 16:08:35 +01:00
Fabian Kozynski
0bfdbbf4c2 Merge "Fix crash when trying to dismiss dialog" into tm-qpr-dev 2022-12-08 14:58:42 +00:00
Bill Yi
89433700b6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I202d9ba75a6c1fa91b42650a7444b849d91c520d
 2022-12-08 06:19:44 -08:00
TreeHugger Robot
3c86fce3a9 Merge "Remove old footer actions implementation" into tm-qpr-dev 2022-12-08 14:12:11 +00:00
TreeHugger Robot
acc8dd3223 Merge "Logging fold update name instead of just integer for easier bug report reading" into tm-qpr-dev 2022-12-08 13:52:07 +00:00
Bill Yi
0c6b5143bf Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I517889f6f9ec5c1b95a3ded9af761b3099f5c5a6
 2022-12-08 05:48:59 -08:00
Chris Poultney
56a0d71936 Merge "Add home/lock screen argument to remaining methods that require one" into tm-qpr-dev 2022-12-08 13:43:03 +00:00
Jernej Virag
cfe20e8b38 Add flag to gate Notification memory logging via statsd 
This flag will enable/disable automated statsd snapshotting of
notification memory consumption.

Bug: 235451049
Test: n/a
Change-Id: I4db4e5828bed85ba1bb85b22f680f10975b5e9c2
 2022-12-08 14:02:06 +01:00
Bill Yi
0b8226917e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9e24ae9fec4fa28bcd068bc23de7dffe966b35b1
 2022-12-08 04:52:51 -08:00
Bill Yi
518fbad053 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7535b2a7a98c2abbb7467f99ecf10d10c52d03e0
 2022-12-08 04:49:43 -08:00
Bill Yi
2b0c9c1b91 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1ac29a74f1146433fe60851d0fa17f846df27ff5
 2022-12-08 04:07:53 -08:00
Bill Yi
9f11d242da Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I623f095004f5e6a96e4a91a3a5823788609ea613
 2022-12-08 00:56:08 -08:00
TreeHugger Robot
b9e3f7135a Merge "Increase power-press timeout" into tm-qpr-dev 2022-12-08 08:56:02 +00:00
Chris Li
d7994f8a97 Merge "Request change transition for layout direction change for legacy" into tm-qpr-dev 2022-12-08 07:36:55 +00:00
Louis Chang
2f821c9001 Prevent IndexOutOfBoundsException while removing activities 
IndexOutOfBoundsException was thrown when traversing the Task
from bottom to top because the activity could be removed from
the Task and the activities are less than its original size.

Bug: 249658397
Bug: 260643770
Test: 1) Start multiple activities in a Task
      2) Swipe up to home
      3) Kill the app process from shell
      4) Remove the task from Recents
Change-Id: I64955415c04da30d7dc8a4681474ceb06db1e88b
Merged-In: I64955415c04da30d7dc8a4681474ceb06db1e88b
 2022-12-08 07:08:02 +00:00
Shaowei Shen
31b52d1bad Merge "[Output Switcher] Update device selection layout" into tm-qpr-dev 2022-12-08 06:22:40 +00:00
Chris Li
1d90ad8bab Merge "Fix ActivityEmbedding animation with new split in different layout" into tm-qpr-dev 2022-12-08 05:35:40 +00:00
Chris Li
53c5aa6792 Merge "Fix customized activity open/close animation backdrop color" into tm-qpr-dev 2022-12-08 05:34:00 +00:00
Jing Ji
72e5627c7a [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-qpr-dev am: 95907cfca2 -s ours am: d577c51c3d -s ours am: f684abcd18 -s ours am: 64da92499e -s ours am: e166e03ed3 -s ours am: d094458104 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic989e2775c0515ffc1c663b1bd54b8abe7333042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 05:31:25 +00:00
Jing Ji
df2277b423 [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 0b75cda3c2 -s ours am: 7fe7416e79 -s ours am: a41bf91d53 -s ours am: c22b698208 -s ours am: 1e076760e6 -s ours am: 27e23a3d50 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c8332a9b5b4b2c6457c8922182916504193eba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 05:31:11 +00:00
Pinyao Ting
c6ec6164dc [conflict] Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a am: f9a6a136a0 am: bb4ff2e484 am: eee3312ac2 am: 4611aa5717 am: 69042ba58f am: 891d482fb6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668

Change-Id: I148aa61a3b91bdb12bc14413ee05e744a37ac921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 05:30:39 +00:00
Jing Ji
d094458104 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-qpr-dev am: 95907cfca2 -s ours am: d577c51c3d -s ours am: f684abcd18 -s ours am: 64da92499e -s ours am: e166e03ed3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a52a39f4df7bfca6494bdcc23af2f2ca91cec15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 05:08:16 +00:00
Jing Ji
27e23a3d50 [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 0b75cda3c2 -s ours am: 7fe7416e79 -s ours am: a41bf91d53 -s ours am: c22b698208 -s ours am: 1e076760e6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie23179fc1239015cd13c357c8712f63abd7dd21e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 05:08:13 +00:00
Pinyao Ting
891d482fb6 [conflict] Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a am: f9a6a136a0 am: bb4ff2e484 am: eee3312ac2 am: 4611aa5717 am: 69042ba58f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668

Change-Id: Ie7ef157b93892ef01774aa6f84580e300c780247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 05:07:46 +00:00
Evan Laird
18917a1820 Merge changes I4977aa47,I87686213,If4bd3e31,I727ad3ca,Ib02a1eb6 into tm-qpr-dev 
* changes:
  [Status bar refactor] Fix cache removal exception
  Add a SubscriptionModel
  Rename MobileSubscriptionModel to MobileConnectionModel
  Better mapping lookup for demo mode
  Support new pipeline demo mode in the old view presenter
 2022-12-08 04:43:54 +00:00
Jing Ji
e166e03ed3 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-qpr-dev am: 95907cfca2 -s ours am: d577c51c3d -s ours am: f684abcd18 -s ours am: 64da92499e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff4d9d46893895e81905be7c50b65375c318ee2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 04:37:16 +00:00
Jing Ji
1e076760e6 [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 0b75cda3c2 -s ours am: 7fe7416e79 -s ours am: a41bf91d53 -s ours am: c22b698208 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4044aa7ce2ac16a5ca65253f77418985d53ade94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 04:36:32 +00:00
Pinyao Ting
69042ba58f [conflict] Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a am: f9a6a136a0 am: bb4ff2e484 am: eee3312ac2 am: 4611aa5717 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668

Change-Id: I9c8cc614d89d1405d922781a5cd7ce6ea12db053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 04:35:40 +00:00
Jing Ji
64da92499e [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-qpr-dev am: 95907cfca2 -s ours am: d577c51c3d -s ours am: f684abcd18 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida72cde38efe6a30cce8ef364b684fbc8c4b63ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 04:15:24 +00:00
Jing Ji
c22b698208 [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 0b75cda3c2 -s ours am: 7fe7416e79 -s ours am: a41bf91d53 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2ac91871db7db6dc21d01e42a077b5db735d57de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 04:14:52 +00:00
Pinyao Ting
4611aa5717 [conflict] Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a am: f9a6a136a0 am: bb4ff2e484 am: eee3312ac2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668

Change-Id: Ic59fb429f1b0d87d45282515e7a8eea1d022fcf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 04:14:17 +00:00
Jing Ji
f684abcd18 [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-qpr-dev am: 95907cfca2 -s ours am: d577c51c3d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4ca9b80bd0a681ba9afcc100e58d59925e14394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 03:24:18 +00:00
Jing Ji
a41bf91d53 [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 0b75cda3c2 -s ours am: 7fe7416e79 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ffde78a6a167c2b245802b58150f9ccdfe88363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 03:24:01 +00:00
Pinyao Ting
eee3312ac2 [conflict] Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a am: f9a6a136a0 am: bb4ff2e484 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668

Change-Id: I161301167ce9d467b47cc709a34ec304696afb12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 03:23:38 +00:00
Shaowei Shen
951ceea51c Merge "[Output Switcher] Update Volume control in Output Switcher" into tm-qpr-dev 2022-12-08 03:23:20 +00:00
Jing Ji
d577c51c3d [automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-qpr-dev am: 95907cfca2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I56dcd64a304a186ca911db7ad845a6f2c885c910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 02:32:06 +00:00
Jing Ji
7fe7416e79 [automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 0b75cda3c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iced46759eeb8506364fa78308fb688b18ef8f8aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 02:31:35 +00:00
Chris Li
cc18bee6af Request change transition for layout direction change for legacy 
Before, we check if the bounds are resized to start a change transition
to avoid unnecessary screenshot. However, when the layout direction is
changed, we also want to have a change transition when the bounds are
not resized.

Bug: 241043533
Fix: 258130319
Test: atest WmTests:TaskFragmentTest
Change-Id: I413febe18c2288600066e9f8d641d6ab4ec5f126
 2022-12-08 10:28:36 +08:00
Pinyao Ting
bb4ff2e484 [conflict] Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a am: f9a6a136a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20642213

Bug: 261780479
Change-Id: I6839241b85cf3775fdc81c1befbd1f263fad7313
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 02:12:06 +00:00
TreeHugger Robot
6fa4943481 Merge "[Chipbar] Don't add null icon descriptions to the main description." into tm-qpr-dev 2022-12-08 01:43:50 +00:00
TreeHugger Robot
80821636d9 Merge "[Chipbar] Always tint the start icon correctly." into tm-qpr-dev 2022-12-08 01:43:18 +00:00
Patrick Baumann
051e23fab4 Merge changes from topic "PackageManagerServiceTests-tm-qpr-dev" into tm-qpr-dev 
* changes:
  Cleanup after test suite split.
  Moving PackageManagerServiceTests to their own suite.
 2022-12-08 01:11:24 +00:00
Jing Ji
95907cfca2 Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-qpr-dev 2022-12-08 01:07:41 +00:00
Chris Li
7ed3a9c3f9 Fix ActivityEmbedding placeholder launching above fullscreen activity 
Before, we always place the new created TaskFragment on the top of the
Task. Now, when creating TaskFragment for placeholder, we place the new
TasKFragment right above the primary TaskFragment.

In case there is a fullscreen transparent Activity on top of the primary
Activity, this prevents us from launching the placeholder on top of the
transparent Activity.

Bug: 261550242
Test: atest WmTests:TaskFragmentOrganizerControllerTest
Change-Id: I163e9ca1637db45e8695d40a31f2a2c6a4f05189
 2022-12-08 08:38:17 +08:00
Evan Rosky
853d0c6f52 Replace direct AR.mVisibleRequested access with getter/setter 
This abstraction is required for later changes and is also
generally more idiomatic.

the getter for AR is a true getter, so it shouldn't have
a performance impact.

Bug: 260059642
Test: existing tests pass, this is a drop-in refactor
Change-Id: I84bacde8656d98870631d3bd92fa970d72614b93
Merged-In: I84bacde8656d98870631d3bd92fa970d72614b93
(cherry picked from commit 4ff502da98)
 2022-12-08 00:20:31 +00:00
Pinyao Ting
f9a6a136a0 Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20642213

Change-Id: If9820706deb0b9528ecc20a3d513f85692ca8997
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 00:14:23 +00:00
Hawkwood Glazier
1c9f506912 [automerger skipped] Merge "MediaPlayer will now transition the background with color scheme" into tm-dev am: 3a2ffd7e0d am: 03b55f7fa7 -s ours 
am skip reason: Merged-In I963afcf4ba0fd8c2e9ebca4d634098f63454fab6 with SHA-1 90a5f092f1 is already in history

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

Change-Id: I86a439decb07e7e2979fb7728d43bd47c91b4140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-07 23:50:13 +00:00
TreeHugger Robot
382b7c8be1 Merge "Fix a couple of NPEs in AdbDebuggingManager.AdbDebuggingHandler" into tm-qpr-dev 2022-12-07 23:37:10 +00:00
Hawkwood Glazier
03b55f7fa7 Merge "MediaPlayer will now transition the background with color scheme" into tm-dev am: 3a2ffd7e0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20552467

Change-Id: Ie30c4f4fce0895c37c49d64390b8301688f4fd99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-07 23:32:05 +00:00
Mady Mellor
0c1dd96b1f Fix drawing the ring around adaptive app icons 
It seems like when you set the bounds on an adaptive icon, it does
not draw the icon in the center of those bounds.

Fix by translating the drawable before setting the bounds.

Also removes drawing black first as this seems to leave a slight
artifact around the edges of the circle otherwise.

Bug: 260636233
Test: manual - mark a bubbleable notification as an important person
             - bubble it
             => observe the app icon badge is centered in the
                highlight ring
Change-Id: I04279a3c51badd26a5141a8edf77f05472cb9718
 2022-12-07 15:30:28 -08:00