Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
250,722 Commits 3 Branches 0 Tags
879f5ba3f7eecda7c204751efc3fbfa58e7001ae
Commit Graph

8205 Commits

Author SHA1 Message Date
Andres Morales
19284570d8 Merge "FrameMetricsListener API council changes" into nyc-dev am: 82ee675330 am: 2e9c311abd 
am: d02093198f

* commit 'd02093198fe84f05c9c062c7a67e26c73aeca41f':
  FrameMetricsListener API council changes

Change-Id: I012b699981d26c6f932c66573b43e8ce93a6e6b0
 2016-04-22 16:38:49 +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
John Reck
be31f33405 Merge "Fix flag value collision" into nyc-dev am: e5cebf7aaa am: bf4e2f742c 
am: eaec808ac5

* commit 'eaec808ac5a3cfc82b3d954f00949760b85986ac':
  Fix flag value collision

Change-Id: Ia999f06d58d128e3ab01109ba9a7237957ce4321
 2016-04-21 23:34:58 +00:00
Tim Murray
eaec808ac5 Merge "Fix flag value collision" into nyc-dev am: e5cebf7aaa 
am: bf4e2f742c

* commit 'bf4e2f742c81c136e4f4a7019026a09dce8a3d98':
  Fix flag value collision

Change-Id: I45d049b899c2171957f8c005267928c07422a411
 2016-04-21 23:32:32 +00: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
Vladislav Kaznacheev
4465add3e1 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev am: 729c640cc8 am: 45b1e14468 
am: 0ee7fecd43

* commit '0ee7fecd437b4ba4676985e072c940a819d46114':
  Rename DropPermissions to DragAndDropPermissions

Change-Id: Id978e6f65b915955d1caff4825d89373f248d168
 2016-04-21 21:48:10 +00: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
001ccdc98f Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev am: 37696cccd8 am: ff54c9eeb2 
am: e42b3f0586

* commit 'e42b3f0586b5055eeb1e77c4b5d52001fcff9c90':
  Respect manually set HARDWARE_ACCELERATED flag.

Change-Id: I84acd6bb147dded75314aa97e21dc8d9446fd43a
 2016-04-21 20:08:18 +00:00
Rob Carr
e42b3f0586 Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev am: 37696cccd8 
am: ff54c9eeb2

* commit 'ff54c9eeb2eeebebcb8d14fd35dfcdcbafa187a6':
  Respect manually set HARDWARE_ACCELERATED flag.

Change-Id: Ie0530121ee8dc34ae41f89acb27eeaf41ddf3534
 2016-04-21 20:03:34 +00: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
Vladislav Kaznacheev
32c8b330df Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev am: 2860936 am: 1a5cc60b39 
am: 24d1f99711

* commit '24d1f997115c8e114900bd2306e4e11a0c05e35f':
  Add JavaDoc for View.updateDragShadow

Change-Id: I7fc6a1b8403687329dd217c09781ccc1887bc331
 2016-04-21 02:10:02 +00: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
Vladislav Kaznacheev
24d1f99711 Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev am: 2860936 
am: 1a5cc60b39

* commit '1a5cc60b3968d54b9c7bf4e6883b3b4ca55821ca':
  Add JavaDoc for View.updateDragShadow

Change-Id: I07bfcff42ea12ae0260c850012d936121b3d3ea6
 2016-04-21 00:17:45 +00:00
TreeHugger Robot
28609360cf Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev 2016-04-21 00:02:08 +00:00
Ruchi Kandoi
e325e5629f Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev am: a645c97 am: 75da7b4 
am: a78d8d3

* commit 'a78d8d303e46b06948e4d2199f9f2942ee09138e':
  window: Adds a Sustained Performance Mode window flag.

Change-Id: I4f2c47cdaa9fa6391e73d725aebb0348ae28f0ac
 2016-04-20 23:05:29 +00:00
Vladislav Kaznacheev
ea4d221c42 Add JavaDoc for View.updateDragShadow 
Bug: 28296402
Change-Id: I2aec5ab9932c3177cb08dbf1210abfd949e0dab7
 2016-04-20 14:40:32 -07:00
Trevor Johns
0392182bff Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93 am: 254f1b8 
am: e1b5670

* commit 'e1b56701fd219227adae615fe81f03d5db4ae433':
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: I8cf43f9ad491c6f23eb5fe0051293267ab2d03bf
 2016-04-20 21:32:39 +00:00
Vladislav Kaznacheev
377c32845b Rename DropPermissions to DragAndDropPermissions 
Bug: 28296057
Change-Id: Ic95cb4ae9c351d903df78628e983dec2bacd0ad5
 2016-04-20 14:22:23 -07:00
Ruchi Kandoi
a78d8d303e Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev am: a645c97 
am: 75da7b4

* commit '75da7b4ad041586d1a7a086467a6e6a76516e15f':
  window: Adds a Sustained Performance Mode window flag.

Change-Id: Id029aa2f10e4d278c385487739978075607f29a1
 2016-04-20 21:17:12 +00:00
Trevor Johns
e1b56701fd Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93 
am: 254f1b8

* commit '254f1b8a43480749b7061129289d34bc15d345a5':
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: I32a3081af9ca5533785c90b7239ffd5b5e69d5bf
 2016-04-20 21:15:11 +00: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
9b23400b05 Merge "Fixes for resize thread" into nyc-dev am: 13219992a0 am: 47606dc20f 
am: b3150d580e

* commit 'b3150d580e869fe85e3aec1b6417a9161acc7400':
  Fixes for resize thread

Change-Id: I6c9d9151edd94b18792875cd25f70f816053e326
 2016-04-20 00:18:57 +00:00
Jorim Jaggi
b3150d580e Merge "Fixes for resize thread" into nyc-dev am: 13219992a0 
am: 47606dc20f

* commit '47606dc20fb12e6fcf9c889d48b1b78b6790561e':
  Fixes for resize thread

Change-Id: I683fcd212936beb48808d016f8cf87a8c5635925
 2016-04-20 00:16:45 +00: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
d51e2981a2 Merge "Force windows to be scalable during pinned animation." into nyc-dev am: 4e9a9df am: 1b72363 
am: 465ff1f

* commit '465ff1f9e61953eb57ab2fe3ff3405abebc79628':
  Force windows to be scalable during pinned animation.

Change-Id: I49a8373aad59842e28847f36511e662c7087d4b3
 2016-04-19 22:28:20 +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
6d1ce48ff1 Merge "Don\'t reuse LOST_SURFACE for stopped" into nyc-dev am: 9110429 am: 5cc4428 
am: 0f694e9

* commit '0f694e945a5b82d75b348d4ce89e2409e0131063':
  Don't reuse LOST_SURFACE for stopped

Change-Id: Ied8d4602334c13c34fab6b7779fbfdd206bf6103
 2016-04-19 14:59:23 +00: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
b7947b49c4 Merge "Use right starting window resource in multi-window mode." into nyc-dev am: 3eefb4c am: a2ce89c 
am: 55ca92d

* commit '55ca92d9a8fc0b0736eadd158ff215da52a82129':
  Use right starting window resource in multi-window mode.

Change-Id: I4c0cf10fcfd19d4a2eff35f098496e1b330221fe
 2016-04-19 00:16:21 +00: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
e6f885912e Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e am: c6629bd am: a8064c2 am: bc57aae am: c348fa3 am: c418909 
am: efb51a0

* commit 'efb51a05afef601ae5286f03ac45558f6dde0849':
  Add new, hidden MotionEvent flag for partially obscured windows.

Change-Id: I0be2af3c08f484ceb69418c5ac044c4d355a0345
 2016-04-18 19:19:36 +00:00