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

49523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
1a517d0c25 Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE 2011-04-28 11:50:15 -07:00
Wink Saville
8daec83f9a Merge "Delay data reconnection after disconnected." into honeycomb-LTE 2011-04-28 11:50:05 -07:00
Conley Owens
5a6a42817d am a60594cb: Fixed bad merge in ViewRoot.java. 
* commit 'a60594cb1c1399f557a82403f7fc7abb7af55250':
  Fixed bad merge in ViewRoot.java.
 2011-04-28 11:49:43 -07:00
Irfan Sheriff
c1f39396b9 am 8f87f838: Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE 
* commit '8f87f8389866058a081e601fc0df45a3527a3150':
  Define Protocol class for use with StateMachine
 2011-04-28 11:48:47 -07:00
Eric Fischer
d17d7f5a4e am b2149f4a: (-s ours) am 1d104476: (-s ours) am a4e7353d: Import revised translations. DO NOT MERGE 
* commit 'b2149f4a11cddba303674298ef543e76ea11475e':
  Import revised translations.  DO NOT MERGE
 2011-04-28 11:48:43 -07:00
Conley Owens
d6eaf9d40c am 4854f70c: Ignore change since file no longer exists 
* commit '4854f70c0881ff44fabd8c261653bd90210bdc22':
  Auto hide virtual keyboard
 2011-04-28 11:48:25 -07:00
Stephen Hines
ac16881490 am 5ac02e73: (-s ours) am 697f8b33: am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1 
* commit '5ac02e73c313935b1af8a536e47f74b616986dfe':
  Check setName() for null string + fix rsRand().
 2011-04-28 11:48:18 -07:00
Irfan Sheriff
8f87f83898 Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE 2011-04-28 11:38:54 -07:00
Irfan Sheriff
3fc75e9267 Define Protocol class for use with StateMachine 
Adds a common namespace for communication across
different state machines

Change-Id: I0a9ae872112567afd35a1dc95ac9283170f3f459
 2011-04-28 11:10:03 -07:00
Conley Owens
a60594cb1c Fixed bad merge in ViewRoot.java. 
Change-Id: If76a320da3ecf0d0e9f366eb7157b195274a9e5f
 2011-04-28 11:06:34 -07:00
John Reck
e0d5ad6a0e Merge "Use previous version if version is a codename" 2011-04-28 10:38:50 -07:00
John Reck
f557740789 Use previous version if version is a codename 
When the version is reported as a codename, use the previous version
 in the user agent string.
 Bug: 4347787

Change-Id: Ie42a2fc2f21975b59ccac5547d813d3e777da468
 2011-04-28 10:27:40 -07:00
Eric Fischer
b2149f4a11 am 1d104476: (-s ours) am a4e7353d: Import revised translations. DO NOT MERGE 
* commit '1d10447631c9478fbf9574c3fde1997cc77ee6e4':
  Import revised translations.  DO NOT MERGE
 2011-04-28 10:25:52 -07:00
Daniel Sandler
fbc07f5a88 Merge "Make InputWindow.h's window types align with WindowManager.java's." 2011-04-28 10:22:49 -07:00
Conley Owens
4854f70c08 Ignore change since file no longer exists 2011-04-28 10:10:52 -07:00
Jason Sams
75e7b005b8 Merge "Add dalvik code for forEach." 2011-04-27 23:00:40 -07:00
Jason Sams
332d66d6c5 Merge "Start implementing control side forEach." 2011-04-27 23:00:25 -07:00
Wu-cheng Li
61773dbda3 Merge "Unhide camera focus area and metering area API." 2011-04-27 21:17:52 -07:00
Dima Zavin
4135f45c87 view: fix a bad merge 
Change-Id: Ia309b6aca3d303d5ebc6f3def55b2d807ec8ec4b
Signed-off-by: Dima Zavin <dima@android.com>
 2011-04-27 19:07:14 -07:00
Mathias Agopian
431d5cf7d0 Merge "Fix uninitialized variable in SurfaceTexture" 2011-04-27 19:01:01 -07:00
Mathias Agopian
926340cf56 Fix uninitialized variable in SurfaceTexture 
Change-Id: Ie77cdad481fc0522ff5ea3b7e14ce94e07150793
 2011-04-27 18:58:46 -07:00
Stephen Hines
b994ed33c5 Fix RS graphics samples/tests. 
Change-Id: Id5b586a9d9bead426eb46d79a93941893f0d4925
 2011-04-27 18:25:49 -07:00
Stephen Hines
5ac02e73c3 am 697f8b33: am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1 
* commit '697f8b331bb339e4db716efbb96e2182aac40255':
  Check setName() for null string + fix rsRand().
 2011-04-27 17:38:53 -07:00
Stephen Hines
697f8b331b am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1 
* commit '00df8e230ef797729a3618d1d0c19cda3950c922':
  Check setName() for null string + fix rsRand().
 2011-04-27 17:36:38 -07:00
Stephen Hines
00df8e230e Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1 2011-04-27 17:32:40 -07:00
Dima Zavin
058520e9ee Merge changes I22d9e018,Ib0701fcc,Ibc637918,I9eb7e002,I4adcec73 
* changes:
  audioflinger: don't do work in constructor, instead do it in onFirstRef
  audioflinger: enumerate all the possible audio interfaces
  audio/media: convert to using the audio HAL and new audio defs
  libmedia: move AudioParameter out of AudioSystem
  audioflinger: move legacy audio hw/policy out to libhardware_legacy
 2011-04-27 17:13:46 -07:00
Conley Owens
d21e7b5d54 am c4791bd6: Merge commit \'5e3562a5\' into m 
* commit 'c4791bd65cdf2e487c87da0d863140337e5141cb':
  onDetachedFromWindow is called before onAttachedToWindow
 2011-04-27 17:01:49 -07:00
Conley Owens
c4791bd65c Merge commit '5e3562a5' into m 
Conflicts:
	core/java/android/view/ViewRoot.java

Change-Id: Idd1eb8309e169eae2de3838f7969606df8097b87
 2011-04-27 16:58:24 -07:00
Conley Owens
ca96ed1d0e am eedf20c2: Ignore xml change since file no longer exists 
* commit 'eedf20c2eafde695a5ae50570a21d5449d6903ea':
  Remove errant tag terminator
  Normalize output of XMLtree content
 2011-04-27 16:54:40 -07:00
Conley Owens
eedf20c2ea Ignore xml change since file no longer exists 2011-04-27 16:49:07 -07:00
Jason Sams
6e494d3ab6 Add dalvik code for forEach. 
Change-Id: I26533fc553315b99b8f177ab62d9735a177b26b0
 2011-04-27 16:33:11 -07:00
Dima Zavin
2986f5bed3 audioflinger: don't do work in constructor, instead do it in onFirstRef 
Change-Id: I22d9e01821816c3beb52b014330386c7fd2f0411
Signed-off-by: Dima Zavin <dima@android.com>
 2011-04-27 16:20:22 -07:00
Dima Zavin
31f18889a2 audioflinger: enumerate all the possible audio interfaces 
Keep track of the primary interface that handles the master volume,
etc.

Change-Id: Ib0701fccff8d8783a99035a241ab7c8ec75c00ac
Signed-off-by: Dima Zavin <dima@android.com>
 2011-04-27 16:20:22 -07:00
Gilles Debunne
0d846898ba Merge "Support for overlapping spans in TextView's suggestions." 2011-04-27 16:01:30 -07:00
Gilles Debunne
abe4b55f28 Merge "Typo in TextAppearanceSpan documentation" 2011-04-27 16:00:57 -07:00
Eric Fischer
1d10447631 am a4e7353d: Import revised translations. DO NOT MERGE 
* commit 'a4e7353d33a0736361c866db76008a66ad8fbf8a':
  Import revised translations.  DO NOT MERGE
 2011-04-27 15:30:36 -07:00
Andreas Huber
f4188fa83a Merge "Fix omx_tests to no longer refer to test files that are no longer available." 2011-04-27 15:13:42 -07:00
Jason Sams
a08526ac42 Start implementing control side forEach. 
Change-Id: I2d77d908cbb64b26071d9d5a3421f0b195342d2c
 2011-04-27 15:12:49 -07:00
Andreas Huber
e23a392f70 Fix omx_tests to no longer refer to test files that are no longer available. 
Also make sure that a seek beyond EOF does not just seek the final syncframe.

Change-Id: I0a58490ef719ce095a94f1d6909c60eb20074a0b
 2011-04-27 15:01:50 -07:00
Conley Owens
264254b273 am a6590e7f: am 13b21e60: Merge "Auto hide virtual keyboard" 
* commit 'a6590e7fee1ef4286f0896358593fdb9aab24f6c':
  Auto hide virtual keyboard
 2011-04-27 14:53:26 -07:00
Conley Owens
5e3562a5a5 am cfe7b9fc: am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow" 
* commit 'cfe7b9fcfaeda1e79a8673e4005bcb307f9e9313':
  onDetachedFromWindow is called before onAttachedToWindow
 2011-04-27 14:53:15 -07:00
Conley Owens
8279c193d1 am 779fa151: am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996 
* commit '779fa1515d0b6cf17a449dc79f83a7c4e70ff0fe':
  Remove errant tag terminator
  Normalize output of XMLtree content
 2011-04-27 14:53:10 -07:00
Gilles Debunne
214a8627c5 Support for overlapping spans in TextView's suggestions. 
Implemented the merging of the different spans, highlighting words that actually differ.

Some TODO left in the code.

Change-Id: Iaf01f36b07d01639a4009cced6ea9b055ce9cc1f
 2011-04-27 14:34:00 -07:00
Chet Haase
75e3ef048d Merge "Fix various hw-accelerated line/point bugs" 2011-04-27 14:26:40 -07:00
Gilles Debunne
0f9ae274b4 Typo in TextAppearanceSpan documentation 
Dim does not exist anymore.

Change-Id: I83268657accfef15561ce313b66108adc108dfc6
 2011-04-27 14:25:56 -07:00
Romain Guy
2ef1ce494c Merge "Correctly compute tex coords for rect layers. Bug #4192695" 2011-04-27 14:23:36 -07:00
Chet Haase
8a5cc92a15 Fix various hw-accelerated line/point bugs 
All accelerated lines are now rendered as quads. Hairlines used to
be rendered as GL_LINES, but these lines don't render the same as our
non-accelerated lines, so we're using quads for everything. Also, fixed
a bug in the way that we were offsetting quads (and not offseting points)
to ensure that our lines/points actuall start on the same pixels as
Skia's.

Change-Id: I51b923cc08a9858444c430ba07bc8aa0c83cbe6a
 2011-04-27 14:23:29 -07:00
Romain Guy
9fc27819d7 Correctly compute tex coords for rect layers. 
Bug #4192695

This change also fixes Javadoc links in the framework.

Change-Id: Ia548bcb18baba5d6fe6a4a04a2278e3a3bd465b2
 2011-04-27 14:21:41 -07:00
Conley Owens
b4a56f10d8 am ba5aebd1: am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage" 
* commit 'ba5aebd106c61567ad6be905efd18902025735aa':
  Add lock before calling initEglImage
 2011-04-27 13:54:08 -07:00
Conley Owens
a6590e7fee am 13b21e60: Merge "Auto hide virtual keyboard" 
* commit '13b21e608e47382cb94a0aeac13b24ac97f355d2':
  Auto hide virtual keyboard
 2011-04-27 13:53:46 -07:00