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

21468 Commits

Author SHA1 Message Date
Irfan Sheriff
2dbf683b61 am c1f39396: am 8f87f838: Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE 
* commit 'c1f39396b94837f728c56b4c3e2f5c37e1d0eef7':
  Define Protocol class for use with StateMachine
 2011-04-28 11:52:56 -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
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
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
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
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
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
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
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
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
cfe7b9fcfa am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow" 
* commit 'a538b4a206c54ef763dab4da00990a8991425e77':
  onDetachedFromWindow is called before onAttachedToWindow
 2011-04-27 13:53:37 -07:00
Conley Owens
779fa1515d am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996 
* commit '4a4d96e7ee682167861434cba05531f04642bf97':
  Remove errant tag terminator
  Normalize output of XMLtree content
 2011-04-27 13:48:45 -07:00
Conley Owens
a538b4a206 Merge "onDetachedFromWindow is called before onAttachedToWindow" 2011-04-27 13:14:57 -07:00
Dima Zavin
24fc2fb1c5 audio/media: convert to using the audio HAL and new audio defs 
Change-Id: Ibc637918637329e4f2b62f4ac7781102fbc269f5
Signed-off-by: Dima Zavin <dima@android.com>
 2011-04-27 13:10:10 -07:00
Conley Owens
4a4d96e7ee Merge changes I0ab47e2f,Ib8016996 
* changes:
  Remove errant tag terminator
  Normalize output of XMLtree content
 2011-04-27 13:06:46 -07:00
John Reck
3bd9295799 Merge "Add support for force-enabling zoom" 2011-04-27 10:46:39 -07:00
Bjorn Bringert
1bde6f428e Merge "Expose TTS engine API" 2011-04-27 01:16:21 -07:00
Bjorn Bringert
4bbca889df Expose TTS engine API 
This is a new API for writing text-to-speech engines.
The existing API for apps that use TTS remains the same,
with some minor additions.

Change-Id: Id577db449ae0e5baec40621d4a08387dbd755342
 2011-04-27 08:25:24 +01:00
satok
ece92d34fc Fix a bug in InputMethodSubtype#hashCode 
Bug: 4345760

Not to use resource ids for calculating hashCode

Change-Id: I29d2555aeb7d0e51205d9f1fe0da708df0890942
 2011-04-27 16:09:53 +09:00
Adam Powell
f076aa5594 Merge "Fix overlay action bar decor layout for lower context mode area." 2011-04-26 18:38:23 -07:00
Adam Powell
62ada81ee1 Fix overlay action bar decor layout for lower context mode area. 
Change-Id: I36287c36ed36179eed2b742d494d18de87541001
 2011-04-26 18:37:24 -07:00
John Reck
7818aaa14a Add support for force-enabling zoom 
Adds an option in WebSettings that causes WebView to ignore the
 user-scalable option on the viewport metatag

Change-Id: Ia850489811a6617a8c17ec6cb17e0a65400f55f0
 2011-04-26 17:59:12 -07:00
Eric Fischer
47cd2e4bde Merge "Import revised translations." 2011-04-26 16:19:04 -07:00
Eric Fischer
f70642ad14 Import revised translations. 
Change-Id: Iec08aa2073bf29bbc9465e57228f6776d3b49ad0
 2011-04-26 16:01:21 -07:00
Jean-Baptiste Queru
b7642cbae4 am 31418a1e: am 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise." 
* commit '31418a1e9b905593587d8bf7a4705429db549d97':
  Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
 2011-04-26 12:45:52 -07:00
Romain Guy
8f67eae87a Take the index parameter into account in drawTextOnPath. 
Change-Id: I92ff9b2c0fe16a467996ae1973bbfd4fad5ef750
 2011-04-26 11:24:42 -07:00
Jean-Baptiste Queru
31418a1e9b am 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise." 
* commit '45e13ec1c5cd765162b7450b1c3a4632e8979894':
  Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
 2011-04-26 10:24:27 -07:00
Wu-cheng Li
f715bf95de Unhide camera focus area and metering area API. 
These API are for touch focus.

bug:3475893

Change-Id: I1e213c0bed0c6fe18dcbfb0457c51c52e7cfae30
 2011-04-27 01:20:53 +08:00
Marco Nelissen
32b2698a93 Merge "Fix javadoc." 2011-04-26 09:37:57 -07:00
John Reck
4ddb7ab862 Merge "Adding capability to lookup many elements." 2011-04-26 09:31:48 -07:00
Robert Greenwalt
7460591a57 am 759efacd: am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE 
* commit '759efacd2d1cf70d10f66fb9656de656ac8ca867':
  Make new networkAttribute parameter non-optional.
 2011-04-26 01:35:39 -07:00
Jean-Baptiste Queru
5fcfce965f am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise." 
* commit '4b72eec34c983abb7a3afcbadd74d3bd807c4765':
  Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
 2011-04-26 00:39:44 -07:00
Robert Greenwalt
759efacd2d am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE 
* commit 'ef568c97b5962249cbab7995f76435492a10ba68':
  Make new networkAttribute parameter non-optional.
 2011-04-26 00:23:03 -07:00
Fabrice Di Meglio
9b33461384 Merge "Fix bug #4338103 (Android Arabic and Hebrew input is broken)" 2011-04-25 18:07:24 -07:00
Fabrice Di Meglio
589e4e27ee Fix bug #4338103 (Android Arabic and Hebrew input is broken) 
- fix glyph order when there is only a single run
- update tests

Change-Id: I113f28a8c76cab622fb75ce84bc50d1d38fa254e
 2011-04-25 17:48:55 -07:00
Adam Powell
c404c4fbc1 Merge "Action bar work for phones" 2011-04-25 17:44:22 -07:00
Adam Powell
dae7824c4b Action bar work for phones 
Drop tabs to a second row at < w480dp

Make 9-patches for the cab's "done" button thinner

Add a "disable home" display option to the action bar to turn off
focus and touch feedback when tapping home would do nothing

Change-Id: Ib2eedf311655f02055357321e2e9ad5b9037fed1
 2011-04-25 17:42:45 -07:00
Adam Powell
641e093f28 Merge "Only set the accelerated drawable state for views when the hardware renderer is available." 2011-04-25 17:19:59 -07:00
Robert Greenwalt
af2eb4f6db Make new networkAttribute parameter non-optional. 
Dependencymet sets the default dep-met value for the network.  Should
be set to true unless you know what you're doing.

Change-Id: Ifa3765a97615f5333da07bce9defdb8600275129
 2011-04-25 16:04:45 -07:00
Adam Powell
5a7e94ea89 Only set the accelerated drawable state for views when the hardware 
renderer is available.

Change-Id: I5bcf2068771d47604e12a44e1ab870fa4c69fb4c
 2011-04-25 15:30:43 -07:00
Robert Greenwalt
7ada57f8ba Merge "Expose more net types to the public." 2011-04-25 15:05:24 -07:00
Chet Haase
cc5a7d2328 Merge "Fix bitfield bug with vertex shader selection" 2011-04-25 12:56:34 -07:00
Marco Nelissen
eb6b9e649e Fix javadoc. 
Change-Id: I6de2ac39626cb8749a525c51234018986dd95969
 2011-04-25 10:40:07 -07:00
Eino-Ville Talvala
185052e2d1 Merge "Clarify the meaning of weight in the focus and metering area HAL." 2011-04-25 09:39:28 -07:00