Commit Graph

16039 Commits

Author SHA1 Message Date
Scott Main
bd3ddbb809 am 75c78dc3: am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit '75c78dc364efb74c2d7c0187b3b26d0ab70e3c3e':
  docs: more documentation for ProgressBar
2011-04-29 15:11:50 -07:00
Conley Owens
19b7cd95ff am c703b49e: am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyDispatcherState()"
* commit 'c703b49eb13993c45a1cab7ea1130601fba1df3e':
  Added null check on return value for getKeyDispatcherState()
2011-04-29 15:11:48 -07:00
Conley Owens
a02a9e602b am 27e8f1a3: am 8b22ef66: am e41d2aed: Merge "Using robust equality check."
* commit '27e8f1a3a6b43592e3d419d7a3cfc6192a86bf5c':
  Using robust equality check.
2011-04-29 15:11:34 -07:00
Conley Owens
1b38cc3057 am 014757ee: am a9517012: am 1e29552b: Merge "We don\'t need these local references."
* commit '014757eea22fc9cceede1548c579c33c79464001':
  We don't need these local references.
2011-04-29 15:11:30 -07:00
Conley Owens
95b533911c am 49df110a: am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
* commit '49df110aeb94ada810a8eec0540e30a25c267a56':
  Eliminating dead code with no other effect than consuming battery life.
2011-04-29 15:11:26 -07:00
Svetoslav Ganov
f0f955e2c3 Merge "Touch exploration - nits" 2011-04-29 15:10:14 -07:00
Svetoslav Ganov
887e1a17eb Touch exploration - nits
Change-Id: Ie49558e0a81218dbad70c02f81dd7a59b3213d5c
2011-04-29 15:09:28 -07:00
Scott Main
75c78dc364 am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit '511ec082bb198cfd04aebdccf56db6f4c8df9523':
  docs: more documentation for ProgressBar
2011-04-29 15:05:10 -07:00
Scott Main
511ec082bb am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit 'de506220d8a3d453463e1abe1b2eb54afd48ec93':
  docs: more documentation for ProgressBar
2011-04-29 14:59:08 -07:00
Conley Owens
c703b49eb1 am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyDispatcherState()"
* commit '54668b8a3599559fc007af1d75c039400a05e898':
  Added null check on return value for getKeyDispatcherState()
2011-04-29 14:57:53 -07:00
Conley Owens
27e8f1a3a6 am 8b22ef66: am e41d2aed: Merge "Using robust equality check."
* commit '8b22ef66ef1a67333e2f1d4250d2c134b50ef91a':
  Using robust equality check.
2011-04-29 14:56:15 -07:00
Conley Owens
014757eea2 am a9517012: am 1e29552b: Merge "We don\'t need these local references."
* commit 'a95170122619f5442d5efbdf2e37f91dbf455ab9':
  We don't need these local references.
2011-04-29 14:56:05 -07:00
Conley Owens
49df110aeb am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
* commit 'd66a92e6875bfc835adf0b100607afbf4bfc2761':
  Eliminating dead code with no other effect than consuming battery life.
2011-04-29 14:55:55 -07:00
Scott Main
de506220d8 am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
* commit '1462813a28270d4255f9542b666960182e274a6e':
  docs: more documentation for ProgressBar
2011-04-29 14:55:43 -07:00
Scott Main
42f139c069 docs: more documentation for ProgressBar
Change-Id: Ief415c0b22da3e7d4ea318e321edc7d215603f0f
2011-04-29 14:51:05 -07:00
Gilles Debunne
939ccad344 Merge "SuggestionSpans are removed around edited text." 2011-04-29 13:30:03 -07:00
Gilles Debunne
75beb336f4 SuggestionSpans are removed around edited text.
SuggestionSpans do not make sense anymore when the text they
refer to is modified. Removed these at the lowest possible common
level: In the SpannableStringBuilder that is used to back the Editable.

This way, IME do not have to care about removing these when they change
text. And they cannot forget to so either.

Also fixed a bug in TextView's paste with multi-item paste text (never
exercised, since we have no source for such a thing).

Change-Id: I08ed921f8c04ffb1a00936a3e554a85ee82f103c
2011-04-29 13:27:37 -07:00
Gilles Debunne
8e3b17ad13 Merge "TextView uses WordIterator to select words." 2011-04-29 09:51:46 -07:00
Romain Guy
522aca1fbc Merge "Fix the build." 2011-04-28 19:42:56 -07:00
Romain Guy
e208fc2f5b Fix the build.
Change-Id: Ia6768ea01b3885504adb65bb9795daf68cee01e6
2011-04-28 19:42:22 -07:00
Adam Powell
9b4bee0f14 Introducing the split action bar.
Apply (or extend) the theme Theme.Holo.SplitActionBarWhenNarrow or
Theme.Holo.Light.SplitActionBarWhenNarrow to enable splitting the
action bar across both the top and bottom of the screen. This places
the action menu along the bottom, leaving more room at the top for
titles, navigation, and custom views and more room at the bottom for
menu items.

TODO: Refine layout of the action menu when placed at the bottom of
the screen. Make action modes split as well.

Change-Id: I92c91f99c533f26aecf6b828ed041386c4f16922
2011-04-28 19:13:25 -07:00
Romain Guy
ad44445c77 Merge "New widget: TextureView Bug #4343984" 2011-04-28 18:47:01 -07:00
Romain Guy
aa6c24c21c New widget: TextureView
Bug #4343984

TextureView can be used to render media content (video, OpenGL,
RenderScript) inside a View.

The key difference with SurfaceView is that TextureView does
not create a new Surface. This gives the ability to seamlessly
transform, animate, fade, etc. a TextureView, which was hard
if not impossible to do with a SurfaceView.
A TextureView also interacts perfectly with ScrollView,
ListView, etc. It allows application to embed media content
in a much more flexible way than before.

For instance, to render the camera preview at 50% opacity,
all you need to do is the following:

mTextureView.setAlpha(0.5f);
Camera c = Camera.open();
c.setPreviewTexture(mTextureView.getSurfaceTexture());
c.startPreview();

TextureView uses a SurfaceTexture to get the job done. More
APIs are required to make it easy to create OpenGL contexts
for a TextureView. It can currently be done with a bit of
JNI code.

Change-Id: Iaa7953097ab5beb8437bcbbfa03b2df5b7f80cd7
2011-04-28 18:46:19 -07:00
Gilles Debunne
988ec4bdc8 Merge "TextView's baseline is correctly computed for empty text." 2011-04-28 15:48:05 -07:00
Gilles Debunne
c59269f4d3 TextView uses WordIterator to select words.
Also added some boolean return values to know when selection is
possible.

Change-Id: Ic6763509318c56fcef49349d586e45d14d58a86a
2011-04-28 15:17:19 -07:00
Gilles Debunne
f483e514d4 TextView's baseline is correctly computed for empty text.
Bug http://code.google.com/p/android/issues/detail?id=15598

Change-Id: I3aae29b55dc92acca3883b8d14e01dc1c79c2243
2011-04-28 15:08:57 -07:00
Conley Owens
e178700929 Merge "Added null check on return value for getKeyDispatcherState()" 2011-04-28 15:07:00 -07:00
Conley Owens
e41d2aed9c Merge "Using robust equality check." 2011-04-28 14:57:08 -07:00
Conley Owens
1e29552bd5 Merge "We don't need these local references." 2011-04-28 14:56:59 -07:00
Conley Owens
da88218124 Merge "Eliminating dead code with no other effect than consuming battery life." 2011-04-28 14:56:55 -07:00
Jeff Sharkey
b7342acebc Tests for ThrottleService, NTP into TrustedTime.
Wrote initial suite of tests for ThrottleService, checking a variety
of edge cases.  Checks going over limits, updating policies, and reset
after cycle elapses.

Moved NTP code in ThrottleService into new TrustedTime interface,
which makes it easier to understand, and allows tests to provide custom
clocks.

Change-Id: I0d62b8b3a169516a2ab2d33025f6fe30dc792be8
2011-04-28 12:28:36 -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
Per Andersson
4ae02b37bb Added null check on return value for getKeyDispatcherState()
The result from getKeyDispatcherState() was used without
checking if it returned null, which resulted in a NullPointerException.

Change-Id: I4b55ad44d5c08b7f729dbbdbcaed0e978a430258
2011-04-28 12:04:48 +02: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
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
a538b4a206 Merge "onDetachedFromWindow is called before onAttachedToWindow" 2011-04-27 13:14:57 -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