Oren Blasberg
306ceb84b4
Merge "Accommodate NaN in new context menu methods." into nyc-dev am: a86d1e0
...
am: 1fab8d9
* commit '1fab8d995e74de2128b45d9cae294c8d5ccf2fc6':
Accommodate NaN in new context menu methods.
Change-Id: Ifaf625d13b5dc57cf69f10ef1af99aef4acfecb6
2016-04-26 23:16:14 +00:00
Oren Blasberg
a86d1e0b59
Merge "Accommodate NaN in new context menu methods." into nyc-dev
2016-04-26 22:41:01 +00:00
sergeyv
47591b04dc
Merge "DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB" into nyc-dev
...
am: c015719
* commit 'c015719954d9a1c0a53f277f68405401207a0c65':
DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB
Change-Id: I3f5e7bd67b57d074939e1db6ef0651ade46d31bf
2016-04-26 21:44:54 +00:00
Sergei Vasilinetc
c015719954
Merge "DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB" into nyc-dev
2016-04-26 21:39:43 +00:00
Jaewan Kim
0f360d80ad
Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn\'t exist" into nyc-dev
...
am: bdc4700
* commit 'bdc4700155f5ff89e213cb0e9efe49897b888f7d':
PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist
Change-Id: Ic77538cac9562acf878c7c56f443a691e9d0b45f
2016-04-26 06:08:59 +00:00
Jaewan Kim
f0fd218382
PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist
...
Bug: 27954955
Change-Id: I517e378d5c1672ac0eb87bdf4375b7d733276e58
2016-04-26 13:06:21 +09:00
Clara Bayarri
dea459c750
Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev
...
am: f48f390
* commit 'f48f390a60694df6f4b72bd0ac462dd19c5e1191':
Improve KeyboardShortcutInfo documentation for Modifiers
Change-Id: I36a85346b9b5a8606b75cf670ddbc67ab9831377
2016-04-25 09:39:35 +00:00
Clara Bayarri
f48f390a60
Merge "Improve KeyboardShortcutInfo documentation for Modifiers" into nyc-dev
2016-04-25 09:31:06 +00:00
Chris Banes
bdc696607b
Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev
...
am: b02d51b
* commit 'b02d51b3d31b1a49ddc7c7e7db97b576d6e4f78f':
Make AbsSavedState read using given ClassLoader
Change-Id: If0e2679ca978a0423ff26e7b0f416d09c50ab70b
2016-04-23 07:09:22 +00:00
Chris Banes
b02d51b3d3
Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev
2016-04-23 07:04:21 +00:00
Andres Morales
2e9c311abd
Merge "FrameMetricsListener API council changes" into nyc-dev
...
am: 82ee675330
* commit '82ee6753305b484d778743882fb827c6b73d82c1':
FrameMetricsListener API council changes
Change-Id: I8ea921d0f7d4658ee0b9827e9b38637c9d370922
2016-04-22 16:34:17 +00:00
Andres Morales
82ee675330
Merge "FrameMetricsListener API council changes" into nyc-dev
2016-04-22 16:31:21 +00:00
Chris Banes
02e81a094f
Make AbsSavedState read using given ClassLoader
...
Currently it does not use a ClassLoader to read
any super state, which can cause crashes for
custom views using the class but on a different
class loader.
BUG: 27790353
Change-Id: I4f4d1d72f213f2481606673643c0e56c23d34bc6
2016-04-22 13:52:08 +01:00
John Reck
59311fb7c9
Merge "Fix flag value collision" into nyc-dev
...
am: e5cebf7aaa
* commit 'e5cebf7aaa1a1eaa16bbb8b039a572e19e0a5542':
Fix flag value collision
Change-Id: I7efb08917bbab1c3594b23fd256ba6fa2e68ba6e
2016-04-21 23:30:10 +00:00
Tim Murray
e5cebf7aaa
Merge "Fix flag value collision" into nyc-dev
2016-04-21 22:59:42 +00:00
John Reck
60e885f672
Fix flag value collision
...
Bug: 28314544
Change-Id: If73c1e8fd0e7b313bccbeffa172bdc3ab9496a43
2016-04-21 15:40:45 -07:00
sergeyv
3d8298e1a8
DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB
...
bug:26943116
Change-Id: If72c9f21ca2d8eb660ea2db4a42c8199f8d02472
2016-04-21 14:48:04 -07:00
Vladislav Kaznacheev
45b1e14468
Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev
...
am: 729c640cc8
* commit '729c640cc887da9fe7a1b57121167a7bf83fee97':
Rename DropPermissions to DragAndDropPermissions
Change-Id: I4a43cc10586d548befffa182d89382071ba412e7
2016-04-21 21:43:08 +00:00
Vladislav Kaznacheev
729c640cc8
Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev
2016-04-21 21:34:26 +00:00
Andres Morales
d908c6294d
FrameMetricsListener API council changes
...
Bug: 28296251
Change-Id: I8fe0d8b37c0a3220666570f242f9c20fa16b78ab
2016-04-21 14:20:42 -07:00
Robert Carr
674bedee2e
Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev
...
am: 37696cccd8
* commit '37696cccd8925ca6e4aa6f2ca6f29807066c7f1e':
Respect manually set HARDWARE_ACCELERATED flag.
Change-Id: I2b63fc161dc7dccf21080ad7dd27d9b958808ad1
2016-04-21 20:01:15 +00:00
Rob Carr
37696cccd8
Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev
2016-04-21 19:52:02 +00:00
Clara Bayarri
77b4fda89c
Improve KeyboardShortcutInfo documentation for Modifiers
...
This was a request from API council
Bug: 28295817
Change-Id: I2b80dc9877fdd473cec89abdd0c06df15799796a
2016-04-21 10:33:11 +01:00
Vladislav Kaznacheev
bd048c598d
Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev
...
am: 28609360cf
* commit '28609360cfe25446ab5b0ba165af363378b3d805':
Add JavaDoc for View.updateDragShadow
Change-Id: I2d5488d78f4095cdfa3558dc0a4e3a785c420648
2016-04-21 00:18:20 +00:00
TreeHugger Robot
28609360cf
Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev
2016-04-21 00:02:08 +00:00
Vladislav Kaznacheev
ea4d221c42
Add JavaDoc for View.updateDragShadow
...
Bug: 28296402
Change-Id: I2aec5ab9932c3177cb08dbf1210abfd949e0dab7
2016-04-20 14:40:32 -07:00
Oren Blasberg
23e282d297
Accommodate NaN in new context menu methods.
...
Bug: 28296401
Change-Id: I0ae6067e1ae01c342c1b39d6f64db5dcd02492d5
2016-04-20 14:28:39 -07:00
Vladislav Kaznacheev
377c32845b
Rename DropPermissions to DragAndDropPermissions
...
Bug: 28296057
Change-Id: Ic95cb4ae9c351d903df78628e983dec2bacd0ad5
2016-04-20 14:22:23 -07:00
Ruchi Kandoi
5e292bf51f
Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev
...
am: a645c97
* commit 'a645c9753ff004e616a6df4a15c9d2e999508d91':
window: Adds a Sustained Performance Mode window flag.
Change-Id: Ib839ac8cd7dfa0e216de46bb8b343787d230a36c
2016-04-20 21:14:47 +00:00
Trevor Johns
c0d2c43a22
Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev
...
am: 59c9a93
* commit '59c9a93fc268e226495d4ee8cf7c507c2ea2c433':
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of a5060ee to nyc-dev
Change-Id: Iddc9419069d8f5d555baf0c1ef4b2f2ebf75c370
2016-04-20 21:12:38 +00:00
Robert Carr
13678ee74e
Respect manually set HARDWARE_ACCELERATED flag.
...
When choosing what window parameters to pass on
to child windows, we need to respect the manually set
FLAG_HARDWARE_ACCELERATED from Window.setFlags() in
addition to the activity manifest value, and the value
from setWindowManager. Given that we pass the value
on to child windows from when setWindowManager is called,
I think it makes sense to pass it when setFlags is
called.
Bug: 27099358
Bug: 23036374
Change-Id: Ie018841aadd270910fe0f8bc5a5ddca3bfbee69b
2016-04-20 14:09:55 -07:00
Ruchi Kandoi
a645c9753f
Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev
2016-04-20 20:35:21 +00:00
Trevor Johns
59c9a93fc2
Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev
...
* changes:
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of a5060ee to nyc-dev
2016-04-20 18:35:57 +00:00
Ruchi Kandoi
43e38de253
window: Adds a Sustained Performance Mode window flag.
...
Adds setSustainedPerformanceMode(boolean) API for applications to set
the mode for a given window. The mode will be disabled automatically when the
window is no longer in focus.
Bug: 28150358
Change-Id: Ibe8bc564eeaaccbcaad5c4f792cda16da931dffd
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com >
2016-04-20 09:57:11 -07:00
Jorim Jaggi
4ed3f1dd1c
Merge "Fixes for resize thread" into nyc-dev
...
am: 13219992a0
* commit '13219992a0e8b08195ffd596d40d9ceecbf741e0':
Fixes for resize thread
Change-Id: I2efa14b883a2d9ad31b6e2c4fd72a2b2258adf69
2016-04-20 00:14:31 +00:00
Jorim Jaggi
13219992a0
Merge "Fixes for resize thread" into nyc-dev
2016-04-20 00:07:54 +00:00
Robert Carr
1b72363846
Merge "Force windows to be scalable during pinned animation." into nyc-dev
...
am: 4e9a9df
* commit '4e9a9dfb67ebc48028b1613a03144101d94f7d92':
Force windows to be scalable during pinned animation.
Change-Id: I772d120442ed82c55c71fbf5ce841735d7a14cc5
2016-04-19 22:17:16 +00:00
Rob Carr
4e9a9dfb67
Merge "Force windows to be scalable during pinned animation." into nyc-dev
2016-04-19 22:11:02 +00:00
Jorim Jaggi
0d6222d96d
Fixes for resize thread
...
- Make sure to draw navigation bar/status bar background before the
main render node. This is to avoid any flickering when entering
resizing mode, so you rather overdraw than underdraw.
- Draw the first frame from the main thread directly to increase
chance that all drawing commands are processing within a single
frame.
Bug: 27864358
Bug: 28003586
Change-Id: I033f57cdbcb2c16ea93134c041095a415d5c25b4
2016-04-19 14:41:11 -07:00
Robert Carr
1ca6a33f36
Force windows to be scalable during pinned animation.
...
We resize windows at the beginning of the pinned stack
animation when animating to a larger size, and so for some
duration a resize will be pending. We need to force the window
out of SCALING_MODE_FREEZE so we can animate during this period.
Bug: 27891386
Change-Id: I5cff599ed67f2c179e938662b6f0d99bd790aaba
2016-04-19 12:47:18 -07:00
John Reck
5cc4428bec
Merge "Don\'t reuse LOST_SURFACE for stopped" into nyc-dev
...
am: 9110429
* commit '9110429f0d8acac0d621d805050103fa58953fb9':
Don't reuse LOST_SURFACE for stopped
Change-Id: Ia7c609029215da17c61eb77bd3279c077d1b7713
2016-04-19 14:53:31 +00:00
John Reck
9110429f0d
Merge "Don't reuse LOST_SURFACE for stopped" into nyc-dev
2016-04-19 14:45:16 +00:00
Trevor Johns
682c24e228
Resolve merge conflicts of a5060ee to nyc-dev
...
This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
2016-04-19 02:03:59 -07:00
Wale Ogunwale
a2ce89ce0d
Merge "Use right starting window resource in multi-window mode." into nyc-dev
...
am: 3eefb4c
* commit '3eefb4c313d0269f7e8bd226bdcc2d039f9e5608':
Use right starting window resource in multi-window mode.
Change-Id: Iae72368565a49a177dac4db22c1060f7af77f61b
2016-04-19 00:10:53 +00:00
TreeHugger Robot
3eefb4c313
Merge "Use right starting window resource in multi-window mode." into nyc-dev
2016-04-19 00:04:00 +00:00
Wale Ogunwale
dfc18623ed
Use right starting window resource in multi-window mode.
...
Use the override configuration for the task the app is contained
in to generate resources for the starting window.
Bug: 28220001
Change-Id: I6fdf39a6d6de41287b44b25861a76f58fe58dd53
2016-04-18 15:09:34 -07:00
Michael Wright
c418909e9c
Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e am: c6629bd am: a8064c2 am: bc57aae
...
am: c348fa3
* commit 'c348fa319df3c9980383b904d371ddd93baf5c21':
Add new, hidden MotionEvent flag for partially obscured windows.
Change-Id: I52f9cce7770394fa693cc3016b2c1c22e526427d
2016-04-18 19:08:45 +00:00
Michael Wright
c348fa319d
Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e am: c6629bd am: a8064c2
...
am: bc57aae
* commit 'bc57aaed0e9ac88a63fa989dba145dc35d048c48':
Add new, hidden MotionEvent flag for partially obscured windows.
Change-Id: I7663785a6877f61eaec121303dbdcedcbd242ec6
2016-04-18 19:03:25 +00:00
Michael Wright
bc57aaed0e
Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e am: c6629bd
...
am: a8064c2
* commit 'a8064c2a8b54881bceade03a9d2f6c1223e055f3':
Add new, hidden MotionEvent flag for partially obscured windows.
Change-Id: I4e8d2bff82a3308c5966a0b0c154209b727db669
2016-04-18 18:57:54 +00:00
Michael Wright
a8064c2a8b
Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e
...
am: c6629bd
* commit 'c6629bd5dff622a26683269f9201b8d7871c6ef1':
Add new, hidden MotionEvent flag for partially obscured windows.
Change-Id: I0d602765de707548ede0b1c0a6a38790626e7da1
2016-04-18 18:52:13 +00:00