drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,287 Commits 1 Branch 0 Tags
Commit Graph

54287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shimeng (Simon) Wang
1151fe78fc Prevent set mInitialScale being overridden by mDefaultScale. 
If mInitialScale is set, use it as the default scale; otherwise,
it'll be overridden by default density in case of book app where
mobile fixed viewport is used; since today the default scale is used
to calculate the mobile fixed viewport.

issue: 4982074
Change-Id: I21c2bf41478bb97351cb3fb1cc3735ab7d75e164
 2011-07-08 14:38:38 -07:00
Mathias Agopian
3a831d24e9 fix screen on/off animation (again) 
- surfaceflinger now uses the GL-convention of
  placing the origin in the left-bottom corner

- map texture coordinates of the screen capture
  properly

- add the ability to control the animation
  speed through a debug property

Bug: 4989276

Change-Id: Ifb3297bb578078b47146fff666c01f85417e0d6f
 2011-07-08 14:37:06 -07:00
Mathias Agopian
1861786a97 Fix EGLUtils::selectConfigForPixelFormat() 
- renderscript now calls EGL directly instead of relying on this function
- surfaceflinger also does its own EGLConfig selection
- selectConfigForPixelFormat stays for legacy reason (many tests use it) but
it now only tries to match the alpha channel of the format rather than the
format itself.

this will allow implementations who don't support the exact formats
defined in the HAL to work properly.

Bug: 4998223

Change-Id: Ic664dfc14d5072a514b6f77a115d1521bfc1578f
 2011-07-08 14:37:05 -07:00
Ben Dodson
6d8b80dd8c Get server's listening channel 
Change-Id: Ia1cb3486a4ba502185efdcf6d7bcf0f37bb55261
 2011-07-08 14:36:42 -07:00
James Dong
0aaa30dc48 Merge "Use advertised h264 encoding parameters by default if the profile is not baseline" 2011-07-08 14:17:16 -07:00
Glenn Kasten
916a63a53e Merge "Fix build warning; LOG_TAG was misplaced" 2011-07-08 14:06:24 -07:00
RoboErik
b3a86c86e7 Merge "Pseudo-final api fixes to CalendarContract" 2011-07-08 14:05:42 -07:00
RoboErik
58644028f9 Pseudo-final api fixes to CalendarContract 
This removes the public projections and makes them arguments
that are passed in instead.

Change-Id: Ic9807d4994a9f2798b0ecf9a63194193715931e0
 2011-07-08 13:48:53 -07:00
Jim Miller
edbff0df92 Merge "Fix 4689527: Improved curation for Recents + misc cleanup" 2011-07-08 13:14:38 -07:00
Wink Saville
ae367419df resolved conflicts for merge of e4a56a32 to master 
Change-Id: I50f8fe61303efa78f5d450ddda1483e0ecb81d12
 2011-07-08 12:49:14 -07:00
Christopher Tate
f24ee7f1f5 Merge "Can now restore a subset of apps from historical dataset" 2011-07-08 12:48:48 -07:00
John Reck
effa7523f4 Merge "NPE guard in setupViewport" 2011-07-08 12:43:22 -07:00
Christopher Tate
284f1bb4da Can now restore a subset of apps from historical dataset 
Adds the ability to filter a restore of an historical dataset so that it
only restores certain apps' data regardless of what is actually present
in the dataset.  This is currently only used by the bmgr command-line tool,
for debugging / developer support.

Bug 2021590

Change-Id: I7685e5d609b0f5506f71d70c26410602bb387659
 2011-07-08 12:28:48 -07:00
Wink Saville
d5cabff96a am a736cd54: am 848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE 
* commit 'a736cd54e1de62e84a7a49a3c68c56fc6d9bfc00':
  No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
 2011-07-08 12:28:27 -07:00
Romain Guy
44476779ae Merge "Correctly position layers." 2011-07-08 11:58:18 -07:00
Romain Guy
b2479153b7 Correctly position layers. 
Change-Id: I1678b1c5bdab140b44e56556c50ab8329255f18a
 2011-07-08 11:57:29 -07:00
Kristian Monsen
7cec24f747 Merge "Merge Chromium at r12.0.742.93: New autofill string" 2011-07-08 11:31:33 -07:00
John Reck
d4324aa101 NPE guard in setupViewport 
Bug: 4163660

Change-Id: Ie74072094c0dbfca4391cf898420544884101c1f
 2011-07-08 11:23:39 -07:00
Gilles Debunne
fa53d3002f Animation settings reset to default 
Change-Id: Ie53c031ceb88d356742e80693edc14198506d54a
 2011-07-08 11:21:09 -07:00
Robert Greenwalt
532fee45e2 Merge "Remove unused setHttpProxy." 2011-07-08 11:06:55 -07:00
Robert Ly
d9f91425fc am 6b98e712: am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2 
* commit '6b98e7128b3fbfd8b2c421286c403e4609c69708':
  cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
 2011-07-08 10:44:10 -07:00
James Dong
be650872f8 Use advertised h264 encoding parameters by default if the profile is not baseline 
o Force to use AVC baseline profile for camcorder low quality videos

Change-Id: I3424c57dd0c55fc4991f5767b57695c8f3420ecb
 2011-07-08 10:44:05 -07:00
Joe Malin
f84bb99771 am 230ef987: am 0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2 
* commit '230ef98728f3b59a81f55dab5129aa50d5f27969':
  DOC CHANGE: Change GTV info on intro page
 2011-07-08 10:41:54 -07:00
Joe Fernandez
d1c15f96dd am 20f65201: am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2 
* commit '20f6520197a6b70123d2ff7c466ee58349ae3032':
  cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
 2011-07-08 10:41:35 -07:00
Robert Ly
6b98e7128b am 3f3b8cbf: Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2 
* commit '3f3b8cbfa775f2ebff985c069300f8daaeb7a84c':
  cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052
 2011-07-08 10:39:46 -07:00
Robert Ly
3f3b8cbfa7 Merge "cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052" into honeycomb-mr2 2011-07-08 10:13:28 -07:00
Narayan Kamath
6dabb63307 Add event-log logging for TTS requests. 
Change-Id: I5023194c469a602b85259088a2e59373c96a941e
 2011-07-08 17:55:25 +01:00
Wink Saville
3ef341cda5 am 7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE 
* commit '7283bb9323c83621a818c387bb80fe1bc9d6aa7c':
  Disconnect ApnContexts in INITING state when error.
 2011-07-08 09:40:11 -07:00
Wink Saville
e4a56a32ac am 8171e6f6: Use resetConnections with resetMask. 
* commit '8171e6f690cca1bad354e7e352823d79d420daf3':
  Use resetConnections with resetMask.
 2011-07-08 09:40:08 -07:00
Wink Saville
a736cd54e1 am 848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE 
* commit '848aa3ab8a00835c5af2ead954c7736e507249b5':
  No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
 2011-07-08 09:40:03 -07:00
Joe Malin
230ef98728 am 0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2 
* commit '0e89d916f078a518093c476725fa7e0798dcc590':
  DOC CHANGE: Change GTV info on intro page
 2011-07-08 09:39:25 -07:00
Joe Fernandez
20f6520197 am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2 
* commit '0fbe1dfb8df94a51d79e9a42fcbaebed6f6e516e':
  cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c
 2011-07-08 09:39:22 -07:00
Glenn Kasten
8d67e53dd9 Fix build warning; LOG_TAG was misplaced 
Change-Id: I4fb0590f626445188f9053367707878b2fa0fa30
 2011-07-08 09:32:50 -07:00
Kristian Monsen
918b183295 Merge Chromium at r12.0.742.93: New autofill string 
Added a string that we now use.

Change-Id: I6df3f2b5c2f01e4d757dadb048cb53bfe9819ff9
 2011-07-08 16:45:10 +01:00
Jim Miller
3c728fe61d Fix 4689527: Improved curation for Recents + misc cleanup 
This sets a threshhold for both the curation animation as well as the
snap back animation.  It now limits these to 500ms and 250ms, respectively.

Cleaned up misc log spew.

Updated after review.

Change-Id: Ie11a2fc4556b396257c33c3ebd7513c4c220ff95
 2011-07-07 22:18:25 -07:00
Wink Saville
7283bb9323 Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE 2011-07-07 22:00:56 -07:00
Romain Guy
221bfab842 Merge "Cleanup" 2011-07-07 21:35:19 -07:00
Romain Guy
cfacbeadff Cleanup 
Change-Id: I2a9dc34e907b4c6e60f8c2999150b22015012e74
 2011-07-07 21:33:41 -07:00
Romain Guy
e92096fa6a Merge "Use NEAREST filtering mode for TextureView.getBitmap()." 2011-07-07 21:28:41 -07:00
Romain Guy
ec19b4a764 Use NEAREST filtering mode for TextureView.getBitmap(). 
Change-Id: I4649062bbdf18ebba7924bdf578f39ad8f6576ac
 2011-07-07 21:27:14 -07:00
Adam Powell
7024e0b902 Merge "Add ALL CAPS style to TextView/TextAppearance" 2011-07-07 20:55:10 -07:00
Romain Guy
69abbd8791 Merge "Use NEAREST filtering for layers whenever possible." 2011-07-07 20:55:08 -07:00
Romain Guy
9ace8f5e79 Use NEAREST filtering for layers whenever possible. 
Change-Id: Id5bee1bd4a322cf93e8000b08e18f1e1b058648e
 2011-07-07 20:50:11 -07:00
Adam Powell
7f8f79a1ff Add ALL CAPS style to TextView/TextAppearance 
Switch out ugly hack in action menu items for the new style.

Change-Id: I68a0ed62a352b14d499e6478b82bbc12dcb5a030
 2011-07-07 20:39:41 -07:00
Joe Malin
0e89d916f0 Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2 2011-07-07 18:19:18 -07:00
Ramesh Sudini
910e80478d Disconnect ApnContexts in INITING state when error. 
When DCT tears down a link due to error, the ApnContexts which are in INITING state are
not torndown. Due to this the DC refCount does not hit 0, and the Data Link is not torndown.

Bug: 4973894
Change-Id: If1263f360d55f6874220235fede294909db4837e
 2011-07-07 16:35:52 -07:00
Michael Jurka
4a6d113ba0 Merge "Handling Resources.NotFoundException in Recents" 2011-07-07 16:28:03 -07:00
Jason Sams
d015327223 Merge "Fix more type info caching bugs." 2011-07-07 16:24:51 -07:00
Jason Sams
ad37cb26cd Fix more type info caching bugs. 
Change-Id: I917a1190ec12fe954c9bf51ffd446ef564837e68
 2011-07-07 16:17:36 -07:00
Shimeng (Simon) Wang
ab5a5e6748 Merge "Update viewport asap." 2011-07-07 16:17:16 -07:00