Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155,086 Commits 3 Branches 0 Tags
60cd9904bcf0ee55307bdadae04ea0bc77f63652
Commit Graph

44342 Commits

Author SHA1 Message Date
Alan Viverette
60cd9904bc am 1f8f3695: am 1f211a18: am 3778a6aa: Merge "Remove partial support for hotspot changes on focus movement" into lmp-dev 
* commit '1f8f369519429a7d7606217e2545369525db996d':
  Remove partial support for hotspot changes on focus movement
 2014-09-03 23:59:33 +00:00
Alan Viverette
f8cf4cdf90 am 1f211a18: am 3778a6aa: Merge "Remove partial support for hotspot changes on focus movement" into lmp-dev 
* commit '1f211a187fe60814f2b7729919600fb30c93475b':
  Remove partial support for hotspot changes on focus movement
 2014-09-03 23:45:30 +00:00
John Reck
385052e24b am e31c5e7e: am 0f6c29dc: am ef908af6: Merge "Have destroy call freePrefetchedLayers" into lmp-dev 
* commit 'e31c5e7e07556d6b8775ab05cb61683b78c9bb4e':
  Have destroy call freePrefetchedLayers
 2014-09-03 19:57:34 +00:00
Matthew Williams
f79808b110 am 2f58db1c: am 3e3a7489: am f390c6ac: Merge "Add timeout when waiting to bind to JobService" into lmp-dev 
* commit '2f58db1cd33065c9170d8036554eba9ca79b2589':
  Add timeout when waiting to bind to JobService
 2014-09-03 19:25:10 +00:00
George Mount
d9481d090b am 5b0b4cde: am aecaeaf1: am 62667650: Merge "Fix ChangeTransform to work with interruptions" into lmp-dev 
* commit '5b0b4cde07cb6e016215d2f06add36cf70ff84e0':
  Fix ChangeTransform to work with interruptions
 2014-09-03 19:24:15 +00:00
George Mount
cd93a304b6 am d2c53b71: am 1a91de15: am dd815989: Merge "Additional fixes for "back" with translucent windows." into lmp-dev 
* commit 'd2c53b71cf41db9c443bfeec3e595c1fc4058ef8':
  Additional fixes for "back" with translucent windows.
 2014-09-03 19:24:10 +00:00
Esteban Talavera
5fcad0a6b0 resolved conflicts for merge of 82b53329 to master 
Change-Id: Icfdf1a9b563560ca7998f9f9d403df33eff94a46
 2014-09-03 19:57:35 +01:00
John Reck
842bb5be58 am 0f6c29dc: am ef908af6: Merge "Have destroy call freePrefetchedLayers" into lmp-dev 
* commit '0f6c29dc47d4a9607e79480460a67837c527fd56':
  Have destroy call freePrefetchedLayers
 2014-09-03 18:33:24 +00:00
Alan Viverette
94b88e7103 Merge "Remove partial support for hotspot changes on focus movement" into lmp-dev 2014-09-03 18:31:47 +00:00
John Reck
2d72dd2e3e Merge "Have destroy call freePrefetchedLayers" into lmp-dev 2014-09-03 18:18:31 +00:00
Matthew Williams
61dd95f7ba am 3e3a7489: am f390c6ac: Merge "Add timeout when waiting to bind to JobService" into lmp-dev 
* commit '3e3a7489f074b5f2234d32499cdf229da6562d46':
  Add timeout when waiting to bind to JobService
 2014-09-03 18:14:26 +00:00
John Reck
17035b0211 Have destroy call freePrefetchedLayers 
Bug: 17208461

 There's a potential race condition between HardwareRenderer.destroy()
 being called (which calls destroyCanvasAndSurface()) and the renderer
 being finalized (which is what calls freePrefetchedLayers), during which
 time it's possible we get a TRIM_MEMORY_COMPLETE and destroy the EGL
 context.

 Fix this race condition by moving stopDrawing() and freePrefetchedLayers()
 into destroyCanvasAndSurface() where they should have been in the first
 place.

 Also, if we hit the assertion failure, dump the current state of
 Caches to try and provide more context for the failure.

Change-Id: Ife0ba3562041e8b08e87e3e13640472b3004eed6
 2014-09-03 11:13:53 -07:00
Wally Yau
61ab997c37 am 09adc7e0: am 77f65a70: am afa51609: Merge "New keycode definitions for TV remotes." into lmp-dev 
* commit '09adc7e03b3df93e3f2ae819de8f5487c46703be':
  New keycode definitions for TV remotes.
 2014-09-03 18:04:45 +00:00
Dake Gu
103fc6da2a am a9d6e6e3: am e3842811: am a45b03f8: Merge "ActivityTransition: fix activity not finished on back" into lmp-dev 
* commit 'a9d6e6e3088e36ba731a801e676045bf65e557a8':
  ActivityTransition: fix activity not finished on back
 2014-09-03 18:04:32 +00:00
Brian Carlstrom
9844fdbd9e am 4421aaf7: am 66ce8faf: am ef3d85a5: Merge "Fix DevicePolicyManager javadoc" into lmp-dev 
* commit '4421aaf7558be72d83d453817f93741f267d5516':
  Fix DevicePolicyManager javadoc
 2014-09-03 17:55:29 +00:00
Matthew Williams
5bdc16974a Merge "Add timeout when waiting to bind to JobService" into lmp-dev 2014-09-03 17:49:07 +00:00
George Mount
705dedb2f5 am aecaeaf1: am 62667650: Merge "Fix ChangeTransform to work with interruptions" into lmp-dev 
* commit 'aecaeaf1b06ef68b074e719b2efae1b7525a70b1':
  Fix ChangeTransform to work with interruptions
 2014-09-03 17:48:12 +00:00
George Mount
31dce2b27f am 1a91de15: am dd815989: Merge "Additional fixes for "back" with translucent windows." into lmp-dev 
* commit '1a91de154e18d54b07d2c51da7f74c8f4590e8a0':
  Additional fixes for "back" with translucent windows.
 2014-09-03 17:48:07 +00:00
Matthew Williams
75fc5258b7 Add timeout when waiting to bind to JobService 
BUG: 17322886

bindService() to an invalid service might never actually result in
onServiceConnected being called , for e.g. if the client service doesn't
actually implement JobService. This wastes an execution slot as we end
up waiting forever.

Also made the javadocs clearer for the JobScheduler class.

Change-Id: Ie15ebbe18c0b7579f2ab77dd46428d354ef632c3
 2014-09-03 10:47:27 -07:00
Chet Haase
0ec25ec781 am a37305ff: am c26fbab0: am c22d9103: Merge "Fix TransitionManager.go() to allow null transitions" into lmp-dev 
* commit 'a37305ff54fe18c2dd43bf407407e061f8c791a9':
  Fix TransitionManager.go() to allow null transitions
 2014-09-03 17:42:55 +00:00
George Mount
613a5f8805 am 3f1f97f9: am 12b7c53c: am 10e15c3a: Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 
* commit '3f1f97f9cff3ffa28ad00bbeeada7ec70ae5c6bd':
  Make Fragment Transitions match Acitivty Transitions API
 2014-09-03 17:42:12 +00:00
Esteban Talavera
6bf9c6350a am 67330f8c: am 5607db79: Merge "Pass ComponentName to probing certificate methods" into lmp-dev 
* commit '67330f8c077570c870846b7618b5196827483c84':
  Pass ComponentName to probing certificate methods
 2014-09-03 17:37:01 +00:00
Wally Yau
a5aa2b913b am 77f65a70: am afa51609: Merge "New keycode definitions for TV remotes." into lmp-dev 
* commit '77f65a70035e07c29fe74cf08bb9e7efe9b144c7':
  New keycode definitions for TV remotes.
 2014-09-03 17:36:48 +00:00
George Mount
66946e22b1 Merge "Fix ChangeTransform to work with interruptions" into lmp-dev 2014-09-03 17:30:24 +00:00
George Mount
d847f1a1e3 Merge "Additional fixes for "back" with translucent windows." into lmp-dev 2014-09-03 17:30:09 +00:00
George Mount
99c82fd1de Additional fixes for "back" with translucent windows. 
Ensure background is mutated before changing its alpha.
Ensure resetViews is called when activity options is set.

Bug 16215650

Change-Id: I8482532777652a93b2c0d05c1b902516d281baf0
 2014-09-03 17:29:57 +00:00
George Mount
dc19ac008c Fix ChangeTransform to work with interruptions 
Bug 17372872

If ChangeTransform was interrupted after its animation completed,
but before the parent's Transition completed, it would think
that its start location was relative to its parent's current
position and not relative to its end position.

Change-Id: Iad25aafc03c41c1e0a7530548fb38acafbaffb8e
 2014-09-03 17:29:06 +00:00
Dake Gu
fa28163129 am e3842811: am a45b03f8: Merge "ActivityTransition: fix activity not finished on back" into lmp-dev 
* commit 'e384281179ad3a71fcb16e071fa4a575b3e7926c':
  ActivityTransition: fix activity not finished on back
 2014-09-03 17:26:00 +00:00
Esteban Talavera
aa924b52e9 Merge "Pass ComponentName to probing certificate methods" into lmp-dev 2014-09-03 17:22:41 +00:00
Wally Yau
a25d54ffb0 Merge "New keycode definitions for TV remotes." into lmp-dev 2014-09-03 17:15:50 +00:00
Dake Gu
dd725ec4a7 Merge "ActivityTransition: fix activity not finished on back" into lmp-dev 2014-09-03 17:07:09 +00:00
Brian Carlstrom
a27a0b379d am 66ce8faf: am ef3d85a5: Merge "Fix DevicePolicyManager javadoc" into lmp-dev 
* commit '66ce8faf4cefa5bc9b240c748b60f5eb287f0852':
  Fix DevicePolicyManager javadoc
 2014-09-03 16:28:40 +00:00
Brian Carlstrom
f1fe51b914 Fix DevicePolicyManager javadoc 
Bug: 17126717
Change-Id: Ib1d83a0e2003296ec1e17fa7c43e32c55b044df3
 2014-09-03 09:00:06 -07:00
Chet Haase
688f9161d0 am c26fbab0: am c22d9103: Merge "Fix TransitionManager.go() to allow null transitions" into lmp-dev 
* commit 'c26fbab03aa7a38ce6310ca01d6f880df62dd0bf':
  Fix TransitionManager.go() to allow null transitions
 2014-09-03 15:43:03 +00:00
Christoph Studer
eaae6de994 am a8c199d8: am 5df1917f: am 342ece75: Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 
* commit 'a8c199d8fa51d431d047be231a650e8142239ee1':
  NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT
 2014-09-03 15:35:54 +00:00
Sander Alewijnse
e3a406ee1e am b41ea75b: am a0e6069c: am 727738ad: Merge "Add the provisioning extra admin extras bundle." into lmp-dev 
* commit 'b41ea75b7dff212e89682e07ee80224ea831e499':
  Add the provisioning extra admin extras bundle.
 2014-09-03 15:35:49 +00:00
Yohei Yukawa
e86e1bcd65 am 1831e14c: am d88a1f97: am ebb6b422: Merge "API Review: InputConnection" into lmp-dev 
* commit '1831e14ce41e911d32328a87400a90b42ecd3238':
  API Review: InputConnection
 2014-09-03 15:35:43 +00:00
Lorenzo Colitti
160e7e25b9 am 967c87e6: am 703c2eb9: am 1ae4e750: Merge "Kill the NetworkInfo(int type) constructor. IT\'S A TRAP!" into lmp-dev 
* commit '967c87e6e38a673d57e9dd293201f4a1ba1f3b46':
  Kill the NetworkInfo(int type) constructor. IT'S A TRAP!
 2014-09-03 15:35:27 +00:00
Svetoslav
d3fd195a02 am 14aa5b1a: am a7a98dc6: am 551335a3: Merge "Fix AccessibilityNode\'s isVisibleToUser behavior." into lmp-dev 
* commit '14aa5b1a651ebf9b824b8f1614d72cb581f91af1':
  Fix AccessibilityNode's isVisibleToUser behavior.
 2014-09-03 15:35:18 +00:00
George Mount
8021261c89 am 12b7c53c: am 10e15c3a: Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 
* commit '12b7c53c52c450a0717749ca464805ddfa4277f3':
  Make Fragment Transitions match Acitivty Transitions API
 2014-09-03 15:34:23 +00:00
Chet Haase
95f3bcdce0 Merge "Fix TransitionManager.go() to allow null transitions" into lmp-dev 2014-09-03 15:19:29 +00:00
Christoph Studer
8f4b3a9119 am 5df1917f: am 342ece75: Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 
* commit '5df1917f8349b842812a5af430862d167a5b0ed6':
  NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT
 2014-09-03 14:56:39 +00:00
Chet Haase
5a7cf3eeeb Fix TransitionManager.go() to allow null transitions 
The doc'd behavior of go() is that a null transition is equivalent
to just switching to a scene with no transition. The actual behavior
was an NPE crash.

Issue #17342291 TransitionManager.go() with null Transition parameter throws NPE unlike documentation

Change-Id: I9416aa6e307f80eefc201ca3264fd64f8587ac2f
 2014-09-03 07:53:15 -07:00
Sander Alewijnse
75dd22c135 am a0e6069c: am 727738ad: Merge "Add the provisioning extra admin extras bundle." into lmp-dev 
* commit 'a0e6069c54b3e505199df50108bf0a38bee17170':
  Add the provisioning extra admin extras bundle.
 2014-09-03 14:35:45 +00:00
Yohei Yukawa
8bb3b4331c am d88a1f97: am ebb6b422: Merge "API Review: InputConnection" into lmp-dev 
* commit 'd88a1f9790bfaaa6540f65d76827274d716a2539':
  API Review: InputConnection
 2014-09-03 14:35:32 +00:00
Lorenzo Colitti
0c2c72295c am 703c2eb9: am 1ae4e750: Merge "Kill the NetworkInfo(int type) constructor. IT\'S A TRAP!" into lmp-dev 
* commit '703c2eb9924220110d37a386f4783208c7da90bf':
  Kill the NetworkInfo(int type) constructor. IT'S A TRAP!
 2014-09-03 14:35:20 +00:00
Svetoslav
e09626e454 am a7a98dc6: am 551335a3: Merge "Fix AccessibilityNode\'s isVisibleToUser behavior." into lmp-dev 
* commit 'a7a98dc6b88aa757f48f626d6a49ffad22626058':
  Fix AccessibilityNode's isVisibleToUser behavior.
 2014-09-03 14:34:47 +00:00
George Mount
a2327aacac Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 2014-09-03 14:21:47 +00:00
Alan Viverette
7b9b90e9f5 am f1db0fca: am 0fd03d91: am b975fe87: Merge "Fix accessibility events emitted from TwoStatePreference" into lmp-dev 
* commit 'f1db0fcaafb7faf5437415e35bbc3c74bd626684':
  Fix accessibility events emitted from TwoStatePreference
 2014-09-03 13:49:31 +00:00
Adam Powell
b1e7fab278 am 0e55581c: am 9f7a5fae: am 1b17f939: Merge "Automatically supply a content description for ToolbarActionBar nav" into lmp-dev 
* commit '0e55581c1bb7f707653e2df99fe1336331e12a6e':
  Automatically supply a content description for ToolbarActionBar nav
 2014-09-03 13:49:16 +00:00