Commit Graph

7180 Commits

Author SHA1 Message Date
Wale Ogunwale
0170fb8281 Merge "Avoid configuration of callback being reset after relayout."
am: cbcafde45e

* commit 'cbcafde45ec28d62ce674d215c0264f41580d9a6':
  Avoid configuration of callback being reset after relayout.
2015-11-12 16:01:22 +00:00
riddle_hsu
164725c652 Avoid configuration of callback being reset after relayout.
mPendingConfiguration is a parameter of IWindowSession.relayout.
And IWindowSession.aidl declared "out Configuration outConfig",
it will always create a new configuration for remote side to write.
If remote side does not write (WMS does not have config change),
the new default configuration will be returned.

In original code passes mPendingConfiguration to updateConfiguration
directly, then callbacks (sConfigCallbacks) receive the same
instance of mPendingConfiguration. And because the implementation
of callback may use the configuration after relayout has reset
the configuration to default, then it may have timing that results
"showing hybrid of portrait and landscape modes" which try to fix
in commit e36d6e27.

To avoid this, always create a copy to updateConfiguration.
MSG_RESIZED_REPORT from dispatchResized also did the same thing.

Related commit:
e36d6e277e
694f79b5d1

Change-Id: Ic1abd596e384918224b3a7020583d9a04641cccc
2015-11-12 14:07:12 +08:00
Wale Ogunwale
be02134cbc am fceaedda: am 75693994: Merge "Disassociate system windows from apps"
* commit 'fceaedda41f9133a4d4213720b15950ef43dd00c':
  Disassociate system windows from apps
2015-10-16 14:00:47 +00:00
Wale Ogunwale
fceaedda41 am 75693994: Merge "Disassociate system windows from apps"
* commit '75693994f60bdec9a10db98ddb8addd2bc3f8bbb':
  Disassociate system windows from apps
2015-10-16 13:54:54 +00:00
tiger_huang
ff58e30aca Disassociate system windows from apps
With the original logic, if an app creates a system window, when the
user goes to home screen, the system window will be still there and
become unable to receive input events, because the system window will
be also changed to the stopped state with the app window, and the
current logic of ViewRootImpl forbid a stopped window receiving input
events.

This change prevents assigning the token of the app window to system
windows created by the app, so that when the app goes to the stopped
state, its system windows won't be affected (can still receive input
events).

This change is related to the following changes:
a5d29971f8
15ed2754a3
c3672cd3f7
41725dedc3

Bug:
https://code.google.com/p/android/issues/detail?id=189710

Change-Id: I515e47bafcf39a2b1bdf92f11f623bef8fb6263c
2015-10-16 12:30:38 +08:00
Alan Viverette
bbd8315daa am ff953294: am d9635e60: am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev
* commit 'ff9532940084a89b4cfe89bc954e7d8af1c695f0':
  Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR
2015-10-13 00:19:30 +00:00
Alan Viverette
d9635e60f0 am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev
* commit 'c83a6121d214631c0a52be5b2c5c8ce2f6470ed0':
  Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR
2015-10-12 19:46:31 +00:00
Alan Viverette
c83a6121d2 Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev 2015-10-12 19:41:10 +00:00
Tim Murray
b2387e650b am 6c271b89: am f3acc630: am 01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
* commit '6c271b898c080303c24e524022dd6e4552bda5f5':
  Ensure SurfaceView requests WM relayout when size changes.
2015-10-07 23:39:16 +00:00
Tim Murray
f3acc63015 am 01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
* commit '0135690688c8285e022a2a8191c8582f2e6ea759':
  Ensure SurfaceView requests WM relayout when size changes.
2015-10-07 23:28:13 +00:00
Robert Carr
57caeb5703 Ensure SurfaceView requests WM relayout when size changes.
In the case of scaled SurfaceViews with a fixed size.
It is possible for the surface layout size to change
without a change to the surface size or position. In this
case we need to inform the window manager so it can update
frames and scaling. This has presented in Camera and required
workarounds such as changing the fixed surface size to trigger
an update (leading to visual artifacts).

Bug:23974105
Change-Id: I195aa0832907c32874b294101b56e198e853dce5
(cherry picked from commit a8fe43f09c)
2015-10-07 20:39:11 +00:00
Alan Viverette
3b49317977 Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR
Bug: 24657825
Change-Id: Ifa61fe934b3e2467e86c71b37b4f3ede40989e96
2015-10-05 11:13:02 -04:00
Justin Harrison
46db0f2215 am 08b00423: am 1f463957: am 91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev
* commit '08b004233537f625044b3f01e2923b600a9aa77c':
  Add support for setting color transforms
2015-09-19 00:46:19 +00:00
Justin Harrison
1f46395702 am 91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev
* commit '91f2123b2a6d534372ab9b7c8e6ac0c62cf33ae6':
  Add support for setting color transforms
2015-09-19 00:29:40 +00:00
Michael Wright
58e829f71d Add support for setting color transforms
Bug: 24038268
Change-Id: I05275c906e02eb9e67331f6f909166eb08ad5536
2015-09-18 23:37:28 +00:00
Christine Hallstrom
c4f196b661 am 039fd00f: am 13c23df9: Merge "Manual \'cherry pick\' to fix CTS tests for MediaControllerTest." into cw-e-dev
* commit '039fd00fd2b499a871be8551d80d299120ff5595':
  Manual 'cherry pick' to fix CTS tests for MediaControllerTest.
2015-09-18 22:06:38 +00:00
Christine Hallstrom
2eb7d4761e Manual 'cherry pick' to fix CTS tests for MediaControllerTest.
This is to manually apply a patch of code that should have
propagated to E, but hasn't and is breaking one of the CTS
tests for MediaControllerTest on Nemo.

The original reverted change can be found at ag/723643.

Bug: 24172957
Change-Id: I925ff561a56531ebf9f8d8b4ce56156ae7feb9fc
2015-09-18 21:27:38 +00:00
Alan Viverette
c602c57737 am 48c7e6f3: am 24ff6823: Merge "prevent unnecessary warning logs caused by View.toString()"
* commit '48c7e6f3dc0462f43657b6003e4ba4021b0544ed':
  prevent unnecessary warning logs caused by View.toString()
2015-09-18 20:19:27 +00:00
Alan Viverette
48c7e6f3dc am 24ff6823: Merge "prevent unnecessary warning logs caused by View.toString()"
* commit '24ff6823c411f794aceaae89b0b029fbf8ef6b29':
  prevent unnecessary warning logs caused by View.toString()
2015-09-18 20:11:44 +00:00
Alan Viverette
24ff6823c4 Merge "prevent unnecessary warning logs caused by View.toString()" 2015-09-18 19:59:20 +00:00
kenzyun_chen
90ebb99b36 prevent unnecessary warning logs caused by View.toString()
If the id is negative, it is not from Resource.
Passing the negative value to getResourcePackageName makes AssetManager dump unnecessary warning logs.
It is reasonable not to get package/type/entry information for the negative id.

The warning logs :
W/ResourceType( 3711): No known package when getting name for resource
number 0x9b010100

Change-Id: Ic89acb4f32205ba5a2fdac61dc14b00ccf251148
2015-09-18 18:30:30 +08:00
Nick Armstrong-Crews
13d2fa50b0 am 740cf71c: am 56ecfcce: Handle KEYCODE_SOFT_SLEEP from Ungaze.
* commit '740cf71c9978e5dcb0a68b6558531a52dc26d44f':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.
2015-09-08 05:28:51 +00:00
Nick Armstrong-Crews
56ecfcce6c Handle KEYCODE_SOFT_SLEEP from Ungaze.
Needed for Ungaze to trigger "soft sleep" (respecting wake locks); operates by
sending new KEYCODE_SOFT_SLEEP to PhoneWindowManager, which calls
PowerManagerService's new method setUserInactiveOverride (thereby
causing immediate sleep, modulo wakelocks, upon next iteration of
PowerManagerService's main loop).

BUG: b/23589870
Change-Id: Iddafdde923605d119075e890eeda5d3fd3fd2bc7
2015-09-07 21:46:50 -07:00
Nick Armstrong-Crews
d70377b537 am 36afc2b7: am 9b8f82a3: Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev
* commit '36afc2b76743b2b2803da20dc6a8b2142d1f9b17':
  Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."
2015-09-08 04:43:38 +00:00
Nick Armstrong-Crews
9b8f82a3a0 Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev 2015-09-08 04:28:07 +00:00
Nick Armstrong-Crews
b331bf9514 Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."
This reverts commit 677adf1e66.

Hiding new keycode to prevent change to public API before resubmitting.

Change-Id: Ic43273dd0c7ade1d51a36b77f363543f1df466e8
2015-09-08 04:25:01 +00:00
Nick Armstrong-Crews
7f37402d8c am 43c4459d: am 6f0ba402: Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev
* commit '43c4459d995ce7a723d92945a7e4ccb81d48e224':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.
2015-09-04 18:22:54 +00:00
Nick Armstrong-Crews
6f0ba40224 Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev 2015-09-04 18:04:12 +00:00
Nick Armstrong-Crews
677adf1e66 Handle KEYCODE_SOFT_SLEEP from Ungaze.
Needed for Ungaze to trigger "soft sleep" (respecting wake locks); operates by
sending new KEYCODE_SOFT_SLEEP to PhoneWindowManager, which calls
PowerManagerService's new method setUserInactiveOverride (thereby
causing immediate sleep, modulo wakelocks, upon next iteration of
PowerManagerService's main loop).

BUG: b/23589870
Change-Id: I24a96bd6db8ff28674c907f2898e49c4f6140209
2015-09-04 10:20:22 -07:00
Dan Stoza
8dcd14cdc9 am 4a90942e: am f615872c: am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
* commit '4a90942ea75039f916d8371111fdc41a80039b98':
  SurfaceControl: Add colorTransform to DisplayInfo
2015-09-04 02:21:41 +00:00
Dan Stoza
f615872cb4 am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev
* commit '0b887e579b766012c09626e7089a3fade5415ee6':
  SurfaceControl: Add colorTransform to DisplayInfo
2015-09-03 22:03:08 +00:00
Dan Stoza
904f485bc6 SurfaceControl: Add colorTransform to DisplayInfo
Adds the colorTransform field, which defines a vendor-specific color
transform (e.g., wide gamut, sRGB, etc.) to the PhysicalDisplayInfo
class, and populates it from the corresponding field from
ISurfaceComposer.

Bug: 20853317
Change-Id: Ic59ca5142bdaa73c42d9c044d7aae345255f1dad
2015-09-03 13:38:39 -07:00
Jorim Jaggi
f757bed7f7 am 7b933895: am e3238e53: am b774e554: Optimize fp touch to wake: Shortcut for report next draw
* commit '7b933895481813425358bcfe56e0c1afa902a6d2':
  Optimize fp touch to wake: Shortcut for report next draw
2015-08-28 20:37:52 +00:00
Jorim Jaggi
e3238e53de am b774e554: Optimize fp touch to wake: Shortcut for report next draw
* commit 'b774e554f32fd65cac30b43d1cf679403ef4af82':
  Optimize fp touch to wake: Shortcut for report next draw
2015-08-28 20:19:31 +00:00
Jorim Jaggi
b774e554f3 Optimize fp touch to wake: Shortcut for report next draw
When telling window manager that Keyguard window is in the correct
state for a fp-touch-to-wake sequence, it takes more than 1 frame at
the moment because the signal that WM is waiting for the next draw
is delayed by one frame because it is posted at the end of the
runnable queue.

To correctly fix this, we should post it at the beginning at the
queue, but this is way too risky this late. Instead, add a isolated
SysUI hack to report it faster.

Bug: 23401557
Change-Id: Icf64101e27611c7c01d108123021b22186f1e70c
2015-08-28 20:07:35 +00:00
Dianne Hackborn
c42545fbd7 am 4e47ff8d: am 1dd818db: am eed29a71: am 53d6cddb: Merge "Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today" into mnc-dev
* commit '4e47ff8d276d25193fe5506b6a6ad4a3367b2f41':
  Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today
2015-08-07 18:50:01 +00:00
Dianne Hackborn
1dd818dbb2 am eed29a71: am 53d6cddb: Merge "Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today" into mnc-dev
* commit 'eed29a71098284dbcd5bbbd2041c692eb3eb6a1d':
  Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today
2015-08-07 18:35:50 +00:00
Michael Wright
773c2238f3 am 1c4c740d: am 97e77627: Merge commit \'9dd2663d\' into mm
* commit '1c4c740d7f70e4924a76924d4a007da3c9316a0a':
  DO NOT MERGE. Add new media navigation keys.
2015-08-07 18:30:38 +00:00
Michael Wright
97e7762782 Merge commit '9dd2663d' into mm
Change-Id: Idf37dbc3bba970817e6620fe0129e54e86f553d5
2015-08-07 19:13:34 +01:00
Dianne Hackborn
207c6908cb am 53d6cddb: Merge "Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today" into mnc-dev
* commit '53d6cddb4137c7b5648fc069adcc0cf6c501a6c4':
  Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today
2015-08-07 17:26:11 +00:00
Dianne Hackborn
53d6cddb41 Merge "Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today" into mnc-dev 2015-08-07 17:18:11 +00:00
Michael Wright
56700e24b4 am d7255cfb: Merge "DO NOT MERGE. Add new media navigation keys." into mnc-dev
* commit 'd7255cfb1cf8dc7249632d93d68daac8cc2c7b9c':
  DO NOT MERGE. Add new media navigation keys.
2015-08-07 16:57:44 +00:00
Michael Wright
600b984760 DO NOT MERGE. Add new media navigation keys.
Bug: 22059484
Change-Id: Ifd8fd18178fed45ead2980b957dd1d177e40f165
2015-08-07 14:46:05 +01:00
Dianne Hackborn
6ff55fcb85 Fix issue #22846750: Starting Screenie Now On Tap crashes USA Today
Try to deal well with badly behaving old apps.

Change-Id: Ibc41e5867869463fbf91f3e411c69677909fedad
2015-08-06 22:54:46 -07:00
Yohei Yukawa
94381db0dd am f4b8c343: am 9aebdb4c: am d7d14033: am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev
* commit 'f4b8c343219f14f56c2c1b86ee9e84e0b7487ece':
  Revert "Do not forceLayout when window is resized"
2015-08-04 21:18:50 +00:00
Yohei Yukawa
9aebdb4c39 am d7d14033: am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev
* commit 'd7d14033af438b88053454e7d73c1689eaa77c35':
  Revert "Do not forceLayout when window is resized"
2015-08-04 20:54:48 +00:00
Yohei Yukawa
1fdac7a859 am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev
* commit '2d34a8b7181635c0ff0b1f2390d70e3ac6960f00':
  Revert "Do not forceLayout when window is resized"
2015-08-04 20:03:24 +00:00
Yohei Yukawa
2d34a8b718 Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev 2015-08-04 19:51:20 +00:00
Alan Viverette
ac13014e5f am 41343c0f: am 6550e461: am 0568a230: am 9d8a230f: Revert "View measurement optimization"
* commit '41343c0f287863488a10a429d88ec094e9183938':
  Revert "View measurement optimization"
2015-08-01 17:05:22 +00:00
Dianne Hackborn
628b412584 am bc2a8843: am b97c5ddd: am 9b36f526: am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev
* commit 'bc2a88431e3dc51e2245cc28e327f11d0c78bd56':
  Change MNC codename to just M.
2015-08-01 17:04:28 +00:00