21773 Commits

Author SHA1 Message Date
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
Conley Owens
a3be387375 am eb8171bc: Merge "Adjust mBiggerTouchSlopSquare to the suitable value"
* commit 'eb8171bcff9bd980dbdfc99b2d843a5bcc0ae3e5':
  Adjust mBiggerTouchSlopSquare to the suitable value
2011-04-29 10:24:34 -07:00
Conley Owens
b737647db8 am 76616b13: Merge "Scolling using arrow keys with padding"
* commit '76616b138eb68a77a838a93fdf2f0322e982f706':
  Scolling using arrow keys with padding
2011-04-29 10:24:29 -07:00
Conley Owens
19653c6440 am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"
* commit '425db473a05e4204301bf46d4ab6f51b12d9c447':
  CHAR_SEQUENCE_CREATOR cannot handle null string
2011-04-29 10:24:23 -07:00
Conley Owens
718516f3b7 am 9fd8e057: Merge "Fix memory leak of SkMovie class"
* commit '9fd8e0579fb3306f61ba1716b1977562ae3626e1':
  Fix memory leak of SkMovie class
2011-04-29 10:24:08 -07:00
Conley Owens
1a846ab089 am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal
* commit 'b1578d85ce1b3f3c5e2cf0271011c016b93b7e1a':
  Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown
2011-04-29 10:23:58 -07:00
Conley Owens
e321d06430 am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()"
* commit '2f463ef18bb235be57b39cbda536bcd2df2d0908':
  Adding a sanity test in the while loop in readHistory()
2011-04-29 10:23:28 -07:00
Conley Owens
eb8171bcff Merge "Adjust mBiggerTouchSlopSquare to the suitable value" 2011-04-29 10:01:23 -07:00
Conley Owens
76616b138e Merge "Scolling using arrow keys with padding" 2011-04-29 10:00:26 -07:00
Conley Owens
425db473a0 Merge "CHAR_SEQUENCE_CREATOR cannot handle null string" 2011-04-29 10:00:20 -07:00
Conley Owens
9fd8e0579f Merge "Fix memory leak of SkMovie class" 2011-04-29 10:00:00 -07:00
Conley Owens
b1578d85ce Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown" 2011-04-29 09:59:48 -07:00
Conley Owens
2f463ef18b Merge "Adding a sanity test in the while loop in readHistory()" 2011-04-29 09:56:58 -07:00
Gilles Debunne
8e3b17ad13 Merge "TextView uses WordIterator to select words." 2011-04-29 09:51:46 -07:00
Daniel Sandler
4d10b45343 New art. FPO, of course.
Change-Id: Ia32e7c946d79afc8e250efda40b9d6b1f97f0b15
2011-04-29 12:42:31 -04:00
Jozef BABJAK
ad3b2e3a16 Removing dead store; it was likely a relict of debuging code.
Change-Id: I685c6df119212f48f90dd40d01a3638a33ce2800
2011-04-29 13:00:54 +02:00
Hung-ying Tyan
71a0dab1ca Merge "Turn on SIP phone support by default." 2011-04-29 00:34:36 -07:00
Conley Owens
54668b8a35 am e1787009: Merge "Added null check on return value for getKeyDispatcherState()"
* commit 'e17870092941cecf64956819d395ec34111cbe71':
  Added null check on return value for getKeyDispatcherState()
2011-04-28 23:52:45 -07:00
Conley Owens
8b22ef66ef am e41d2aed: Merge "Using robust equality check."
* commit 'e41d2aed9c8d990d31af70642ae688dad1d8fb4b':
  Using robust equality check.
2011-04-28 23:52:32 -07:00
Conley Owens
a951701226 am 1e29552b: Merge "We don\'t need these local references."
* commit '1e29552bd5feeb24952a0486e3263396978212df':
  We don't need these local references.
2011-04-28 23:52:26 -07:00
Conley Owens
d66a92e687 am da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
* commit 'da882181245fdf3eca827680d656cd298c9c318f':
  Eliminating dead code with no other effect than consuming battery life.
2011-04-28 23:52:21 -07:00
Hung-ying Tyan
1f758800ee Turn on SIP phone support by default.
Also make SIP available on mobile data network by default.

Bug: 4318547
Change-Id: I940e3213c4f6f30cd6238a3073b3ab45a46dd87f
2011-04-29 13:19:50 +08: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
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
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
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