Commit Graph

7205 Commits

Author SHA1 Message Date
Adam Lesinski
7160459611 Merge "Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()" 2016-03-29 18:24:39 +00:00
Markus Michler
d8dfbef6b2 Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()
Change-Id: I772bb9fc2f09bec31276e859d21735dc4282c1f3
2016-03-02 12:31:17 +01:00
Neil Fuller
69c2907c63 Merge "Fix @code escapes"
am: b0d92f4717

* commit 'b0d92f4717af4e4736dc80b2a822dae8e5a52587':
  Fix @code escapes
2016-01-15 16:31:40 +00:00
Neil Fuller
9498e8a8d2 Fix @code escapes
The body of {@code} must not be HTML escaped. This is one of
several changes that fix the source in conjunction with a
doclava fix.

Bug: 25757239
(cherry-picked from commit 71fbb81b14)

Change-Id: I19dafddc6501be6fee362c396ac5bbdc934ae39d
2016-01-15 16:14:57 +00:00
Alan Viverette
c8ef3f8730 Don\'t verify the scrollbar drawable am: a53c3b2197
am: ca6b87fea6

* commit 'ca6b87fea6b16e38f8bbbd514d3cf07361a5feba':
  Don't verify the scrollbar drawable
2016-01-14 21:49:09 +00:00
Alan Viverette
a53c3b2197 Don't verify the scrollbar drawable
Avoids infinite invalidations caused by re-use of scrollbar drawable
during a single draw() pass. Does not address the general problem of
drawable reuse causing unnecessary invalidations as a result of calls
to setBounds() invoking invalidateSelf().

Bug: 26533725
Change-Id: I99e9c2dfe4ddfc833569e40e7268dcb03e931fc9
2016-01-14 21:07:13 +00:00
Chenjie Luo
af8c1b8f94 Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96 am: d5cea64d8d
am: 7034a6e2d0

* commit '7034a6e2d05c45c437bef6150bcc70b58b3ccb3b':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
2016-01-14 02:34:53 +00:00
Chenjie Luo
bad498f7fd Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
Bug: 25860409
Change-Id: I3f525c9c8df81807d98391c70cd2d1f8c139c8f5
2016-01-14 01:26:05 +00:00
Ian Pedowitz
105108209f Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev am: 624d43b66f
am: 0cd5e9f475

* commit '0cd5e9f475cd31535ad33a6d2151f2270bd3f29c':
  Revert "Avoid drawable invalidation during draw()"
2016-01-13 23:10:29 +00:00
Alan Viverette
156bd49bdc Revert "Avoid drawable invalidation during draw()"
This reverts commit e5e59c6da4.

Drawables expect to be able to call invalidateSelf() during
draw() to pump animation frames. We shouldn't break this.

Bug: 26533725
Change-Id: Ibe2871f2622faf836637225fc1e3e6f0ca6def47
2016-01-13 21:49:10 +00:00
Alan Viverette
ea2e422c23 Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-dev am: cf6885b7b7
am: c783ebc13a

* commit 'c783ebc13a350f3f83dbe0713af9581e39b355ec':
  Avoid drawable invalidation during draw()
2016-01-12 20:43:33 +00:00
Alan Viverette
e5e59c6da4 Avoid drawable invalidation during draw()
Prevents infinite invalidation loop when reusing a drawable asset within
a single draw() call. Also reduces unnecessary extra invalidations due to
drawable setters (ex. setBounds()) being called during draw().

Bug: 26329675
Change-Id: I31b3c99e8efd4193415cc562a84c8939a2f56c2d
(cherry picked from commit 8cda8e9159)
2016-01-12 15:07:47 +00:00
Daniel Koulomzin
3f66df086a Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am: cbef517d02 am: 898e330aae
am: 94794af6be

* commit '94794af6bee35c249857f0440c361d589b77aa5d':
  Making ViewRootImpl drop input events when the Activity is in ambient mode.
2015-12-18 12:15:10 -08:00
Daniel Koulomzin
087ae471c2 Making ViewRootImpl drop input events when the Activity is in ambient
mode.

WearableActivityController tells ViewRootImpl about ambient mode.

Bug: 25912259
Bug: 25973146
Bug: 25714113
Change-Id: Idcca2b254db3145039f50f2a7dfd38a224ec287e
2015-12-18 12:56:00 -05:00
John Reck
04ce46db64 Merge "libhwui: make setSurface asynchronous"
am: 738a5d4f18

* commit '738a5d4f18e69c03700b77af0ea7e2a101da2c34':
  libhwui: make setSurface asynchronous
2015-12-16 18:44:57 +00:00
Thomas Buhot
0bcd0cb6b1 libhwui: make setSurface asynchronous
On the critical path of the cold launch of applications
the main thread of the started application tells the RenderThread
to create a surface. This process is synchronous and blocks
the main thread of the application until the creation
of the EGLContext is complete.
As a consequence the launch time of the application is delayed
by time spent allocating the EGL Context in the RenderThread.

With this optimization the launch time of any application
is improved (for example settings by 20 to 40 ms).

Change-Id: Ibf47aaa0abb8dedf7aa00693073db3785d9d6b08
Signed-off-by: Thomas Buhot <thomas.buhot@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
2015-12-10 14:51:58 +08:00
Michael Wright
37c8bcbcc9 Merge "Add support for locking the screen when the lid is closed" am: 9dc3c36c9c
am: 4d9e6190b1

* commit '4d9e6190b186f1d2e1cd25defd0d6e12dd833b38':
  Add support for locking the screen when the lid is closed
2015-12-08 10:55:07 +00:00
Prashant Malani
54909b8e6b Merge "Add rotary encoder input source" into cw-e-dev am: 487f0d3d15 am: 6344cb8144
am: 3ebd5ceb90

* commit '3ebd5ceb90137572262efeda12cdce4b503ddded':
  Add rotary encoder input source
2015-12-08 01:43:27 +00:00
Prashant Malani
487f0d3d15 Merge "Add rotary encoder input source" into cw-e-dev 2015-12-08 01:27:18 +00:00
Michael Wright
4d9e6190b1 Merge "Add support for locking the screen when the lid is closed"
am: 9dc3c36c9c

* commit '9dc3c36c9cd796d90b65543567495d910d266e4c':
  Add support for locking the screen when the lid is closed
2015-12-07 23:19:53 +00:00
Edward Savage-Jones
7def60daa0 Add support for locking the screen when the lid is closed
This commit adds configurable support for lockscreen
behaviour when the user has a device cover/lid.  This
is intended for lids with a viewing window so that the
user can see the time and interact with apps via the
window.

Change-Id: Id71883f66d1a180c4732912b3b59cabf9f4d7b6e
2015-12-04 18:26:31 +01:00
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
29ffdc91b8 am be655510: Merge "Disassociate system windows from apps" into mnc-dr-dev
* commit 'be6555105a9325d0b7073c08a0bd4dc0b5ce1fb3':
  Disassociate system windows from apps
2015-10-16 16:18:45 +00:00
Wale Ogunwale
be6555105a Merge "Disassociate system windows from apps" into mnc-dr-dev 2015-10-16 16:14:45 +00:00
tiger_huang
20ebb4c2d4 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: 24967303
Bug: https://code.google.com/p/android/issues/detail?id=189710

Change-Id: I515e47bafcf39a2b1bdf92f11f623bef8fb6263c
2015-10-16 08:21:45 -07: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