2767 Commits

Author SHA1 Message Date
Mike LeBeau
c95c3a3fc7 Merge "Add EXTRA_ORIGIN to RecognizerIntent." 2011-04-05 14:03:55 -07:00
Mike LeBeau
216ce0f16e Add EXTRA_ORIGIN to RecognizerIntent.
This is for passing the http referer of a request, e.g., for speech
input from within a browser.

Bug: 4161306
Change-Id: I56fdb7466edd985aab6df8364be1f1619a11a00d
2011-04-05 16:38:24 -04:00
Mike LeBeau
0cd9cb1827 Merge "Support speech recognizer confidence values." 2011-04-05 11:27:55 -07:00
Mike LeBeau
bb7cf916b2 Support speech recognizer confidence values.
Pass speech recognizer confidence values in the SpeechRecognizer and
RecognizerIntent APIs through to the caller. This change defines new
API constants for keys to these values.

The corresponding change is being made to Google Voice Search, and should be
made to any other implementations.

Bug: 3267513
Bug: 4163206

Change-Id: I294553f2eb9eb3be21298b8434117c8c5309558d
2011-04-05 10:54:18 -04:00
Adam Cohen
f45f5b2715 Fixing build
Change-Id: If18012c03265f3fa02d8743d583668d9e0245845
2011-04-04 12:08:58 -07:00
Brian Carlstrom
aedc2a8fcc Merge "Tracking merge of dalvik-dev to master" 2011-04-02 20:39:32 -07:00
Brian Carlstrom
08065b9f09 Tracking merge of dalvik-dev to master
git cherry-pick --no-commit  a80febd83c8bf0b6717da2a7136179bdc906a5b7

git cherry-pick --no-commit  5e642b41cf44c5da7afdd95ab3d5e2bdbf7b31dd

git cherry-pick --no-commit  4886db14c9eee4b6fee69bd54c57c5af04709c4c

git cherry-pick --no-commit  560c685e448769904047507b9484ce8111967d7e

git cherry-pick --no-commit  63dde7a2fcfa53dc531558635b64cea613d3cdb4

git cherry-pick --no-commit  74e5cb91060a379d98dd3a333b5f231bfb4f502e

git cherry-pick --no-commit  1cc8c9708b555e2e338b7798d38887a2fefcfea6

git cherry-pick --no-commit  09625a21f5abe0c0db15757f58585d552d62c3d7

git cherry-pick --no-commit  fcb02dfe0f5a2bb7c07e6d6fc69f756a484b5458

git cherry-pick --no-commit  a68cb7fa3ab42854768b8145ff85231663770292

git cherry-pick --no-commit  716beb1c131dd2c6b805d4f681debaa20075010c

git cherry-pick --no-commit  8c29b1097a7afe3a77e27546a56e396f3620a4ec

git cherry-pick --no-commit  9c6a1a55d1c8086c1cc57464eea43725694ff70c

git cherry-pick --no-commit  b14f5ea5c57acdd009ba5b51f1bbe430f3d353b8

Change-Id: I8cc94175441b009e23549762d6baee1dbace4881
2011-04-01 16:00:23 -07:00
Stephen Hines
ef353dde08 Make BaseObj a public class.
BUG=4156151

Change-Id: Ia5d5ae08ab8e176ad3ca1f38c2c33ef4e9551213
2011-04-01 14:22:35 -07:00
Adam Powell
5251940341 Merge "Fix public issue 15862: Theme Theme.Holo.Light.NoActionBar not available for use" 2011-03-30 11:48:58 -07:00
Winson Chung
53ecd4f5cf Merge "Deprecating old RemoteViews API which takes appWidgetId when setting the RemoteViewsAdapter intent." 2011-03-30 11:44:08 -07:00
Adam Powell
54ab310e60 Fix public issue 15862: Theme Theme.Holo.Light.NoActionBar not available for use
Change-Id: Ieb8127772cd62663d11ef893b47f9b2c7068391c
2011-03-30 11:34:00 -07:00
Winson Chung
037300bba5 Deprecating old RemoteViews API which takes appWidgetId when setting the RemoteViewsAdapter intent.
Change-Id: I72edaa839ae0633a1a24d8f69f5f8c664832ed30
2011-03-30 09:37:09 -07:00
Christopher Tate
3d4bf17f49 Add view/drawable states for drag-accepting / drag-hovered
Added new drag_can_accept and drag_hovered XML attributes and the View
logic to support them.  Drawable states are now refreshed automatically
when a drag starts/ends and when a drag crosses the boundary of a
participating view.

Change-Id: I25f8ee02c83b3fa4f27201997d7eabf4be653fd8
2011-03-29 15:27:58 -07:00
satok
e3797a15fb Removed APIs for setCorrectionSpan from InputConnection
("setCorrectionSpan" was added in Id3abc9ea4d11753cd )

Also..
- Added a class java doc for CorrectionSpan
- Removed FLAG_DEFAULT
- Changed the return type of getSuggestions from Array<CharSequence> to String[]

Change-Id: If5eb091e307a7a40c5b4a70ec1fe6059ecd9fb2d
2011-03-26 07:20:34 +09:00
satok
c50232d517 Add hashCode to InputMethodInfo
The uniqueness of InputMethodInfo was guaranteed by mId (like InputMethodInfo#equals), but the hashCode was not implemented in the same way.
This change fixes a problem happening when the user gets the hashCode of InputMethodInfo obtained through IPC.

Change-Id: Ib876c5cb0d778481100597ec31202f94fb7b8f37
2011-03-26 06:12:58 +09:00
Jeff Brown
dff626c56a Merge "Added a hovered state for drawables." 2011-03-24 16:42:08 -07:00
PY Laligand
c33d8d49e4 Added a hovered state for drawables.
Change-Id: I2b12c8593e04e37c8eb748946ca6d4d7a61de36a
2011-03-24 16:14:08 -07:00
Jeff Brown
b7c25ce3ae Merge "Add MotionEvent.HOVER_ENTER and HOVER_EXIT." 2011-03-24 15:38:04 -07:00
Jeff Brown
a032cc0086 Add MotionEvent.HOVER_ENTER and HOVER_EXIT.
The input dispatcher sends a HOVER_ENTER to a window before dispatching
it any HOVER_MOVE events.  For compatibility reasons, the window will
*also* receive the HOVER_MOVE.  When the pointer moves into a different
window or the pointer goes down or when events are canceled for some reason,
the input dispatcher sends a HOVER_EXIT to the previously hovered window.

The view hierarchy behavior is similar.  All views under the pointer
receive onHoverEvent with HOVER_ENTER followed by any number of HOVER_MOVE
events.  When the pointer leaves a view, the view receives HOVER_EXIT.
Similarly, if a parent view decides to capture hover by returning true
from onHoverEvent, the hovered descendants will receive HOVER_EXIT.

The default behavior of onHoverEvent is to update the view's hovered
state by calling setHovered(true/false).  Views can query their current
hovered state using isHovered().

For testing purposes, the hovered state is mapped to the pressed
drawable state.  This will change in a subsequent commit with the
introduction of a new hovered drawable state.

Change-Id: Ib76a7a90236c8f2c7336e55773acade6346cacbe
2011-03-24 15:37:04 -07:00
Eino-Ville Talvala
a5d42c8578 Merge "NEW_API: Add getTimestamp() to SurfaceTexture." 2011-03-24 15:36:56 -07:00
Chet Haase
bc377841db Add custom fragment anims to be run when popping backstack
The previous fragment implementation allowed for animations
during fragment transitions, but did not account for the
different behavior of fragments when popping the back stack.
In general, you probably don't want to run the same animation
for putting a fragment on the stack as for popping it off, which
is what happens now. For example, you might fade a fragment out when
putting it on the stack. But when popping ot off, fading it out
is probably not the behavior you want.

The new API (setCustomAnimations() overload with two additional
parameters) allows developers to specify animations to be run
in the popping operation. Otherwise, the animations are null and
the operation will not be animated.

Change-Id: I2e132b3890838358e496149f18a25037a59990aa
2011-03-23 09:35:00 -07:00
Mathias Agopian
462db220a2 fix [4056232] Deprecate Sensor.TYPE_TEMPERATURE and add Sensor.TYPE_AMBIENT_TEMPERATURE
Bug: 4056232
Change-Id: Idf165460fc083f856c320f0f6f8841d73661c829
2011-03-22 19:12:13 -07:00
Adam Powell
e9f66af90a Merge "Fix bug 4142917 - Add support for specifying a custom home icon in action bar" 2011-03-22 14:13:34 -07:00
Adam Powell
1969b87990 Fix bug 4142917 - Add support for specifying a custom home icon in action bar
Add ActionBar methods for setting icon and logo.

Change-Id: I6151689138c734b7212c3469b8ba8f28f0fd5ec4
2011-03-22 14:11:06 -07:00
Dianne Hackborn
2e28aa8905 am b6955be9: am b382a054: am 8dcd6647: Merge "Now have a final API 12." into honeycomb-mr1
* commit 'b6955be94a065f34275cc20161664871bd286f75':
  Now have a final API 12.
2011-03-22 13:08:01 -07:00
Dianne Hackborn
99ca5cc5c7 Now have a final API 12.
Change-Id: I7475ed7f82e4875c7e51671703821e5735dc1433
2011-03-22 10:46:42 -07:00
Eino-Ville Talvala
e309a0fd2e NEW_API: Add getTimestamp() to SurfaceTexture.
Like getTransformMatrix, getTimestamp provides a timestamp for the
OpenGL texture produced by the latest call to updateTexImage().

Timestamps are measured in nanoseconds, and are monotonically
increasing.  Other properties of the timestamps (zero point,
comparability) depend on the source providing frames to the
SurfaceTexture, and need to be documented by the source.

bug:3300707

Change-Id: I380d94926d0e9f1c77bb5c1576b72d5ef4e2eba1
2011-03-21 15:38:36 -07:00
Andreas Huber
5b7ced6a4e Support passing headers to MediaMetadataRetriever's setDataSource API
Change-Id: Ib1a5c08fc5034cac05034db27007a35c9b660b26
related-to-bug: 3506316
2011-03-21 11:13:59 -07:00
Daniel Sandler
affb58e727 Fix build.
See Change Ie70ac630

Change-Id: Ifffd53dbe17be64e6234bc6371f44b84c3e123e4
2011-03-21 10:27:18 -04:00
Dianne Hackborn
e72f237def More work on making prefs work well on small screens.
Tweak padding so layouts now look decent, a few extensions so that
the correct title can be shown.

Change-Id: Ieace16bf4962d66564c6e2f67fb588e582943850
2011-03-18 12:54:26 -07:00
Dianne Hackborn
315f19be8e am daa71254: am efb56934: am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
* commit 'daa71254f3e3261ecc0e143955c89ced70bbf008':
  Whoops, forgot the HONEYCOMB_MR1 constant. :(
2011-03-17 19:07:17 -07:00
Dianne Hackborn
edf1fc6ce6 Whoops, forgot the HONEYCOMB_MR1 constant. :(
It shouldn't be a problem to put this in -- it is a static final
so it doesn't actually need to be in the on-device system image.

This is important for the SDK.

Change-Id: Iaa086247d0d65fe708c40fbab506aa60cd3e1396
2011-03-17 18:34:48 -07:00
Gloria Wang
454b2d1c34 am 2c3257b2: am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1
* commit '2c3257b21ddf2a3da843f11d1bb3b4fa8e912707':
  Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses   DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
2011-03-17 12:38:40 -07:00
Gloria Wang
def35f7a47 Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 2011-03-17 10:49:43 -07:00
Gloria Wang
f8bf3c46f5 Fix for 4089881.
- Add one more parameter in the interface of DrmEvent and its subclasses
  DrmInfoEvent and DrmErrorEvent
- Send back DrmInfo in the response of async processDrmInfo calls

Change-Id: Ia9b1a641296629a19ae4ffa7913e6c878fd340f8
2011-03-16 21:36:30 -07:00
Michael Kolb
0677d2526d am d799caa9: am 9a0df3c5: am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
* commit 'd799caa9a6623de4af581bebc9759272c10b6588':
  deprecate getVisibleTitleHeight
2011-03-16 12:35:42 -07:00
Jeff Brown
5949f89f3c Merge "Add 3D mode key and others." 2011-03-16 11:46:00 -07:00
Jeff Brown
9812aed276 Add 3D mode key and others.
Related to an AOSP change request.

Change-Id: I3f4f84b56a1af626a8783f5ecbb823eb12ba9fbe
2011-03-16 11:31:42 -07:00
Michael Kolb
e54f66524e deprecate getVisibleTitleHeight
Bug: 4104535

Change-Id: I8a6ef21d38a25848efa28e2c06cf2da0ff7af9c4
2011-03-16 09:25:23 -07:00
satok
35267f178c Merge "Add CorrectionSpan and APIs to pass a secure CorrectionSpan to TextView" 2011-03-15 23:13:56 -07:00
satok
adb435835f Add CorrectionSpan and APIs to pass a secure CorrectionSpan to TextView
- CorrectionSpan is a span which has suggestions made by IME.
This has a function to change the current IME to other IME specified
in this span. For security reasons, only the current IME
is allowed to use this function through InputConnection.
(IME token is used for checking the validity of it.).

- CorrectionSpan stores following information:

flags, subtype Id, InputMethodInfo Id, suggests, locale, original string

Change-Id: Id3abc9ea4d11753cdc4f483a2bb3128f49ba198a
2011-03-16 14:44:37 +09:00
Dianne Hackborn
b1a6e439f6 Add new PreferenceActivity API for settings.
Need to redirect to a different activity when on non-xlarge screens.

Change-Id: I8cf4793b117325604d29ecc4478dbf10322a4689
2011-03-15 16:23:01 -07:00
Mike Lockwood
688d8412bd am 0958fb10: am 221830b9: Merge "Add support for USB accessory serial numbers" into honeycomb-mr1
* commit '0958fb1068ee1b5e6c40eee16d943a664b1124b4':
  Add support for USB accessory serial numbers
2011-03-14 17:47:49 -07:00
Gloria Wang
5c4421f73f am 67718e07: am 132bb659: Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1
* commit '67718e076422f8f28f4e30a39df9e462ef32d19b':
  For issue 4082089 Add more info and error events into the DRM framework
2011-03-14 17:41:42 -07:00
Mike Lockwood
221830b93d Merge "Add support for USB accessory serial numbers" into honeycomb-mr1 2011-03-14 17:39:43 -07:00
Mike Lockwood
015b1ecaec Add support for USB accessory serial numbers
Change-Id: I47b79f091b300ced60bfc61eff2f771139663aae
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-14 20:10:47 -04:00
Gloria Wang
27b277779c For issue 4082089
Add more info and error events into the DRM framework

Change-Id: I0bb3251c5947fc8e977d478e1ba46b242cb97e9d
2011-03-14 15:29:08 -07:00
Dianne Hackborn
df35762758 am ce3bcbad: am 9ff64838: Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1
* commit 'ce3bcbade5ca3eac5bae2e06fa37d17f00006a15':
  Fix issues #4087362 and #4087356
2011-03-11 23:10:55 -08:00
Mike Lockwood
e1976e5c61 am 3b473d95: am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1
* commit '3b473d958c46ea6511b9599f727b47636e5cbc4a':
  USB: minor cleanup work
2011-03-11 23:10:41 -08:00
Dianne Hackborn
9ff6483843 Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 2011-03-11 18:01:47 -08:00