50508 Commits

Author SHA1 Message Date
Gloria Wang
7d33460216 Merge "Add one more DRM error code. For bug 4422428." 2011-05-13 14:02:50 -07:00
Wink Saville
5a84de6ee6 resolved conflicts for merge of 74af525e to master
Change-Id: I60a6d7ecd1809dd13b1ca791baff52d82d846f2d
2011-05-13 14:01:16 -07:00
Gloria Wang
eea8c02bc8 Add one more DRM error code. For bug 4422428.
Change-Id: I4e333f474c96c0e0f162dde4013ad32b336bebd6
2011-05-13 13:53:15 -07:00
Jeff Brown
0d9288d784 am 2bdb756c: am 4fb76253: Fix bounds check. Bug: 4413945
* commit '2bdb756cdfc5e5d19e1621ae4a603b27963d6a5c':
  Fix bounds check. Bug: 4413945
2011-05-13 13:07:44 -07:00
Jeff Brown
2bdb756cdf am 4fb76253: Fix bounds check. Bug: 4413945
* commit '4fb76253f255f0adb8a64835af37bb9176ee4016':
  Fix bounds check. Bug: 4413945
2011-05-13 13:04:28 -07:00
Jeff Brown
4fb76253f2 Fix bounds check.
Bug: 4413945

Also remove dead code from header file.

Change-Id: I4e9fc9d7f8612fedb436e62649d308bd737ed138
2011-05-13 12:51:12 -07:00
Dianne Hackborn
16f6e89c2a DO NOT MERGE. Integrate fragment work from master
Back-port new fragment detach APIs from support lib.

This allow a much cleaner implementation of things like the
fragment pager class.

Integrate from support lib: fix restore of list state.

The FragmentManager/ListFragment impl was restoring the list
state before setting its adapter.  This caused the list view to
lose the state, since it gets cleared as part of setting the
adapter.  Now the fragment manager waits on restoring the view
hierarchy state until after it has done onActivityCreated(),
at which point we have set the adapter.

It would be nice to make list view less fragile in this regard,
but that is for a different change.

Change-Id: I38606ef7d0b06478995f3fb7726aead67420e172
2011-05-13 12:42:22 -07:00
Justin Ho
89fd07f772 Cleaning up notification panel drawables
Change-Id: I7f89388a0a4d663e055b8012ec9a58593707f4a5
2011-05-13 12:26:06 -07:00
Jeff Brown
65f47d8810 Merge "Add initial API for stylus and mouse buttons." 2011-05-13 12:14:27 -07:00
Jeff Brown
fe9f8ab03a Add initial API for stylus and mouse buttons.
Added the concept of pointer properties in a MotionEvent.
This is currently used to track the pointer tool type to enable
applications to distinguish finger touches from a stylus.

Button states are also reported to application as part of touch events.

There are no new actions for detecting changes in button states.
The application should instead query the button state from the
MotionEvent and take appropriate action as needed.

A good time to check the button state is on ACTION_DOWN.

As a side-effect, applications that do not support multiple buttons
will treat primary, secondary and tertiary buttons identically
for all touch events.

The back button on the mouse is mapped to KEYCODE_BACK
and the forward button is mapped to KEYCODE_FORWARD.

Added basic plumbing for the secondary mouse button to invoke
the context menu, particularly in lists.

Added clamp and split methods on MotionEvent to take care of
common filtering operations so we don't have them scattered
in multiple places across the framework.

Bug: 4260011
Change-Id: Ie992b4d4e00c8f2e76b961da0a902145b27f6d83
2011-05-13 12:11:17 -07:00
Dianne Hackborn
5684d6bc7e Merge "resolved conflicts for merge of ec85619f to master" 2011-05-13 12:06:45 -07:00
Romain Guy
3e8abfdf02 Merge "Fix waaayyy too many documentation links." 2011-05-13 11:50:06 -07:00
Romain Guy
5c22a8c80a Fix waaayyy too many documentation links.
Change-Id: Ia8d56149d8b92d85239ad62adacbf65d1e9e127d
2011-05-13 11:48:45 -07:00
Scott Main
78987e0322 docs: update homepage I/O announcement
Change-Id: If61bfdf40c3b1d0c95b9a2694a849edf5e53bb54
2011-05-13 11:27:53 -07:00
Dianne Hackborn
2e4a3236a7 am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
* commit '46a282f323bc05606e4fe1eba795bd9ac7c99819':
  DO NOT MERGE.  Integrate add new screen width/height in "dp" configs.
2011-05-13 11:21:26 -07:00
Dianne Hackborn
46a282f323 am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
* commit '0ed2e845db3f6bc7bc12a08ada18363942c2fb3d':
  DO NOT MERGE.  Integrate add new screen width/height in "dp" configs.
2011-05-13 11:18:40 -07:00
Dianne Hackborn
0ed2e845db Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2 2011-05-13 11:16:42 -07:00
Guang Zhu
c33fd6232b Merge "even more logging" 2011-05-13 11:12:48 -07:00
Fabrice Di Meglio
9dec462c1f Merge "Prepare OpenGLRenderer to use glyphs from TextLayoutCache" 2011-05-13 11:09:19 -07:00
Fabrice Di Meglio
2ea7588014 Prepare OpenGLRenderer to use glyphs from TextLayoutCache
- add OpenGLRenderer.drawGlyph()
- refactor glypth logging code

Change-Id: I797e6f1304d3f3f8f6ed31e7f9965d336233d2a4
2011-05-13 11:07:38 -07:00
Scott Main
15f8a6a726 am 4c53fc7e: am 78b875e7: am edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
* commit '4c53fc7ec921c0959f021a475fe0d91b7e6ddc2d':
  docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
2011-05-13 11:03:27 -07:00
Scott Main
f5c826224b am 2a959725: am d32aeafc: am 432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
* commit '2a959725f569147878b3a78fae77e8679c8e16fa':
  docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
2011-05-13 11:01:25 -07:00
Scott Main
4c53fc7ec9 am 78b875e7: am edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
* commit '78b875e7e65ee90e44872d6542c5eb4213ba0dfb':
  docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
2011-05-13 11:00:27 -07:00
Scott Main
2a959725f5 am d32aeafc: am 432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
* commit 'd32aeafc41b018b7efbddd1b90e17424bf1cf1e7':
  docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
2011-05-13 10:58:29 -07:00
Scott Main
78b875e7e6 am edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
* commit 'edab852fe11f12ad5a0a66f79462ed7474ba9e5a':
  docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
2011-05-13 10:56:52 -07:00
Scott Main
d32aeafc41 am 432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
* commit '432fbcc55ff3e0900a50b70b9d5dbdab77a276f7':
  docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
2011-05-13 10:55:09 -07:00
Scott Main
edab852fe1 Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1 2011-05-13 10:54:00 -07:00
Guang Zhu
e8e335a500 even more logging
to track down test hang issue

Change-Id: Ida686506275eb7c8c624c135f988feb9c43f86f5
2011-05-13 10:30:17 -07:00
Eric Laurent
6ebbc07740 Merge "Fix audio effect framework issues" 2011-05-13 10:24:24 -07:00
Alex Sakhartchouk
d4a010d584 Merge "Cleanup mesh creation." 2011-05-13 10:24:19 -07:00
Gilles Debunne
ee1d630291 Links in Environment javadoc
Change-Id: Ib3383152ff6114fdaba5245bc8357f78bc9d5fcf
2011-05-13 10:09:32 -07:00
Gilles Debunne
90eb1053c1 Merge "SuggestionSpans are preserved when picked." 2011-05-13 09:41:57 -07:00
Wink Saville
74af525e40 am 55ab1ac2: Merge "Add getLteOnCdamMode." into honeycomb-LTE
* commit '55ab1ac27f0e5ba6169e38b9ced197a9ff588f2b':
  Add getLteOnCdamMode.
2011-05-13 09:20:08 -07:00
Wink Saville
55ab1ac27f Merge "Add getLteOnCdamMode." into honeycomb-LTE 2011-05-13 09:09:43 -07:00
Eric Laurent
90681d6ad2 Fix audio effect framework issues
Fix two issues in audio effect framework reported by partners.

1 - Fixed duplicated audio buffer sent to effect process function when
pausing a track.
Modified Effectchain::process_l() function to clear the effect chain
input buffer before calling the effect process functions when no track
is active on the session. Previous code was clearing the buffer after
calling the process functions and  when transitioning from active
to inactive, the last processed buffer was passed again once to effect
process function before being cleared.

2 - Fixed potential mutex cross deadlock when disconnecting an effect
while playback is active. This is because EffectChain::process_l()
was calling PlaybackThread::hasAudioSession() thus creating an inversion
in the mutex lock order (EffectChain mutex locked before ThreadBase mutex).
The fix consists in removing the call to hasAudioSession() from process_l()
and requires each effect chain to keep count of the number of audio tracks
attached to it (previously only the active tracks were accounted for).

Change-Id: Iee4246694ea8c7a66c012120c629d72dd38f9c35
2011-05-13 08:34:45 -07:00
Steve Block
a7a7222f2b Merge "Fix WebCore include paths due to merge to WebKit r75315" 2011-05-13 06:44:57 -07:00
Dianne Hackborn
ebff8f92f1 DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
You can now specify resource configuration variants "wNNNdp"
and "hNNNdp".  These are the minimum screen width/height in "dp"
units.  This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.

This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes.  Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted.  To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.

Change-Id: I4acb73d82677b74092c1da9e4046a4951921f9f4
2011-05-12 18:39:51 -07:00
Dianne Hackborn
39cf8c97c3 resolved conflicts for merge of ec85619f to master
Change-Id: Id820ddcb9d19341a1b383b3bef7659a2c0621cfa
2011-05-12 18:37:33 -07:00
Christopher Tate
83a7cdc565 Use pax extended tar format to support long filenames etc.
'tar' supports only 100-character paths; 'ustar' supports only
155+100 character prefix + paths; neither supports files larger
than about 8 gigabytes.  We now use the POSIX.1-2001 'pax'
extended tar format for those files in the backup stream that
are too large or have too-long paths for the 'ustar' format.

Change-Id: I2f256823091deaec9b1ccea685d2344753c6cb67
2011-05-12 18:07:57 -07:00
Dianne Hackborn
c6c8ada163 am dda64e9a: am 51454295: am df9799f0: Fix build.
* commit 'dda64e9a4af2e7dbc75a3b2fc7c41b9d63848a59':
  Fix build.
2011-05-12 17:42:14 -07:00
Dianne Hackborn
ec85619f02 am d46849a5: am a8138732: MR2 is going to be API 13.
* commit 'd46849a535ab64fd47fc8e9c557ca5f4da9e977b':
  MR2 is going to be API 13.
2011-05-12 17:39:30 -07:00
Dianne Hackborn
dda64e9a4a am 51454295: am df9799f0: Fix build.
* commit '51454295a5813627a91dd5cf6b486a70a0b389cb':
  Fix build.
2011-05-12 17:39:22 -07:00
Irfan Sheriff
7ac45e0fa6 am 91a46046: (-s ours) am 2cd423a0: Merge commit \'01ea7f01\' into manualmerge1
* commit '91a460469a20529938e0f740ce24e0fdaddb7fa6':
  DO NOT MERGE Add DhcpStateMachine
2011-05-12 17:39:07 -07:00
Irfan Sheriff
91a460469a am 2cd423a0: Merge commit \'01ea7f01\' into manualmerge1
* commit '2cd423a049aeeb0c07f7a556f3a6f701b504606f':
  DO NOT MERGE Add DhcpStateMachine
2011-05-12 17:37:06 -07:00
Dianne Hackborn
d46849a535 am a8138732: MR2 is going to be API 13.
* commit 'a8138732a01b92f0a40f72050b74a3bd4cf6d215':
  MR2 is going to be API 13.
2011-05-12 17:35:35 -07:00
Dianne Hackborn
51454295a5 am df9799f0: Fix build.
* commit 'df9799f0fc3ef04d9b004ebbda44883f85321b24':
  Fix build.
2011-05-12 17:35:20 -07:00
Irfan Sheriff
7d8b99e22d am 55fa681a: (-s ours) am bb09485b: Merge commit \'09564fbb\' into manualmerge
* commit '55fa681ac774240509def9d75ad7e16ea5515dd1':
  DO NOT MERGE Define Protocol class
2011-05-12 17:31:25 -07:00
Jean-Baptiste Queru
58aa4fc5c9 Merge from honeycomb-plus-aosp
Change-Id: I3a3e2adce3114fb86c8fc4d2af48f1daa7340f6b
2011-05-12 17:25:33 -07:00
Jean-Baptiste Queru
ce0ce2dde2 Merge from honeycomb-plus-aosp
Change-Id: I66f5d4f8b703789a02f7e137235e9321fc413f5d
2011-05-12 17:23:41 -07:00
Irfan Sheriff
2cd423a049 Merge commit '01ea7f01' into manualmerge1 2011-05-12 17:19:56 -07:00