OSDN Git Service

android-x86/frameworks-base.git
12 years agoInvalidate for scrolling animations on the animation timer
Adam Powell [Wed, 11 Apr 2012 01:55:22 +0000 (18:55 -0700)]
Invalidate for scrolling animations on the animation timer

Change View methods awakenScrollBars and scrollTo to post their
invalidation on the animation timer. Since these are often used in
computeScroll or similar to continue scrolling or flinging it should
not prevent other posted events from being processed before the frame
is actually drawn. (All changes in scroll position, etc. are
immediately reflected after the calls and do not need a draw to
present correct data about scroll position to apps.)

Don't accumulate floating point error while dragging
ScrollView/HorizontalScrollView.

Change-Id: I05b57d75f89a806488e46a8fb79b85d80f56d45d

12 years agoMerge "On double-tap, simply zoom in if content is too wide."
Mangesh Ghiware [Wed, 11 Apr 2012 01:00:06 +0000 (18:00 -0700)]
Merge "On double-tap, simply zoom in if content is too wide."

12 years agoMerge "Avoid potential leaks with Runnables posted from ProgressBar"
Adam Powell [Wed, 11 Apr 2012 00:58:25 +0000 (17:58 -0700)]
Merge "Avoid potential leaks with Runnables posted from ProgressBar"

12 years agoAvoid potential leaks with Runnables posted from ProgressBar
Adam Powell [Wed, 11 Apr 2012 00:19:20 +0000 (17:19 -0700)]
Avoid potential leaks with Runnables posted from ProgressBar

Bug 6093695

Handle pending progress updates when a view is not attached when the
view becomes attached again. Batch pending progress updates together
rather than posting separate runnables for each.

Change-Id: I5dea671d5b9fbe1302912ca4734a63955e77ff4d

12 years agoOn double-tap, simply zoom in if content is too wide.
Mangesh Ghiware [Wed, 11 Apr 2012 00:42:49 +0000 (17:42 -0700)]
On double-tap, simply zoom in if content is too wide.

Bug: 6257654
Change-Id: I6963476300619d6f0d6af46630f9a86d95ad0dfc

12 years agoMerge "Adding a line for android-debuggable to 'dump badging' if AndroidManifest...
Dan Morrill [Wed, 11 Apr 2012 00:13:17 +0000 (17:13 -0700)]
Merge "Adding a line for android-debuggable to 'dump badging' if AndroidManifest.xml is configured as such. This is to be used by e.g. Play Store to warn the developer that they are about to publish a security hole."

12 years agoHide the callback for activity animation options.
Dianne Hackborn [Tue, 10 Apr 2012 22:54:19 +0000 (15:54 -0700)]
Hide the callback for activity animation options.

Not something I want to be stuck reporting forever.

Change-Id: Iab13fb7abb23d466492230242bfbae29f1fd01f3

12 years agoMerge "Some small tweaks to improve memory management."
Dianne Hackborn [Tue, 10 Apr 2012 22:25:43 +0000 (15:25 -0700)]
Merge "Some small tweaks to improve memory management."

12 years agoam 82321d1f: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 22:13:41 +0000 (15:13 -0700)]
am 82321d1f: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1

* commit '82321d1fbfdd544225ca063a1d43a3a9c53ea5df':

12 years agoam 2ce5444d: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 22:13:39 +0000 (15:13 -0700)]
am 2ce5444d: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1

* commit '2ce5444d638e9504521e155ffdbb363f88cdc534':

12 years agoam c4bbc7b4: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into...
Robert Ly [Tue, 10 Apr 2012 22:13:37 +0000 (15:13 -0700)]
am c4bbc7b4: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1

* commit 'c4bbc7b4e44c2292d1fdfc7fa4cfac6a55fc3da9':

12 years agoam d1ba6895: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform...
Android Git Automerger [Tue, 10 Apr 2012 22:09:20 +0000 (15:09 -0700)]
am d1ba6895: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp

* commit 'd1ba68955947c208831711efdf2d6c4e5fb86d84':

12 years agoam bc8eaa7d: am 11d33b3d: am 23f08c6d: Merge "docs: fixing broken link for bug 610436...
Robert Ly [Tue, 10 Apr 2012 22:09:13 +0000 (15:09 -0700)]
am bc8eaa7d: am 11d33b3d: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1

* commit 'bc8eaa7d63865ee2532014419a0e384c62c7027e':

12 years agoam 030c8614: am b3f7fc2f: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into...
Robert Ly [Tue, 10 Apr 2012 22:09:11 +0000 (15:09 -0700)]
am 030c8614: am b3f7fc2f: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1

* commit '030c86145a011dc20012f2a63aa0da6e365c50b2':

12 years agoam 21b2ec79: am 9fd8aaca: am 876b7b87: Merge "docs: fixing renderscript doc bug 61118...
Robert Ly [Tue, 10 Apr 2012 22:09:09 +0000 (15:09 -0700)]
am 21b2ec79: am 9fd8aaca: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1

* commit '21b2ec7980b405f5c808a265c04cc1b3f1ae23de':

12 years agoMerge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks...
Android Git Automerger [Tue, 10 Apr 2012 22:01:06 +0000 (15:01 -0700)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp

12 years agoSome small tweaks to improve memory management.
Dianne Hackborn [Mon, 9 Apr 2012 21:06:16 +0000 (14:06 -0700)]
Some small tweaks to improve memory management.

We now allow processes that currently have stopping activities to
be managed as if they were done stopping, so that memory trimming
can be done before the process goes to the background.  Hopefully
this will reduce cases where the processes goes to the background
and immediately gets killed, but wouldn't have had to be killed if
it had a chance to trim its memory.

Also change window memory trimming to always do the aggressive
trimming when memory is critical, even if not on a low-end device.

And tweak web view trimming to not trim for foreground UI events.

Change-Id: I241b3152b52d09757bd14a202477cf69c9b78786

12 years agoam d87121f4: am c71a1bb9: am 23f08c6d: Merge "docs: fixing broken link for bug 610436...
Robert Ly [Tue, 10 Apr 2012 21:34:04 +0000 (14:34 -0700)]
am d87121f4: am c71a1bb9: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1

* commit 'd87121f46efd48f63f3cd181c8ff081f11ff0feb':
  docs: fixing broken link for bug 6104366

12 years agoam 07ced01f: am 9585dcc4: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into...
Robert Ly [Tue, 10 Apr 2012 21:34:03 +0000 (14:34 -0700)]
am 07ced01f: am 9585dcc4: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1

* commit '07ced01f0420ec0d70b1dd38e41e9b3b121fffb0':
  docs: fixing ndk bug 5991108

12 years agoam 12d80df0: am 86b6e26c: am 876b7b87: Merge "docs: fixing renderscript doc bug 61118...
Robert Ly [Tue, 10 Apr 2012 21:34:00 +0000 (14:34 -0700)]
am 12d80df0: am 86b6e26c: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1

* commit '12d80df0b276b5d7e3e56388c02108a3a1f864cb':
  docs: fixing renderscript doc bug 6111834

12 years agoMerge "Fix NPE in setTransparentRegion."
Craig Mautner [Tue, 10 Apr 2012 21:33:07 +0000 (14:33 -0700)]
Merge "Fix NPE in setTransparentRegion."

12 years agoam 11d33b3d: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:30:34 +0000 (14:30 -0700)]
am 11d33b3d: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1

* commit '11d33b3da5fa8c46be17135deecdded9f11b61a0':
  docs: fixing broken link for bug 6104366

12 years agoam b3f7fc2f: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:30:32 +0000 (14:30 -0700)]
am b3f7fc2f: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1

* commit 'b3f7fc2f7769defa8c7de9254f0cba163a2ea63e':
  docs: fixing ndk bug 5991108

12 years agoam 9fd8aaca: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into...
Robert Ly [Tue, 10 Apr 2012 21:30:30 +0000 (14:30 -0700)]
am 9fd8aaca: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1

* commit '9fd8aaca4762f0852c016af34db696eebd4bfc92':
  docs: fixing renderscript doc bug 6111834

12 years agoMerge "Don't reuse StringBuilder outside of lock when dumping ANR."
Jeff Brown [Tue, 10 Apr 2012 21:30:20 +0000 (14:30 -0700)]
Merge "Don't reuse StringBuilder outside of lock when dumping ANR."

12 years agoam c71a1bb9: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:30:15 +0000 (14:30 -0700)]
am c71a1bb9: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1

* commit 'c71a1bb9d455b547cba73947d13a50933c1cb1be':
  docs: fixing broken link for bug 6104366

12 years agoam 9585dcc4: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:30:13 +0000 (14:30 -0700)]
am 9585dcc4: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1

* commit '9585dcc48a561a87bfe3aa3c08192afbd969f4bf':
  docs: fixing ndk bug 5991108

12 years agoam 86b6e26c: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into...
Robert Ly [Tue, 10 Apr 2012 21:30:11 +0000 (14:30 -0700)]
am 86b6e26c: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1

* commit '86b6e26c78bf5d491a2cf2aa06e3812be326d722':
  docs: fixing renderscript doc bug 6111834

12 years agoam 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:26:28 +0000 (14:26 -0700)]
am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1

* commit '23f08c6d64976989f6519b4c65f2006865e8fd76':
  docs: fixing broken link for bug 6104366

12 years agoam 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:26:27 +0000 (14:26 -0700)]
am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1

* commit '23f08c6d64976989f6519b4c65f2006865e8fd76':
  docs: fixing broken link for bug 6104366

12 years agoDon't reuse StringBuilder outside of lock when dumping ANR.
Jeff Brown [Tue, 10 Apr 2012 21:26:26 +0000 (14:26 -0700)]
Don't reuse StringBuilder outside of lock when dumping ANR.

The ANR dumping code was reusing the shared StringBuilder while
not holding the ActivityManagerService lock.  As a result, other
threads could sweep in and clobber the ANR information.
We don't want to hold the lock here, so just create a new StringBuilder.

Change-Id: I0d91af55f5c123102cfab2cd97035491efed59c0

12 years agoam 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:26:26 +0000 (14:26 -0700)]
am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1

* commit '2e9dac4b0584bce238fed60ba2801af3e7a2c003':
  docs: fixing ndk bug 5991108

12 years agoam 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:26:25 +0000 (14:26 -0700)]
am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1

* commit '2e9dac4b0584bce238fed60ba2801af3e7a2c003':
  docs: fixing ndk bug 5991108

12 years agoam 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:26:23 +0000 (14:26 -0700)]
am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1

* commit '876b7b876e6ebb08979cf1a4861910215c4aae2b':
  docs: fixing renderscript doc bug 6111834

12 years agoam 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:26:19 +0000 (14:26 -0700)]
am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1

* commit '876b7b876e6ebb08979cf1a4861910215c4aae2b':
  docs: fixing renderscript doc bug 6111834

12 years agoam 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:26:10 +0000 (14:26 -0700)]
am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1

* commit '23f08c6d64976989f6519b4c65f2006865e8fd76':
  docs: fixing broken link for bug 6104366

12 years agoam 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:26:08 +0000 (14:26 -0700)]
am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1

* commit '2e9dac4b0584bce238fed60ba2801af3e7a2c003':
  docs: fixing ndk bug 5991108

12 years agoam 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:26:07 +0000 (14:26 -0700)]
am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1

* commit '876b7b876e6ebb08979cf1a4861910215c4aae2b':
  docs: fixing renderscript doc bug 6111834

12 years agoFix NPE in setTransparentRegion.
Craig Mautner [Tue, 10 Apr 2012 21:24:38 +0000 (14:24 -0700)]
Fix NPE in setTransparentRegion.

Check for null Surface before using it.

Fixes bug 6312835.

Change-Id: Iaaac2a5d88e81b88e369815e09818c268085e4b7

12 years agoMerge "docs: fixing broken link for bug 6104366" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:24:00 +0000 (14:24 -0700)]
Merge "docs: fixing broken link for bug 6104366" into ics-mr1

12 years agoMerge "docs: fixing ndk bug 5991108" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:23:50 +0000 (14:23 -0700)]
Merge "docs: fixing ndk bug 5991108" into ics-mr1

12 years agoMerge "docs: fixing renderscript doc bug 6111834" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:23:37 +0000 (14:23 -0700)]
Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1

12 years agoMerge "Fix IndexOutOfBoundsException."
Craig Mautner [Tue, 10 Apr 2012 21:23:10 +0000 (14:23 -0700)]
Merge "Fix IndexOutOfBoundsException."

12 years agoMerge "Revert "Revert "Keep selection handles in edit fields."""
George Mount [Tue, 10 Apr 2012 21:23:07 +0000 (14:23 -0700)]
Merge "Revert "Revert "Keep selection handles in edit fields."""

12 years agoMerge "Import translations. DO NOT MERGE"
Eric Fischer [Tue, 10 Apr 2012 21:22:52 +0000 (14:22 -0700)]
Merge "Import translations. DO NOT MERGE"

12 years agoMerge "Notify monitor waiters when changing mSurfaceIsBad value."
Jack Palevich [Tue, 10 Apr 2012 21:20:28 +0000 (14:20 -0700)]
Merge "Notify monitor waiters when changing mSurfaceIsBad value."

12 years agoMerge "Move to Android-specific NTP pool."
Jeff Sharkey [Tue, 10 Apr 2012 21:01:53 +0000 (14:01 -0700)]
Merge "Move to Android-specific NTP pool."

12 years agoMove to Android-specific NTP pool.
Jeff Sharkey [Tue, 10 Apr 2012 20:48:10 +0000 (13:48 -0700)]
Move to Android-specific NTP pool.

Use "2.android.pool.ntp.org" since it returns both IPv4 and IPv6
addresses.  Verified that NTP client works correctly on both.

Change-Id: I0187ef4a6d3b353cfcc77957b1303ca01c67cbe9

12 years agoRevert "Revert "Keep selection handles in edit fields.""
George Mount [Tue, 10 Apr 2012 20:41:51 +0000 (13:41 -0700)]
Revert "Revert "Keep selection handles in edit fields.""

This reverts commit 90c08eafad72454a31282fd887ec23d357c904a4

12 years agoMerge "Removed exception from SpannableStringBuilder"
Gilles Debunne [Tue, 10 Apr 2012 20:36:40 +0000 (13:36 -0700)]
Merge "Removed exception from SpannableStringBuilder"

12 years agoMerge "audio preprocessing: added static factory method"
Eric Laurent [Tue, 10 Apr 2012 20:32:22 +0000 (13:32 -0700)]
Merge "audio preprocessing: added static factory method"

12 years agoRemoved exception from SpannableStringBuilder
Gilles Debunne [Tue, 10 Apr 2012 20:25:33 +0000 (13:25 -0700)]
Removed exception from SpannableStringBuilder

Bug 6312196

Change-Id: I9cece36b40d8948e0e85bd433954818991009ad5

12 years agodocs: fixing ndk bug 5991108
Robert Ly [Tue, 10 Apr 2012 20:30:45 +0000 (13:30 -0700)]
docs: fixing ndk bug 5991108

Change-Id: I70b5505fc424b278ea8977955857c92082a1f828

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 10 Apr 2012 20:29:58 +0000 (13:29 -0700)]
Import translations. DO NOT MERGE

Change-Id: I988480b6b1ff1b745b4126ef89ee57b97513d6e2

12 years agodocs: fixing broken link for bug 6104366
Robert Ly [Tue, 10 Apr 2012 20:20:44 +0000 (13:20 -0700)]
docs: fixing broken link for bug 6104366

Change-Id: Ic8f7a9c5540cc0dd2251b7373e80b1f9ab6d8aa9

12 years agoFix IndexOutOfBoundsException.
Craig Mautner [Mon, 9 Apr 2012 22:23:59 +0000 (15:23 -0700)]
Fix IndexOutOfBoundsException.

This fix resolves an exception thrown when the snapshot ArrayList has
no entries.

Fixes bug 6311207.

Change-Id: I84383417116a4a62eb2842792ed04096aebc8ee2

12 years agoMerge "Revert "Keep selection handles in edit fields.""
George Mount [Tue, 10 Apr 2012 20:16:03 +0000 (13:16 -0700)]
Merge "Revert "Keep selection handles in edit fields.""

12 years agoRevert "Keep selection handles in edit fields."
George Mount [Tue, 10 Apr 2012 20:14:48 +0000 (13:14 -0700)]
Revert "Keep selection handles in edit fields."

This reverts commit 5d84368a7577c5d53ce885cd2d095cc5ba40d924

12 years agoMerge "Reduce load on CPU when animating rotation."
Craig Mautner [Tue, 10 Apr 2012 20:01:12 +0000 (13:01 -0700)]
Merge "Reduce load on CPU when animating rotation."

12 years agoReduce load on CPU when animating rotation.
Craig Mautner [Tue, 10 Apr 2012 19:56:27 +0000 (12:56 -0700)]
Reduce load on CPU when animating rotation.

This change keeps requestTraversalLocked from being called on virtually
every call to animate while rotating.

Change-Id: I6d2db37db3bb82f4f9ecc84b17dbf121819a6c1b

12 years agoaudio preprocessing: added static factory method
Eric Laurent [Mon, 9 Apr 2012 21:25:48 +0000 (14:25 -0700)]
audio preprocessing: added static factory method

Added static methods to check availability and create audio preprocessing
effects.

Change-Id: I945e97fe41912ff8880befacaba162a08b5a1267

12 years agoMerge "Keep selection handles in edit fields."
George Mount [Tue, 10 Apr 2012 19:33:58 +0000 (12:33 -0700)]
Merge "Keep selection handles in edit fields."

12 years agodocs: fixing renderscript doc bug 6111834
Robert Ly [Tue, 10 Apr 2012 17:57:33 +0000 (10:57 -0700)]
docs: fixing renderscript doc bug 6111834

Change-Id: Iea6fdaf03a0064462d57e4b62500ad689ba2b824

12 years agoMerge "Faster and simpler replace in SSB, take two"
Gilles Debunne [Tue, 10 Apr 2012 18:00:57 +0000 (11:00 -0700)]
Merge "Faster and simpler replace in SSB, take two"

12 years agoMerge "Hide the optional permission stuff, not making it in to JB."
Dianne Hackborn [Tue, 10 Apr 2012 17:31:28 +0000 (10:31 -0700)]
Merge "Hide the optional permission stuff, not making it in to JB."

12 years agoam 6e32ebdf: (-s ours) am bbc46ae7: am 544f89ae: Update SurfaceTexture interface...
Teng-Hui Zhu [Tue, 10 Apr 2012 16:13:54 +0000 (09:13 -0700)]
am 6e32ebdf: (-s ours) am bbc46ae7: am 544f89ae: Update SurfaceTexture interface for forward compatibility

* commit '6e32ebdff1365d754ad3ad8e156aa941d162d129':
  Update SurfaceTexture interface for forward compatibility

12 years agoam bbc46ae7: am 544f89ae: Update SurfaceTexture interface for forward compatibility
Teng-Hui Zhu [Tue, 10 Apr 2012 15:42:23 +0000 (08:42 -0700)]
am bbc46ae7: am 544f89ae: Update SurfaceTexture interface for forward compatibility

* commit 'bbc46ae7499bc0fa67612c67dd23c1758336c935':
  Update SurfaceTexture interface for forward compatibility

12 years agoam 544f89ae: Update SurfaceTexture interface for forward compatibility
Teng-Hui Zhu [Tue, 10 Apr 2012 15:38:39 +0000 (08:38 -0700)]
am 544f89ae: Update SurfaceTexture interface for forward compatibility

* commit '544f89aece46e8f4bbe4eed93116c8736e68ac07':
  Update SurfaceTexture interface for forward compatibility

12 years agoUpdate SurfaceTexture interface for forward compatibility
Teng-Hui Zhu [Mon, 9 Apr 2012 21:51:48 +0000 (14:51 -0700)]
Update SurfaceTexture interface for forward compatibility

Change-Id: I32d224428c0127800714a976b4d7bb68cc7c2464

12 years agoMerge "Passing useLiveliness flag to FUL in startUi call"
Brian Colonna [Tue, 10 Apr 2012 13:25:26 +0000 (06:25 -0700)]
Merge "Passing useLiveliness flag to FUL in startUi call"

12 years agoNotify monitor waiters when changing mSurfaceIsBad value.
Jack Palevich [Tue, 10 Apr 2012 12:56:19 +0000 (05:56 -0700)]
Notify monitor waiters when changing mSurfaceIsBad value.

Otherwise the waiters might not wake up, leading to ANRs.

Bug: 6307843
Change-Id: I0646b4e8368f80dbff46342f75709992796973fd

12 years agoMerge "New Android Dreams architecture, disabled for now."
Daniel Sandler [Tue, 10 Apr 2012 12:33:07 +0000 (05:33 -0700)]
Merge "New Android Dreams architecture, disabled for now."

12 years agoam 37250468: am be36ea9e: am a5894871: Merge "docs: Add 101 class about supporting...
Scott Main [Tue, 10 Apr 2012 06:59:12 +0000 (23:59 -0700)]
am 37250468: am be36ea9e: am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1

* commit '372504684fa0f74c290e0eaf7134979a55118fea':

12 years agoam be36ea9e: am a5894871: Merge "docs: Add 101 class about supporting various devices...
Scott Main [Tue, 10 Apr 2012 06:55:47 +0000 (23:55 -0700)]
am be36ea9e: am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1

* commit 'be36ea9e04df8f3b97dec7793e37fa1d1465922b':

12 years agoMerge "Avoid waking EGL in getInitCount"
Jesse Hall [Tue, 10 Apr 2012 05:43:34 +0000 (22:43 -0700)]
Merge "Avoid waking EGL in getInitCount"

12 years agoMerge "Release the scratch pbuffer surface after use"
Jesse Hall [Tue, 10 Apr 2012 05:41:04 +0000 (22:41 -0700)]
Merge "Release the scratch pbuffer surface after use"

12 years agoMerge "Fix issue #6309296: Framework returns Configuration.SCREENLAYOUT_SIZE_LARGE...
Dianne Hackborn [Tue, 10 Apr 2012 00:45:06 +0000 (17:45 -0700)]
Merge "Fix issue #6309296: Framework returns Configuration.SCREENLAYOUT_SIZE_LARGE for Xoom"

12 years agoam 2f133265: am b92851d8: am a5894871: Merge "docs: Add 101 class about supporting...
Scott Main [Tue, 10 Apr 2012 00:14:59 +0000 (17:14 -0700)]
am 2f133265: am b92851d8: am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1

* commit '2f133265d0eb601885a608114b6bbc5b8a710f16':

12 years agoam 14d3b807: am a5894871: Merge "docs: Add 101 class about supporting various devices...
Scott Main [Tue, 10 Apr 2012 00:11:42 +0000 (17:11 -0700)]
am 14d3b807: am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1

* commit '14d3b807b730e04d90d6dd9c9569decdf12cc9cb':
  docs: Add 101 class about supporting various devices

12 years agoam b92851d8: am a5894871: Merge "docs: Add 101 class about supporting various devices...
Scott Main [Tue, 10 Apr 2012 00:11:21 +0000 (17:11 -0700)]
am b92851d8: am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1

* commit 'b92851d850a778d1a2e5a797c2ddd315b61b15f9':
  docs: Add 101 class about supporting various devices

12 years agoam a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
Scott Main [Tue, 10 Apr 2012 00:08:28 +0000 (17:08 -0700)]
am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1

* commit 'a5894871b2a64f8ef80089a8ca962227c4d77155':
  docs: Add 101 class about supporting various devices

12 years agoam a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
Scott Main [Tue, 10 Apr 2012 00:08:11 +0000 (17:08 -0700)]
am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1

* commit 'a5894871b2a64f8ef80089a8ca962227c4d77155':
  docs: Add 101 class about supporting various devices

12 years agoam a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
Scott Main [Tue, 10 Apr 2012 00:08:09 +0000 (17:08 -0700)]
am a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1

* commit 'a5894871b2a64f8ef80089a8ca962227c4d77155':
  docs: Add 101 class about supporting various devices

12 years agoMerge "docs: Add 101 class about supporting various devices" into ics-mr1
Scott Main [Tue, 10 Apr 2012 00:06:15 +0000 (17:06 -0700)]
Merge "docs: Add 101 class about supporting various devices" into ics-mr1

12 years agoam e1d6c080: Make common_time more deferential when coming out of networkless mode.
John Grossman [Tue, 10 Apr 2012 00:00:24 +0000 (17:00 -0700)]
am e1d6c080: Make common_time more deferential when coming out of networkless mode.

* commit 'e1d6c080f0b1769637d742e51cc22167c7af12bb':
  Make common_time more deferential when coming out of networkless mode.

12 years agoMerge "Restrictions for action buttons with text"
Adam Powell [Mon, 9 Apr 2012 23:49:47 +0000 (16:49 -0700)]
Merge "Restrictions for action buttons with text"

12 years agodocs: Add 101 class about supporting various devices
Scott Main [Mon, 2 Apr 2012 20:11:23 +0000 (13:11 -0700)]
docs: Add 101 class about supporting various devices

Change-Id: Iafeb99c9dab8462236a41cc4991085062ff7fa14

12 years agoRestrictions for action buttons with text
Adam Powell [Mon, 9 Apr 2012 22:54:01 +0000 (15:54 -0700)]
Restrictions for action buttons with text

Restrict action buttons with text to 2 lines max. Action buttons with
text will always consume at least 2 cells in split mode because they
look silly in 1.

Note that this affects text provided by menu items, not TextViews
embedded within app-provided action views.

Fixes bug 6236467

Change-Id: I7bcbf80f448b13a895ddc3bc6a7a555c0f0bac7c

12 years agoam 35c97085: am 7ec02d76: am ede62bb6: Merge "docs: fix NDK r7c release data and...
Scott Main [Mon, 9 Apr 2012 23:28:58 +0000 (16:28 -0700)]
am 35c97085: am 7ec02d76: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1

* commit '35c97085008b6d6409afb62a2c452460f148d89c':

12 years agoFix issue #6309296: Framework returns Configuration.SCREENLAYOUT_SIZE_LARGE for Xoom
Dianne Hackborn [Mon, 9 Apr 2012 23:27:07 +0000 (16:27 -0700)]
Fix issue #6309296: Framework returns Configuration.SCREENLAYOUT_SIZE_LARGE for Xoom

Change-Id: I5882e6f6ab249232b69bdc4b8e692716f2fe5efa

12 years agoam 7ec02d76: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new"...
Scott Main [Mon, 9 Apr 2012 23:26:16 +0000 (16:26 -0700)]
am 7ec02d76: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1

* commit '7ec02d7648a030edaf730b6d5ff04fe888009bc3':

12 years agoFaster and simpler replace in SSB, take two
Gilles Debunne [Mon, 9 Apr 2012 23:02:31 +0000 (16:02 -0700)]
Faster and simpler replace in SSB, take two

This is a new version of CL 179343 which had to be reverted.

This problem of the previous CL is that the ComposingSpan that
was part of the replacement text was correctly added during the
replace but was immediately removed because it had a zero-length
size.

Swapping the add and remove blocks solves the problem.

The new non-zero length enforcement also revealed a bug in the
spell checker where we were creating useless range spans.

Change-Id: I59cebd4708af3becc7ab625ae41bc36837f1a1cf

12 years agoKeep selection handles in edit fields.
George Mount [Fri, 30 Mar 2012 22:18:42 +0000 (15:18 -0700)]
Keep selection handles in edit fields.

 Bug 6264769
 Webkit Change: Ie937a8c55da0f8aef66cfcee11beb961669b7168

Change-Id: I9ee89f8b1d4e6954092b8c4d677fb75b79354b36

12 years agoRemove composing span after setting text.
George Mount [Tue, 3 Apr 2012 18:19:08 +0000 (11:19 -0700)]
Remove composing span after setting text.

 Bug 5070241

Change-Id: I8cf7e5f119c7a828df603e91ba4bcf0f571bbc72

12 years agoMake common_time more deferential when coming out of networkless mode.
John Grossman [Mon, 9 Apr 2012 18:26:16 +0000 (11:26 -0700)]
Make common_time more deferential when coming out of networkless mode.

Addresses issues seen in bug 6260139.

This is a really tough bug to repro, but there is no doubt that it is
happening occasionally on our super huge A@H subnet.  I have collected
data all weekend; the failure did not occur, but I got enough to have
a theoretical sequence of events which could trigger this behavior.
The sequence goes like this.

1) A network is running and happy with a timeline master M,
   maintaining timeline X.
2) Device B boots, but its network is taking a long time to come up.
   After 60 seconds of waiting for the network to come up, device B
   goes into networkless master mode and creates timeline Y.
3) Device B's network comes up.  It immediately sends a master
   announcement saying that it is the current low-priority master of
   timeline Y (its low priority because it has never had any real
   clients)
4) Master M ignores B because B is low priority.
5) Device C boots and sends out a who is master request.  It is a race
   between M and A to see who will respond first.  In this case, A
   responds first.
6) C sends B a request which B receives.  B now has its first client
   and is now high priority.  In this scenario, B matches M in all
   aspects of the priority ranking function, including winning the tie
   breaker (larger MAC address when interpreted as a 48 bit integer)
7) M sends its master announcement; it is ignored by B since B
   now wins in the ranking function vs M.
8) Finally, B sends its next master announcement.  M sees it, realizes
   that there is a higher priority master out there (looks like a
   bridged network scenario to M).  M gives up master status along
   with timeline X.  The clients of M become clients of B and move
   from timeline X to timeline Y (something which should only be
   needed during an actual network bridging event)

This change has a few different things meant to severely minimize the
chance that this can happen.

First, and the most important change, is that networkless masters do
not immediately announce themselves as masters on the network they are
joining.  Instead, they transition into Ronin to discover any
pre-existing masters on the network.  If there are no masters out
there, the device will simply transition back to master and continue
to maintain the timeline it had in networkless mode.  In the scenario
above, however, B should discover M and become its client, preserving
the established timeline X.

Second, any time a device experienced an interface reconfiguration
(including coming out of networkless mode), it clears its high
priority bit.  This is a good thing.  The bit used to get set again
any time...

1) The device is master and receives a client request.
2) The device becomes a client of another master on the network.
3) The device becomes a master.

Number 3 in this list is a mistake.  The high priority bit should only
be set for devices during master election which have been
participating in a timeline which has been used by multiple devices.
We know that this is the case when we are master and receive a
request.  We also know that this is the case when we hear from a
master and decide to become its client.  Simply becoming a master
should not make us high priority.  This behavior has been removed.

Third, timeouts have been adjusted just for some extra "stickyness"
when it comes to master status.  Clients now say in the Ronin state
for up to 10 seconds looking for a master sending up to 20 discovery
requests, instead of only 3 seconds (sending 6 requests).  The
wait-for-election timeout has been adjusted up from 5 seconds to 12.5
seconds to track the longer election cycle as well.  Also, while in
steady-state, clients will now wait until 10 packets (10 seconds)
have not been answered by its master before giving up and dropping
into Ronin.

Change-Id: I438b39f31265e34d6719d4adfa9e8b95a2afc188
Signed-off-by: John Grossman <johngro@google.com>
12 years agoam 40a081a0: am 5e555df1: am ede62bb6: Merge "docs: fix NDK r7c release data and...
Scott Main [Mon, 9 Apr 2012 22:31:24 +0000 (15:31 -0700)]
am 40a081a0: am 5e555df1: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1

* commit '40a081a0d7c1f88f2614ae6343cd253cd8d50e6f':

12 years agoam 5e555df1: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new"...
Scott Main [Mon, 9 Apr 2012 22:27:22 +0000 (15:27 -0700)]
am 5e555df1: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1

* commit '5e555df1b13c030a5b9a720afc59b53be8dc02d5':
  docs: fix NDK r7c release data and remove "new" tag

12 years agoam faef0d0f: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new"...
Scott Main [Mon, 9 Apr 2012 22:27:21 +0000 (15:27 -0700)]
am faef0d0f: am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1

* commit 'faef0d0f648570dae5e919e8cb2d9096861f2491':
  docs: fix NDK r7c release data and remove "new" tag

12 years agoam ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1
Scott Main [Mon, 9 Apr 2012 22:24:17 +0000 (15:24 -0700)]
am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1

* commit 'ede62bb6ee3ac2d98094280cea6343f62936342f':
  docs: fix NDK r7c release data and remove "new" tag

12 years agoam ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1
Scott Main [Mon, 9 Apr 2012 22:24:13 +0000 (15:24 -0700)]
am ede62bb6: Merge "docs: fix NDK r7c release data and remove "new" tag" into ics-mr1

* commit 'ede62bb6ee3ac2d98094280cea6343f62936342f':
  docs: fix NDK r7c release data and remove "new" tag