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

44361 Commits

Author SHA1 Message Date
Dan Sandler
2e7fb6d92a am 5069f587: am c0a4823d: am cdb9de6a: Merge "Reduce RAM requirements of grayscale icon testing" into lmp-dev 
* commit '5069f58767329b20695564c093900773d555416b':
  Reduce RAM requirements of grayscale icon testing
 2014-09-04 00:01:31 +00:00
Svetoslav
f4b6ac2553 am 7c86efe6: am 068d7dd0: am c23f9664: Merge "NumberPicker not announcing current selection." into lmp-dev 
* commit '7c86efe6e8c95736ab59c511d2003ae45ac2d018':
  NumberPicker not announcing current selection.
 2014-09-04 00:00:56 +00:00
Eino-Ville Talvala
751e932d93 am 1b16ae37: am 5bb3b70b: am 25c35986: Merge "JobScheduler: Fix doc build break" into lmp-dev 
* commit '1b16ae372561674c1eabdf6ff5d1014e3551a91d':
  JobScheduler: Fix doc build break
 2014-09-04 00:00:51 +00:00
Amith Yamasani
3a3bea2825 am 9a1850be: am 7202fd15: am f27739f7: Merge "Add some @SystemApi tags for internal user-related APIs" into lmp-dev 
* commit '9a1850be6f21b47d9d8f4fad2187a360ede59de5':
  Add some @SystemApi tags for internal user-related APIs
 2014-09-04 00:00:30 +00:00
Matthew Xie
0a1a6a27bd am 7331f668: am 59cd77e9: am 0465993a: Merge "Close the base socket when bindListen fails" into lmp-dev 
* commit '7331f668e47c197876ac52d312f93b06e7fb9622':
  Close the base socket when bindListen fails
 2014-09-03 23:59:54 +00:00
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
Dan Sandler
5b01afa072 am c0a4823d: am cdb9de6a: Merge "Reduce RAM requirements of grayscale icon testing" into lmp-dev 
* commit 'c0a4823dfb0381c810f8610660d723cd5048d989':
  Reduce RAM requirements of grayscale icon testing
 2014-09-03 23:48:39 +00:00
Svetoslav
4fe51bf45a am 068d7dd0: am c23f9664: Merge "NumberPicker not announcing current selection." into lmp-dev 
* commit '068d7dd0b7ed5bd633045b7a7a61f9b8ed0bdeee':
  NumberPicker not announcing current selection.
 2014-09-03 23:47:54 +00:00
Eino-Ville Talvala
067ef0f682 am 5bb3b70b: am 25c35986: Merge "JobScheduler: Fix doc build break" into lmp-dev 
* commit '5bb3b70b4614ee5075474d63246d5205f7656720':
  JobScheduler: Fix doc build break
 2014-09-03 23:47:33 +00:00
Amith Yamasani
1a48d88f09 am 7202fd15: am f27739f7: Merge "Add some @SystemApi tags for internal user-related APIs" into lmp-dev 
* commit '7202fd15a22c2f36dee702eb04f415d36882ee32':
  Add some @SystemApi tags for internal user-related APIs
 2014-09-03 23:46:53 +00:00
Matthew Xie
2e0c5d32c3 am 59cd77e9: am 0465993a: Merge "Close the base socket when bindListen fails" into lmp-dev 
* commit '59cd77e9258e2604020b54b7df7c0a78ffe68ddb':
  Close the base socket when bindListen fails
 2014-09-03 23:46:17 +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
Dan Sandler
d1dc910eff Merge "Reduce RAM requirements of grayscale icon testing" into lmp-dev 2014-09-03 22:15:38 +00:00
Dan Sandler
05c362d564 Reduce RAM requirements of grayscale icon testing 
The isGrayscale family of methods is designed to identify
drawables and bitmaps that apps are using in the largeIcon
position to pose as small icons in order to get the
appropriate background treatment (a solid blue or gray block
in KK/JB, or geniune selvedge denim in ICS/HC).

We can optimize this search two ways:

(1) Reject immediately any largeIcon that is larger than
    largeIcons should be (64x64dp). We could one day simply
    reject, or resize, these in the notification manager,
    but regardless these are not plausible smallIcon
    subsitutes. This new constraint is commemorated in the
    new name, isGrayscaleIcon().

(2) Shrink the bitmap even smaller before scanning it slowly
    in Java.  This lets native_drawBitmap do the heavy
    lifting across the entire bitmap; we need only scan a
    few pixels.

Bug: 16513124
Change-Id: I3a2b79130ed2465a4aedfbb5a556db7f8a7aa132
 2014-09-03 23:52:47 +02:00
Svetoslav
058e1f5a38 Merge "NumberPicker not announcing current selection." into lmp-dev 2014-09-03 21:29:16 +00:00
Eino-Ville Talvala
93b47603bf JobScheduler: Fix doc build break 
Change-Id: I769da7274fe5e3f64a47c82f893afeee6a11254e
 2014-09-03 20:51:13 +00:00
Svetoslav
ca50566101 NumberPicker not announcing current selection. 
bug:17299486

Change-Id: I73fd33ef3518ef8e6cdd40cd036e8f104dc492b6
 2014-09-03 13:26:34 -07:00
Amith Yamasani
bef1036af7 Merge "Add some @SystemApi tags for internal user-related APIs" into lmp-dev 2014-09-03 20:26:10 +00:00
Amith Yamasani
0e8d7d63ba Add some @SystemApi tags for internal user-related APIs 
Also added an internal isManagedProfile()

Bug: 17371392
Change-Id: Ibcc26771d954505cbd530192bf4a8a25a8d4cae0
 2014-09-03 13:17:28 -07: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 Xie
ddfa8e18fd Merge "Close the base socket when bindListen fails" into lmp-dev 2014-09-03 19:29:03 +00:00
Matthew Xie
726652e9d3 Close the base socket when bindListen fails 
Bug: 10773872
Change-Id: I0a72b2eb65055fa1959070d2dc32d40a573bd6f2
 2014-09-03 19:25:39 +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