Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
653,324 Commits 3 Branches 0 Tags
dd74060196d936cd5ffbc3396cfa3bab5b186196
Commit Graph

653324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
dd74060196 Merge "Use label instead of cast icon in output switcher" into sc-qpr1-dev am: 19a2adb33b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15716777

Change-Id: Iab4748d196e1b65267e3618a134992c008b46fb7
 2021-09-04 00:00:06 +00:00
TreeHugger Robot
a6b327b6d6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 80a06c610c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I505f947de0fa68f8a46edfffcb0c391b8b8566a5
 2021-09-03 23:59:35 +00:00
TreeHugger Robot
19a2adb33b Merge "Use label instead of cast icon in output switcher" into sc-qpr1-dev 2021-09-03 23:53:48 +00:00
Winson Chung
67b04aaef5 Merge "Always inset the IME by the extra nav bar frame height" into sc-v2-dev 2021-09-03 23:46:16 +00:00
Winson Chung
5d5f0987b2 Always inset the IME by the extra nav bar frame height 
- If the taskbar is collapsed and isn't providing full insets to the
  app, we still want the IME to be inset for the nav button that shows

Fixes: 197727397
Test: Collapse taskbar, open IME
Change-Id: I9f2367344385c9a23e2d6323637a0b2d1713b169
 2021-09-03 23:46:00 +00:00
Tracy Zhou
24bea48811 Merge "Revert "Revert "Support immersive mode with task bar""" into sc-v2-dev 2021-09-03 23:43:54 +00:00
Tracy Zhou
962eab3009 Revert "Revert "Support immersive mode with task bar"" 
This reverts commit e38e9d8793.

Reason for revert: Rolling forward with a proper fix (ag/15746910)

Fixes: 197991600
Change-Id: If9b8d2258832dbcbc63276bbfcace2664a595c68
 2021-09-03 23:43:45 +00:00
TreeHugger Robot
5e68bf3be3 Merge "Check the transient state by using public types" into sc-v2-dev 2021-09-03 23:41:10 +00:00
TreeHugger Robot
80a06c610c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-03 23:40:48 +00:00
Jieru Shi
0a87be97ce Merge "Populate additional fields for smartspace logging" into sc-qpr1-dev am: bff78358ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590965

Change-Id: I90cd11881b489f5a3447646ab1f88382a3013c46
 2021-09-03 23:14:24 +00:00
Jieru Shi
bff78358ad Merge "Populate additional fields for smartspace logging" into sc-qpr1-dev 2021-09-03 23:09:56 +00:00
Joshua Mccloskey
19163a29fe Merge "Merge "Udfps enrollment now focuses on fingerprint region" into sc-dev am: f375efdd7b" into sc-qpr1-dev am: 85626f1b4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15743940

Change-Id: Id484e5194a2ecb5949ead1c563c1cbed586f49cf
 2021-09-03 22:33:07 +00:00
Joshua Mccloskey
85626f1b4b Merge "Merge "Udfps enrollment now focuses on fingerprint region" into sc-dev am: f375efdd7b" into sc-qpr1-dev 2021-09-03 22:18:47 +00:00
Joshua Mccloskey
6dbfb1d897 Merge "Udfps enrollment now focuses on fingerprint region" into sc-dev am: f375efdd7b 
Bug: 195614793

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

Change-Id: I5c2865cc4fc00b4c56dce2a94a3a55d187d5f731
Merged-In: I07273033599a02e31d97256a3de169b1e1152e54
 2021-09-03 22:18:35 +00:00
Bill Yi
92d60b46f2 Merge changes from topic "presubmit-am-972dcb5456b14246b20e89e741cf7eaa" into sc-qpr1-dev am: 8b9ef48f4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748028

Change-Id: I6d7909d6f59a4ce2b43cc599cca6435ede985a1e
 2021-09-03 21:24:16 +00:00
Bill Yi
53c24ced42 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bbe1d66a2a am: 6bcbc12cd0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3e21556238430457cb2bf73f63c86e9db4d443d1
 2021-09-03 21:24:15 +00:00
Bill Yi
8b9ef48f4b Merge changes from topic "presubmit-am-972dcb5456b14246b20e89e741cf7eaa" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bbe1d66a2a
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-03 21:03:27 +00:00
TreeHugger Robot
c9717afde6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: e26bff4f60 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I96d1a2309ebc30bc2d85b4405eeb768785167ab1
 2021-09-03 20:23:55 +00:00
TreeHugger Robot
a5adeadd3d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: bd7dfbe35a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb8fd3ae2fb38eb8641c39aa19a646c28372196a
 2021-09-03 20:23:45 +00:00
TreeHugger Robot
e26bff4f60 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-03 20:21:59 +00:00
TreeHugger Robot
bd7dfbe35a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-03 20:21:54 +00:00
TreeHugger Robot
3357c38002 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: c1936d0954 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I96949d01519bcaf4646280273e04f250ff3281e1
 2021-09-03 20:15:43 +00:00
TreeHugger Robot
5af5c83250 Merge "Filter Alias which points non-existing font family name" into sc-qpr1-dev am: 2d88769f5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15674535

Change-Id: I655a90bf8032a97031b8af6249bdf72e05b77fc7
 2021-09-03 20:15:28 +00:00
Beth Thibodeau
e1103a98ca Use label instead of cast icon in output switcher 
When the device is null or not enabled, disable the output switcher chip
and display "Other device" as a fallback value, instead of a cast icon

Fixes: 159231146
Test: atest MediaControlPanelTest
Change-Id: I29ece6d32ca327d18c1e92e14f93876959c00ff3
 2021-09-03 20:10:38 +00:00
TreeHugger Robot
c1936d0954 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-03 20:09:52 +00:00
TreeHugger Robot
2d88769f5e Merge "Filter Alias which points non-existing font family name" into sc-qpr1-dev 2021-09-03 19:59:52 +00:00
Evan Rosky
ac3bddc1ce Merge "Wrap IRemoteTransition in a parcelable to enable extra properties" into sc-v2-dev 2021-09-03 19:53:10 +00:00
TreeHugger Robot
38d002b1ab Merge "Add Settings key for UWB State" into sc-qpr1-dev am: d9a873a20e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748723

Change-Id: I6d44734cf445ab2e34f86abb33796465244a76f2
 2021-09-03 19:14:13 +00:00
TreeHugger Robot
d9a873a20e Merge "Add Settings key for UWB State" into sc-qpr1-dev 2021-09-03 18:59:59 +00:00
Beth Thibodeau
80c3e09535 Merge "Fix clipping when text is multiple lines" into sc-qpr1-dev am: 24a2c97ba5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15678441

Change-Id: I17589c0346addb50436f078c96dd53af78135bcd
 2021-09-03 18:50:46 +00:00
Beth Thibodeau
24a2c97ba5 Merge "Fix clipping when text is multiple lines" into sc-qpr1-dev 2021-09-03 18:40:08 +00:00
TreeHugger Robot
1dd864bc5c Merge "To support loading display_settings.xml on treblized builds, include the product directory on the search path for the file. If not found, fallback to the vendor directory." into sc-v2-dev 2021-09-03 18:17:58 +00:00
Evan Rosky
bc94c3d524 Wrap IRemoteTransition in a parcelable to enable extra properties 
This is in preparation for attaching some extra meta information
to remote transitions (eg. process token). Most of this refactor
just replaces references to the raw interface with references
to the wrapper class.

There is also a small refactor in RemoteTransitionHandler to
better-manage death-recipients. It is possible to have >1 filter
and >1 pendings referencing the same remote simultaneously, so
this arrangement properly handles the 1-to-many possibility.

Bug: 183993977
Test: refactor, so existing tests pass
Change-Id: Icae8f2128e0ffdf7aee51284cba106963450e3e7
Merged-In: Icae8f2128e0ffdf7aee51284cba106963450e3e7
 2021-09-03 17:19:44 +00:00
TreeHugger Robot
d16f4458d7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1cf6b4ea68 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id37b6962bc9a6e14c00ad74b1905a6223f2d50e7
 2021-09-03 17:02:37 +00:00
TreeHugger Robot
2262fbf5af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 335bddf60a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I59abfd108a698aa7832e28225ec71a7cf280eeca
 2021-09-03 17:01:52 +00:00
TreeHugger Robot
1cf6b4ea68 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-03 16:51:51 +00:00
TreeHugger Robot
8a005640ce Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-09-03 16:50:45 +00:00
TreeHugger Robot
6e63617012 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-09-03 16:49:54 +00:00
TreeHugger Robot
53adc95e23 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-09-03 16:49:49 +00:00
TreeHugger Robot
12b9d084f0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-09-03 16:47:41 +00:00
TreeHugger Robot
1e521505c9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-09-03 16:46:43 +00:00
TreeHugger Robot
335bddf60a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-03 16:46:39 +00:00
Tiger Huang
203e005aa3 Check the transient state by using public types 
Previously, we only checked if ITYPE_STATUS_BAR or ITYPE_NAVIGATION_BAR
is showing transiently or not when deciding the control target. There
could be an issue if the system doesn't have ITYPE_NAVIGATION_BAR but
has ITYPE_EXTRA_NAVIGATION_BAR. When that happens, mDummyControlTarget
in InsetsPolicy cannot be the navigation control target, so it cannot
show the transient bar.

This CL uses public types to decide the control target in transient
mode.

Bug: 198193735
Test: 1. Enable task bar from DeviceProfile.
      2. Set smallest width to 600 dp from developer options.
      3. Open an app which hides all system bars in sticky-immersive
         mode.
      4. Swipe from top and see if task bar is visible.
Change-Id: Id0a0b60831e11e32fbeac93330144535ed7cb416
 2021-09-03 13:14:39 +00:00
Tiger Huang
4fba1c4453 Merge "Prevent adding methods in WindowInsetsAnimationController" into sc-v2-dev 2021-09-03 10:40:38 +00:00
Naomi Musgrave
dce45ccae5 Merge "[MediaProjection] Store WindowContext in VirtualDisplay" into sc-v2-dev 2021-09-03 10:35:11 +00:00
Wei Sheng Shih
10b3662274 Merge "Release the child layer on TaskSnapshot" into sc-v2-dev 2021-09-03 10:11:37 +00:00
shreerag@google.com
6426637598 Nullcheck for StatusBarManagerInternal in InsetsPolicy 
Wear does not support StatusBarManagerService

Bug: 158866039
Test: salmon boots successfully
Change-Id: I76a44c4cbc0f8eeeda6b9c35b2c29ce87f0db8de
Merged-In: I76a44c4cbc0f8eeeda6b9c35b2c29ce87f0db8de
(cherry picked from commit 3d40a967c3c111e205f577ab96daf7f2b696ee3e)
(cherry picked from commit 7f00ac7f25)
 2021-09-03 13:36:31 +08:00
Louis Chang
4abf39e6da Merge "Finish the primary container while secondary exited" into sc-v2-dev 2021-09-03 04:59:16 +00:00
Bill Yi
3e4376789a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icc1fb8abfb58369ceda9c396f7c7102e74b561b9
 2021-09-03 04:12:37 +00:00
Bill Yi
a5c63f1600 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie09b3701d2df33dd74f32206ea88ab46d55c679d
 2021-09-03 04:11:08 +00:00