Daniel Rosenberg
b74b62d549
Merge "Use mContext directly, and enforce via logging" into qt-qpr1-dev am: 0ed64776ea
...
am: 2dc14bc0ae
2019-09-19 02:09:14 -07:00
Paul Lawrence
d3ecdce7d1
Merge "Revert "Use mContext directly"" into qt-qpr1-dev am: 1f129a115a
...
am: 88079b3398
2019-09-19 02:09:09 -07:00
Daniel Rosenberg
2dc14bc0ae
Merge "Use mContext directly, and enforce via logging" into qt-qpr1-dev
...
am: 0ed64776ea
2019-09-19 02:03:17 -07:00
Paul Lawrence
88079b3398
Merge "Revert "Use mContext directly"" into qt-qpr1-dev
...
am: 1f129a115a
2019-09-19 02:03:11 -07:00
TreeHugger Robot
0ed64776ea
Merge "Use mContext directly, and enforce via logging" into qt-qpr1-dev
2019-09-19 08:41:37 +00:00
TreeHugger Robot
1f129a115a
Merge "Revert "Use mContext directly"" into qt-qpr1-dev
2019-09-19 08:41:37 +00:00
TreeHugger Robot
e18cb09862
Merge "Internal cleanup of window manager"
2019-09-19 05:25:05 +00:00
TreeHugger Robot
37f9bd820e
Merge "Move bounds calculation and snap fraction to SysUI"
2019-09-19 05:10:43 +00:00
TreeHugger Robot
9ea56a0789
Merge "Resets PiP snap fraction on AppWindowToken removal"
2019-09-19 05:10:43 +00:00
Xiangyu/Malcolm Chen
d01b6d9cbd
Merge "Combine getPhoneCount, getSimCount and isMultiSimEnabled."
2019-09-19 05:10:07 +00:00
TreeHugger Robot
3649bbe412
Merge "Add SystemUI-tests-utils filegroup to reuse in downstream"
2019-09-19 02:20:13 +00:00
Victor Hsieh
1ee0eecf66
Merge "Mirror fs-verity ownership UID to Java" am: d6b817cd51 am: 9b83a708c7 am: 1863e70b22
...
am: 24c2c60951
2019-09-18 18:34:23 -07:00
Victor Hsieh
24c2c60951
Merge "Mirror fs-verity ownership UID to Java" am: d6b817cd51 am: 9b83a708c7
...
am: 1863e70b22
2019-09-18 18:27:18 -07:00
Mady Mellor
95e7cabd9f
Merge "Merge "No need to use getExpandedBubble for singleTaskDisplayDrawn/Empty callbacks" into qt-qpr1-dev am: 4ac6a113ed" into qt-qpr1-dev-plus-aosp
...
am: 834dad1f5b
2019-09-18 18:19:40 -07:00
Victor Hsieh
1863e70b22
Merge "Mirror fs-verity ownership UID to Java" am: d6b817cd51
...
am: 9b83a708c7
2019-09-18 18:15:40 -07:00
Kevin Hufnagle
e66c6e08b7
Merge "docs: Add condition for hiding synth. activities" into qt-dev am: 00537efd07 am: 12298403b0 am: 2bac1d7287
...
am: bc50edef36
2019-09-18 18:15:40 -07:00
Kevin Hufnagle
e6e4c980c3
Merge "docs: Add condition for hiding synth. activities" into qt-dev am: 00537efd07 am: 12298403b0 am: c67e4da871
...
am: 84b5194c1c
2019-09-18 18:05:58 -07:00
Android Build Merger (Role)
834dad1f5b
Merge "Merge "No need to use getExpandedBubble for singleTaskDisplayDrawn/Empty callbacks" into qt-qpr1-dev am: 4ac6a113ed" into qt-qpr1-dev-plus-aosp
2019-09-19 01:05:39 +00:00
Mady Mellor
1e5da3f8e0
Merge "No need to use getExpandedBubble for singleTaskDisplayDrawn/Empty callbacks" into qt-qpr1-dev
...
am: 4ac6a113ed
2019-09-18 18:04:50 -07:00
Kevin Hufnagle
bc50edef36
Merge "docs: Add condition for hiding synth. activities" into qt-dev am: 00537efd07 am: 12298403b0
...
am: 2bac1d7287
2019-09-18 18:04:37 -07:00
Victor Hsieh
9b83a708c7
Merge "Mirror fs-verity ownership UID to Java"
...
am: d6b817cd51
2019-09-18 18:04:36 -07:00
TreeHugger Robot
5814cca135
Merge "Add notifySessionLifecycle() to ContentCaptureSession."
2019-09-19 01:01:51 +00:00
Kevin Hufnagle
84b5194c1c
Merge "docs: Add condition for hiding synth. activities" into qt-dev am: 00537efd07 am: 12298403b0
...
am: c67e4da871
2019-09-18 17:45:34 -07:00
TreeHugger Robot
4ac6a113ed
Merge "No need to use getExpandedBubble for singleTaskDisplayDrawn/Empty callbacks" into qt-qpr1-dev
2019-09-19 00:40:59 +00:00
Kevin Hufnagle
c67e4da871
Merge "docs: Add condition for hiding synth. activities" into qt-dev am: 00537efd07
...
am: 12298403b0
2019-09-18 17:39:27 -07:00
Kevin Hufnagle
2bac1d7287
Merge "docs: Add condition for hiding synth. activities" into qt-dev am: 00537efd07
...
am: 12298403b0
2019-09-18 17:39:25 -07:00
Kevin Hufnagle
12298403b0
Merge "docs: Add condition for hiding synth. activities" into qt-dev
...
am: 00537efd07
2019-09-18 17:32:55 -07:00
Kevin Chyn
62db716f7f
Merge "Take optional fields into consideration when measuring"
2019-09-19 00:27:03 +00:00
Treehugger Robot
d6b817cd51
Merge "Mirror fs-verity ownership UID to Java"
2019-09-19 00:26:31 +00:00
Kevin Hufnagle
00537efd07
Merge "docs: Add condition for hiding synth. activities" into qt-dev
2019-09-19 00:20:47 +00:00
Long Ling
503bdc29de
Merge "Editor: do not blink when invisible to user"
2019-09-18 23:53:35 +00:00
Jacky Kao
38a0b53664
Merge "Modifying the mechanism of A11y window cache"
2019-09-18 23:33:49 +00:00
Christine Tsai
ca0faeb562
Merge "Fix log matching unit test bug"
2019-09-18 23:30:40 +00:00
Hongwei Wang
43a752be14
Move bounds calculation and snap fraction to SysUI
...
Major changes in this CL
- Added PipBoundsHandler in SysUI package handles the bounds calculation
and save/restore the snap fraction
- Added IPinnedStackListener.onSaveReentrySnapFraction and
IPinnedStackListener.onResetReentrySnapFration, both called from
PinnedStackController (WM) to SysUI
- Added IPinnedStackListener.onPrepareAnimation, called from WM to
SysUI to notify that an animation for pinned stack is about to happen
- Added IPinnedStackController.startAnimation, called from SysUI to WM
to actually start the pinned stack animation
- Updated tv/PipManager to use PipBoundsHandler as well
Known issues and what's next
- Shelf height is set after the animation is started, therefore one may
notice the PiP window is hovering over the shelf. This is tracked
separatedly by b/139016518
- Bounds calculations still exist in PinnedStackController since
onTaskStackChanged callback requires so. Once we addressed b/139016833
(move rotation bounds calculation to SysUI), they should be all gone.
- Move the pinned stack animation from WM to SysUI and we can furthre
remove IPinnedStackListener.onPrepareAnimation and
IPinnedStackController.startAnimation
More details: go/pip-sysui-migration
Bug: 139015463
Bug: 139015142
Test: atest PinnedStackTests
Test: atest PinnedStackControllerTest
Change-Id: Ib62d8152ecc7b18a671ec403af44cc517612169e
2019-09-18 23:01:00 +00:00
TreeHugger Robot
2b3a7d0610
Merge "Move RSS HWM stats reading code under stats"
2019-09-18 22:44:54 +00:00
Hongwei Wang
75b6e6c046
Resets PiP snap fraction on AppWindowToken removal
...
We previously rely on both windowing mode change and activity stopped
signals to reset the PiP snap fraction. The windowing mode change signal
is sent too early from WM to SysUI when we have default bounds
calculation migrated to SysUI.
Certain PinnedStackTests cases become flaky when we soly depend on
activity stopped signal to reset the fraction. For instance,
testEnterPictureInPictureDiscardSavedPositionOnFinish
- Test-1 started PiP with shelf open
- Snap fraction X is saved from Test-1
- Test-2 launches PiP above NO_RELAUNCH_ACTIVITY, with shelf closed
Instead of using the default bounds, Test-2 uses fraction X saved from
Test-1 which is shifted up by shelf height.
The saved fraction does not get reset in this case since the test
activities are force killed after each run and no activity stopped
signal is sent.
Bug: 139015463
Test: atest PinnedStackTests
Change-Id: I5720dc3abcfc78a92bb118ae35fc25d922c6232a
2019-09-18 15:42:26 -07:00
Dave Mankoff
b338ef1656
Merge changes from topic "b140270231-prox-sensor"
...
* changes:
Remove SensorRateLimiter, as it should be unnecessary.
Make DozeSensors, DozeTriggers use ProximitySensor
2019-09-18 21:35:35 +00:00
Victor Hsieh
3c68afee05
Mirror fs-verity ownership UID to Java
...
This has been done in system/core, so mirroring for later use.
https://android-review.googlesource.com/c/platform/system/core/+/1115493
Test: compile
Bug: 112038744
Change-Id: I2d7f5d38caae0b6ada1f208b3d71d937d527716e
2019-09-18 14:33:54 -07:00
Yin-Chia Yeh
baecc4fe4a
[automerger skipped] Merge "Camera: fix NPE from bad requestID" into qt-qpr1-dev am: 51cf32b4f3
...
am: 4a75a2023267bd78ad73
2019-09-18 14:12:43 -07:00
Shuzhen Wang
ceb56c5931
Merge "CameraServiceProxy: Double retry times when notifying cameraserver"
2019-09-18 21:09:52 +00:00
Yin-Chia Yeh
4a75a20232
Merge "Camera: fix NPE from bad requestID" into qt-qpr1-dev
...
am: 51cf32b4f3
2019-09-18 14:00:20 -07:00
TreeHugger Robot
43815bb9df
Merge "Adds a Builder to SyncRtSurfaceTransactionApplier.Params"
2019-09-18 21:00:13 +00:00
tsaichristine
97ae0814c3
Fix log matching unit test bug
...
- Update matcher in TestUidFieldMatcher unit test to have correct atom
id
- Add atom id check in matchesSimple
Test: bit statsd_test:AtomMatcher.TestUidFieldMatcher
Bug: 141174720
Fix: 141174720
Change-Id: Icbfea7e33876dea36d68d3e3d064581c5a621a77
2019-09-18 20:56:59 +00:00
Seigo Nonaka
21f2a605e0
Merge "Merge "Do not compute outside given range in TextLine" into qt-dev am: 01082fe6ae am: a2778ebe0d am: dbf4d68906" into qt-qpr1-dev-plus-aosp
...
am: db0955b685
2019-09-18 13:56:55 -07:00
TreeHugger Robot
51cf32b4f3
Merge "Camera: fix NPE from bad requestID" into qt-qpr1-dev
2019-09-18 20:54:27 +00:00
Seigo Nonaka
d3b0b630e4
Merge "Do not compute outside given range in TextLine" into qt-dev am: 01082fe6ae am: a2778ebe0d am: 57c3c50762
...
am: be4ad2dcc2
2019-09-18 13:53:47 -07:00
Android Build Merger (Role)
db0955b685
Merge "Merge "Do not compute outside given range in TextLine" into qt-dev am: 01082fe6ae am: a2778ebe0d am: dbf4d68906" into qt-qpr1-dev-plus-aosp
2019-09-18 20:47:21 +00:00
Seigo Nonaka
be4ad2dcc2
Merge "Do not compute outside given range in TextLine" into qt-dev am: 01082fe6ae am: a2778ebe0d
...
am: 57c3c50762
2019-09-18 13:45:49 -07:00
Seigo Nonaka
5bdfa1b338
Merge "Do not compute outside given range in TextLine" into qt-dev am: 01082fe6ae am: a2778ebe0d
...
am: dbf4d68906
2019-09-18 13:45:49 -07:00
Mohammad Samiul Islam
cfe7b31c5b
Merge "Pass sessionId instead of whole object during pre-reboot verification"
2019-09-18 20:32:35 +00:00
