Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
173,059 Commits 3 Branches 0 Tags
83e5329b3bbffd5d737c852f0b3216598372a4e7
Commit Graph

6227 Commits

Author SHA1 Message Date
George Mount
ed22607780 am 341df464: am c07b6295: am 12403b24: Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev 
* commit '341df46488576899773cdfd438033fccc077ed83':
  Make setOutlineProvider change transitionGroup.
 2014-11-11 15:53:05 +00:00
George Mount
341df46488 am c07b6295: am 12403b24: Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev 
* commit 'c07b6295c6fefe845ae15e2adad7aebb2280b1ab':
  Make setOutlineProvider change transitionGroup.
 2014-11-11 15:48:52 +00:00
George Mount
12403b242f Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev 2014-11-11 15:41:33 +00:00
Florian Salbrechter
940e97f802 Merge "Fixed missing opening quotes for href in javadoc." 2014-11-11 11:25:39 +00:00
Dan Sandler
f2d9b00832 am 34f24aef: am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev 
* commit '34f24aef58b015709447cb09bad5f7ae0ca7989c':
  Fix inset hinting when adding window
 2014-11-10 22:13:03 +00:00
Dan Sandler
34f24aef58 am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev 
* commit 'eba923ccce573ac9f426d58d79e23a1fcd8ee1a7':
  Fix inset hinting when adding window
 2014-11-10 22:04:09 +00:00
Adrian Roos
37d7a68de7 Fix inset hinting when adding window 
Windows with FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS were
getting an incorrect content inset hint, because the
hinting didn't see the adjusted systemUiVisibility.

Also adds hinting for the stable insets.

Bug: 17508238
Change-Id: If9647277feb6811b15665b801accd896c51dbd12
 2014-11-10 17:46:57 +01:00
John Reck
e19093cad8 am f1923c36: am 8dda03a0: am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev 
* commit 'f1923c368c5c08a477b9f94dea6a499798d91d4f':
  Have an actual fallback if the surface is lost
 2014-11-07 23:01:00 +00:00
John Reck
f1923c368c am 8dda03a0: am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev 
* commit '8dda03a08603f45b3c2c90633491ce2c1fea266b':
  Have an actual fallback if the surface is lost
 2014-11-07 22:55:32 +00:00
John Reck
ca93f69c96 Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev 2014-11-07 22:41:03 +00:00
John Reck
28b73f7743 am 692135ef: am 76adcd6e: am ea4e76f6: Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev 
* commit '692135effb19df4da42ab8070ebdb29479bd9df0':
  Fix finalizer ordering/double-free issue
 2014-11-07 19:45:45 +00:00
John Reck
692135effb am 76adcd6e: am ea4e76f6: Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev 
* commit '76adcd6ec551637f57f2630a60f6cdb2bbbf908b':
  Fix finalizer ordering/double-free issue
 2014-11-07 19:41:08 +00:00
John Reck
ea4e76f68a Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev 2014-11-07 19:29:47 +00:00
John Reck
65f2defdfc resolve merge conflicts of cabf8a7 to master. 
Change-Id: If0ca1c37d05f5dc471d88a3bf158dd68a1880bbf
 2014-11-07 11:29:08 -08:00
John Reck
aa95a88327 Have an actual fallback if the surface is lost 
Bug: 17516789

This will force a relayout/reinitialize pass if the Surface
is lost mid-render instead of crashing on the next frame

Change-Id: If08bfa16f740728fa7c05904fa11e26f07b81e2e
 2014-11-07 11:02:07 -08:00
John Reck
cabf8a7064 am f7d3ce6a: am 4b19b7aa: Merge "Fix wrong-thread issue" into lmp-mr1-dev 
* commit 'f7d3ce6a3ca88b23a227e29a5fa3285e24f7b2b1':
  Fix wrong-thread issue
 2014-11-07 18:48:43 +00:00
John Reck
4b19b7aaff Merge "Fix wrong-thread issue" into lmp-mr1-dev 2014-11-07 18:34:55 +00:00
John Reck
c298f9c917 Fix finalizer ordering/double-free issue 
Bug: 18289984

If Surface:finalize() happens after HwuiContext:finalize()
it would try to manipulate a destroyed object. However, as
Surface:finalize() always calls HwuiContext:destroy() this
can be fixed by simply getting rid of HwuiContext's finalizer

Change-Id: I7c912214417ab32891b1c58d045c9721e5f01965
 2014-11-07 10:33:36 -08:00
John Reck
12f5e34332 Fix wrong-thread issue 
Bug: 18259560

Change-Id: Ic63a86efba9c86f21defac0695a73db8b09ae284
 2014-11-07 10:31:53 -08:00
Florian Salbrechter
9fdfbb4b38 Fixed missing opening quotes for href in javadoc. 
Change-Id: I3a09b605e3430a6e540311c4d5e299050cc6236f
 2014-11-07 16:15:05 +00:00
Winson Chung
c5f9ec3e27 am 675a0b6b: am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '675a0b6bc9ee2f2e80f28381c0f34d98e0447ad6':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 04:17:02 +00:00
Winson Chung
675a0b6bc9 am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '513aa79290dd17400c4cce82d1d801c05ff3776f':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 01:45:11 +00:00
Winson Chung
3ed9f2f903 Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 2014-11-07 01:30:20 +00:00
Justin Koh
402a360111 am 4ca342cd: am 2d42f484: am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 
* commit '4ca342cdba6fb2637415cfeb6e579cc662763daf':
  Hide Surface#lockHardwareCanvas DO NOT MERGE
 2014-11-07 00:05:54 +00:00
Winson Chung
044d52934e Adding bounce animation for affiliated tasks. (Bug 16656169) 
Change-Id: I39e4a57c4e6b707d15513dacde2d40c23bb05058
 2014-11-06 14:02:35 -08:00
Justin Koh
2d42f48449 am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 
* commit 'b8038d58da04456e9e7b6e264af69226bf21592c':
  Hide Surface#lockHardwareCanvas DO NOT MERGE
 2014-11-06 20:33:36 +00:00
George Mount
427c64140d Make setOutlineProvider change transitionGroup. 
Bug 18203878

Change-Id: Ia343477b8b37566e0fd8fd1a275b56e805bb18dc
 2014-11-05 16:57:41 -08:00
Alan Viverette
8df94b5659 am b6416716: am 6a98dde8: am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 
* commit 'b6416716ad875a800c982dda77bafe910f9ed2d6':
  Use default token instead of wrapped window manager
 2014-11-05 05:03:59 +00:00
Alan Viverette
b6416716ad am 6a98dde8: am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 
* commit '6a98dde8dffac83283850afaec4400db9146a3e5':
  Use default token instead of wrapped window manager
 2014-11-05 04:56:40 +00:00
Alan Viverette
9342b049b9 Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 2014-11-05 04:44:22 +00:00
Alan Viverette
838b7b6d05 am e48b397f: am 405165b6: am a446195b: Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev 
* commit 'e48b397f93fb7ed4b7520d72368c2b4472f7cf5f':
  Fix hasSurfaceInsets check when creating hardware renderer
 2014-11-05 04:18:26 +00:00
Alan Viverette
a47e3e0572 am 69eb010b: am a77e349a: am 9c95264e: Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev 
* commit '69eb010b1e2bc002b020b2722cc42447383bb5d3':
  Abort accessibility node prefetch if parent node is null
 2014-11-05 04:18:16 +00:00
Alan Viverette
e48b397f93 am 405165b6: am a446195b: Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev 
* commit '405165b6cd749d0281bb1daa13bdf0a8f38112d9':
  Fix hasSurfaceInsets check when creating hardware renderer
 2014-11-05 04:06:21 +00:00
Alan Viverette
69eb010b1e am a77e349a: am 9c95264e: Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev 
* commit 'a77e349a3609833c55ee3b8b80fc5eef5fac4f1a':
  Abort accessibility node prefetch if parent node is null
 2014-11-05 04:05:58 +00:00
Alan Viverette
a446195b0d Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev 2014-11-05 02:09:30 +00:00
Alan Viverette
9c95264e84 Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev 2014-11-05 01:41:28 +00:00
Alan Viverette
d2fa514391 Use default token instead of wrapped window manager 
BUG: 18248602
Change-Id: Id7f06c896dc71db3564fa21d3704222557613035
 2014-11-04 17:40:29 -08:00
Alan Viverette
2cd23e6b9d Fix hasSurfaceInsets check when creating hardware renderer 
BUG: 17729606
Change-Id: I8c7092428b790e0ff3bbf84b64ba385ef2b2f521
 2014-11-04 17:04:02 -08:00
Alan Viverette
84feea1185 Abort accessibility node prefetch if parent node is null 
BUG: 18004444
Change-Id: I80757daeb6b381947c4f3abbd762711cff2a978c
 2014-11-04 15:59:55 -08:00
Tom Hudson
a5545d24c7 Merge "Remove status return from all uirenderer::Renderer functions" 2014-11-04 21:05:29 +00:00
Tom Hudson
107843de45 Remove status return from all uirenderer::Renderer functions 
This moves the interface closer to android::Canvas. The only use of
return values was in the OpenGLRenderer subclass; that is replaced
with an internal dirty flag: returned from finish(), checked by
CanvasContext.

This is part of a series of CLs to refactor the Graphics JNI bindings.

BUG:15672762
R=djsollen@google.com,ccraik@google.com

Change-Id: Ifd533eb8839a254b0d3a5d04fc5a2905afdfc89e
 2014-11-04 15:49:44 -05:00
Alan Viverette
12a72ada52 am 954f2567: am 3fff156e: am 18b055e1: Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev 
* commit '954f2567f90f1fa8b3d3d7d0c426ebd35494e182':
  Pass surface insets from window attributes rather than params
 2014-11-04 19:45:08 +00:00
Alan Viverette
954f2567f9 am 3fff156e: am 18b055e1: Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev 
* commit '3fff156e13341b0bf818f83d2bb0e9404285dd0c':
  Pass surface insets from window attributes rather than params
 2014-11-04 19:40:08 +00:00
Alan Viverette
93cad8c4d4 Pass surface insets from window attributes rather than params 
Params only gets set in certain situations, whereas the actual window
attributes always contain the correct surface insets.

BUG: 18214798
Change-Id: Ib5236ccf3f120b26c5abc8671bf29cb3dc269186
 2014-11-04 11:27:19 -08:00
Justin Koh
7c1ad0cac6 Hide Surface#lockHardwareCanvas DO NOT MERGE 
Hide this for now, will be public in a later release.

Change-Id: Ie13438ed10918df8b044103ef04016494aed1d10
 2014-11-04 11:26:14 -08:00
John Reck
d0f91ebaef am 43973c9d: am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev automerge: 9280480 
* commit '43973c9d732d74dec12e796fb40ae285c1687d6a':
  Fix cancel crash
 2014-11-03 18:41:39 +00:00
John Reck
43973c9d73 am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev 
automerge: 9280480

* commit '928048040cb5cd205ff5e74f9393dca2371c519a':
  Fix cancel crash
 2014-11-03 18:32:20 +00:00
John Reck
1787b4ea43 Merge "Fix cancel crash" into lmp-mr1-dev 2014-11-03 18:27:41 +00:00
John Reck
55b46eff39 Fix cancel crash 
Bug: 18059003
Change-Id: I579468fbd1645049f8fbe335faf4da1f2d3bb0a3
 2014-11-03 10:00:33 -08:00
Adrian Roos
017c8dc878 am 1814f14c: am 808fe6f9: Merge "Fix colored status bar panning issues" into lmp-mr1-dev automerge: fcad9e1 
* commit '1814f14c7d2ddfb0ccf0c8283bc7638059fc9af8':
  Fix colored status bar panning issues
 2014-11-03 15:53:57 +00:00