Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
769,874 Commits 3 Branches 0 Tags
61ba8c9da7fe44ad17df27f41c8ad1177f6f9d95
Commit Graph

769874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Riddle Hsu
61ba8c9da7 Merge "Do not use seamless rotation for multi-window" into tm-qpr-dev 2022-06-27 11:47:29 +00:00
Jeff DeCew
c6701d965b Merge "When applying a RankingMap that lacks an entry, remove that entry from the NotifCollection." into tm-qpr-dev 2022-06-27 11:09:09 +00:00
Jernej Virag
bb5c810092 Merge "Describe image loads in Traces" into tm-qpr-dev 2022-06-27 09:29:16 +00:00
TreeHugger Robot
5b87b8c569 Merge "Avoid using starting bounds of open transitions" into tm-qpr-dev 2022-06-27 08:30:32 +00:00
Charles Chen
f715efcac1 [automerger skipped] Merge "Fix exception in expandSplitContainerIfNeeded" into tm-dev am: 5a0f8768a7 am: e53c8761b2 -s ours 
am skip reason: Merged-In Id8d122f7d95d1c6a3574b02ddd2b6afbc548f853 with SHA-1 bd2723cf6e is already in history

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

Change-Id: I74273a2c18e5e53d81ddddade5cb6bb0e0441410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 04:03:49 +00:00
Charles Chen
e53c8761b2 Merge "Fix exception in expandSplitContainerIfNeeded" into tm-dev am: 5a0f8768a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18886475

Change-Id: I84e2988efbb4451023161badfe2203f2aff9ee71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 03:48:05 +00:00
Charles Chen
5a0f8768a7 Merge "Fix exception in expandSplitContainerIfNeeded" into tm-dev 2022-06-27 03:28:09 +00:00
SongFerng Wang
7eb0c5ea1f Merge "[LE Unicast] Using the active device as main device after grouping" into tm-d1-dev am: 8a8b69d77b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18911430

Change-Id: I5993394f0e237b8a7f88b67f43f9d762b896f58b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-26 17:02:17 +00:00
SongFerng Wang
8a8b69d77b Merge "[LE Unicast] Using the active device as main device after grouping" into tm-d1-dev 2022-06-26 16:38:24 +00:00
Jordan Demeulenaere
6d6a373d25 Merge "Add explicit SystemUIDialog dependencies as parameters" into tm-qpr-dev 2022-06-25 07:33:30 +00:00
Jordan Demeulenaere
e8e170f57d Merge changes from topic "sysui-screenshot" into tm-qpr-dev 
* changes:
  Introduce SystemUIScreenshotLib for screenshot testing
  Increase the max size of emulated displays
 2022-06-25 07:19:45 +00:00
Charles Chen
09478bf50c Merge "Expand SplitContainer if min dimensions not satisfied" into tm-qpr-dev 2022-06-25 06:26:53 +00:00
Bart Sears
13dd953208 Merge "Move bottom padding from ScrollView to child" into tm-dev am: 8e575eafcf am: 4310d341de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19046652

Change-Id: I301f67dde5f55e562abc22a49b3da36f868986d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 22:17:32 +00:00
Bart Sears
4310d341de Merge "Move bottom padding from ScrollView to child" into tm-dev am: 8e575eafcf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19046652

Change-Id: I662f94a9a49d5e5560816b4a893b17b141ef5035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 21:51:26 +00:00
Bart Sears
8e575eafcf Merge "Move bottom padding from ScrollView to child" into tm-dev 2022-06-24 21:24:58 +00:00
Michael Wright
73c28b3e73 Merge "Release outstanding suspend blockers when shutting down DPC" into tm-dev am: 3a28a13e0d am: e2b26a18be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19053827

Change-Id: I09f1125167732801510361c9779fa3ab723b71e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 20:56:36 +00:00
Michael Wright
e2b26a18be Merge "Release outstanding suspend blockers when shutting down DPC" into tm-dev am: 3a28a13e0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19053827

Change-Id: I9cc6a44e15ca8156d768f300b5a6cb99c8c760d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 20:37:23 +00:00
Michael Wright
3a28a13e0d Merge "Release outstanding suspend blockers when shutting down DPC" into tm-dev 2022-06-24 20:17:44 +00:00
Michael Wright
c5f1c156ba Merge "Brightnessthrottler updateable through DeviceConfig" into tm-qpr-dev 2022-06-24 20:10:06 +00:00
TreeHugger Robot
5bde4b861c Merge "Use the default top clock margin on h800 devices" into tm-dev am: b865d49b16 am: 2420b44719 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19051608

Change-Id: I5da6a824fce14221ab83859d5c340d122f5195e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 19:02:08 +00:00
TreeHugger Robot
2420b44719 Merge "Use the default top clock margin on h800 devices" into tm-dev am: b865d49b16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19051608

Change-Id: I194026de5f3cb79b5413dcadb3295d84187e404a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 18:38:26 +00:00
TreeHugger Robot
b865d49b16 Merge "Use the default top clock margin on h800 devices" into tm-dev 2022-06-24 18:08:02 +00:00
Alejandro Nijamkin
a55c15df95 Merge "Removes camera service prewarming from bottom area." into tm-qpr-dev 2022-06-24 17:51:25 +00:00
Michael Wright
5747d1a551 Release outstanding suspend blockers when shutting down DPC 
Right now DPC removes all messages but doesn't actually clean up all of
the outstanding state that's in flight. In general, this isn't that
harmful for most things as the display is going away at this point, but
if any suspend blockers are being held pending this work then we end up
in a state where the device can never suspend. This causes severe
battery drain that can only be fixed by a reboot.

Test: manual
Fixes: 213407479
Change-Id: I5b61f5bd498f09026d5b398bb3a8ccdaa91601fe
 2022-06-24 18:39:18 +01:00
Hawkwood Glazier
6ed51a9469 Merge "Add wtf log for UMO being cut" into tm-qpr-dev 2022-06-24 17:24:31 +00:00
Jeff DeCew
ef67218403 When applying a RankingMap that lacks an entry, remove that entry from the NotifCollection. 
This fixes a bug after notification removed messages were dropped during moments of mass removal.  The NotifCollection was detecting this edge case but ignoring it.  Now we'll actually remove the notification and require an add event to get it back.

Note: this feature is still flagged off by default.

Bug: 216384850
Test: atest NotifCollectionTest
Change-Id: Id897c8761e40fd1adedd7c9e5a7bd2f9467d13ed
Merged-In: Id897c8761e40fd1adedd7c9e5a7bd2f9467d13ed
 2022-06-24 17:08:59 +00:00
Charles Chen
bd2723cf6e Expand SplitContainer if min dimensions not satisfied 
Before this CL, SplitController creates new SplitContainer if
min dimensions of new lauched Activity/Intent is not satisfied.
This CL changes to expand the existing SplitContainer

Bug: 232871351
Test: atest SplitPresenterTest
Change-Id: Id8d122f7d95d1c6a3574b02ddd2b6afbc548f853
 2022-06-24 23:50:12 +08:00
Christine Franks
6ad1f71cce Merge "Allow color mode to be NOT_SET" into tm-qpr-dev 2022-06-24 15:36:20 +00:00
Bryce Lee
a8454ad2f2 Merge "Localize date and time formats on complications." into tm-qpr-dev 2022-06-24 15:16:21 +00:00
Michał Brzeziński
2a8b3b47a4 Merge "2/2 Making bouncer shift on double tap when user chooser is visible" into tm-qpr-dev 2022-06-24 15:11:19 +00:00
Jeff DeCew
8d2776544f Merge "Reduce log spam when RankingMap is missing rankings for non-cancelled entries." into tm-qpr-dev 2022-06-24 14:52:50 +00:00
Fiona Campbell
265f9a6c9c Brightnessthrottler updateable through DeviceConfig 
Add listener and methods to allow BrightnessThrottler to be updated
though DeviceConfig.

Bug: 224567082
Test: atest com.android.server.display
Test: adb shell device_config put display_manager
brightness_throttling_data
"local:4619827677550801152,3,moderate,0.5,severe,0.379518072,emergency,0.248995984;local:4619827677550801151,1,moderate,0.75;local:4619827677550801150,0"
adb shell dumpsys display | grep -A20 BrightnessThrottler

Change-Id: If4fe4875d6a05cb03fbf69abb8a62a645098b3a0
 2022-06-24 14:51:33 +00:00
Massimo Carli
8a1e0cf16e Merge "Updates SCM restart button tooltip" into tm-qpr-dev 2022-06-24 11:32:00 +00:00
Jordan Demeulenaere
704785ac5c Add explicit SystemUIDialog dependencies as parameters 
This CL adds a new constructor to SystemUIDialog so that its deps can be
passed explicitly, instead of implicitly like it is currently done using
Dependency.get(). This is the first step to removing those calls to
get() and be able to create a SystemUIDialog with mocked dependencies in
(screenshot) tests.

Bug: 219008720
Test: Manual
Change-Id: Ia34072613c82e47b8fc59150703711f6a3c8c8a0
 2022-06-24 10:53:00 +02:00
Jordan Demeulenaere
d44db7003a Introduce SystemUIScreenshotLib for screenshot testing 
This CL introduces the SystemUIScreenshotLib, and in particular the
(View)ScreenshotTestRule, to easily create a screenshot diff test of
a given View for multiple configurations (devices, theme and
orientation).

Some diff tests will be added in follow-up CLs to keep the size of
this one reasonable.

Test: atest SystemUIGoogleScreenshotTests
Bug: 230832101
Change-Id: I4762ed3d575d7a9f0d8ac6d06026efe1ed2a52be
 2022-06-24 10:52:57 +02:00
TreeHugger Robot
03fe0878d5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 81222d2803 -s ours am: da2d8fe459 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3cdaa12ac21551df8b0ca393a1676725c985f16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:49:00 +00:00
Bill Yi
64918b81f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84666a2a3a -s ours am: 4445ed60d8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3b1f7ffa42280a7a04bf9ef21177e5ca88b0c624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:48:59 +00:00
TreeHugger Robot
d66193f2bd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e07f5e2953 -s ours am: 515e8dd9dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb0a0415f3f9dd1a235b37357c3fff45c4727896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:48:55 +00:00
Bill Yi
60e9d3f720 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0064bc1a7e -s ours am: bbdb8073e6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia44fcea7c564f0f573808af85e8d93da6bbeae28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:48:51 +00:00
TreeHugger Robot
801888b120 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8c6904ecc0 -s ours am: 60e60ee81b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iabecba6666fa80edb35ed8eaa536f6dcf3cd224a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:48:44 +00:00
Bill Yi
eda6667d63 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 44b2921b5a -s ours am: 58c62a1e49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id4273696594e987e5e1b621691d4b6e80e737343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:48:37 +00:00
TreeHugger Robot
b87079762c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 932644a8f6 -s ours am: 3d5e29ec32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifef2c1e93f6126e665c82c996a4963df2cbfb121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:48:23 +00:00
Bill Yi
289bb31fb3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd3ad0a763 -s ours am: 76bfeb9882 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4ca8c01d195c44f131d9b2332496635c04ee5563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:48:09 +00:00
Riddle Hsu
7b0380764c Do not use seamless rotation for multi-window 
Otherwise other non seamless apps may be flickering. Also it
potential causes sync problem when split-screen uses sync
group and seamless rotation uses applyWithNextDraw at the
same time.

Note that shell transition doesn't have the problem in split
screen because it will reject seamless if there is one changed
task doesn't declare seamless. So at least the split root task
will guard the case.

Bug: 236926512
Test: Enter split-screen with an app using ROTATION_ANIMATION_SEAMLESS.
      Rotate the display and there will be a normal rotation animation.
Change-Id: I6a44c1d3530cb92bdf6ebd81f1a520158b552d00
 2022-06-24 14:27:54 +08:00
TreeHugger Robot
da2d8fe459 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 81222d2803 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe951d5a6a402dc45a53b7cee9f146870f209b72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:57 +00:00
Bill Yi
4445ed60d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84666a2a3a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib4c71376a75ee904f8d0b101125437b840f9e668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:56 +00:00
TreeHugger Robot
515e8dd9dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e07f5e2953 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida335deb909489066b07b72f4574e4a242db734e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:50 +00:00
Bill Yi
bbdb8073e6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0064bc1a7e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icbbc1c4b5f1d0d1cf2a502c582fd5916a8f0a20a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:42 +00:00
TreeHugger Robot
60e60ee81b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8c6904ecc0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a233a68d654c6c6085b0654a28e05fd8a3a9281
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:39 +00:00
Bill Yi
58c62a1e49 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 44b2921b5a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2c33002275289d366c5b6e8abd8eb284886bb50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:23:31 +00:00