69587 Commits

Author SHA1 Message Date
Amith Yamasani
0791335443 Merge "Fix sync tests failure." 2012-03-15 12:38:40 -07:00
Dianne Hackborn
6959a43fbc am f0cbb03a: am 42ef93fc: am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1
* commit 'f0cbb03ad251e6d69d8a41df3b57c6b33e0e5325':
2012-03-15 11:39:22 -07:00
Dianne Hackborn
df358687f5 am b99b7f51: am 4d85c98d: am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1
* commit 'b99b7f51b0b9406fb36189092e8d560c164718fc':
  Remove fade animations from framework drawables.
2012-03-15 11:39:19 -07:00
Android Git Automerger
83ccdc4e37 am bf324a1c: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
* commit 'bf324a1c2809403f2dc18afffd8f1202a99e2ba8':
2012-03-15 11:39:17 -07:00
Scott Main
49495f858a am 8fc949eb: am 1fbc85d3: am f32ab914: Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that\'s not necessary" into ics-mr1
* commit '8fc949ebb1963fa053f7b2b1436989f479c20348':
2012-03-15 11:39:14 -07:00
Scott Main
5d85819ced am 40b4f04a: am 15010776: am f32ab914: Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that\'s not necessary" into ics-mr1
* commit '40b4f04ac3f8dd11fc1313472aca3713b34d7f6a':
  docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
2012-03-15 11:39:11 -07:00
Android Git Automerger
b6d57d5393 am f197d6a8: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
* commit 'f197d6a8d2f59a1f7b7e6d84c812bb1706e2fbf9':
2012-03-15 11:39:03 -07:00
Robert Ly
79fa149f68 am 75bb4594: am af3701f4: am 957f716c: docs: fix toc in search au class
* commit '75bb45945249be1d2ab3614429d76ffb082cc7c4':
2012-03-15 11:39:01 -07:00
Robert Ly
fd4ef3f6f0 am c600323c: am da04da21: am 957f716c: docs: fix toc in search au class
* commit 'c600323c592e7985022766fca7706ae6a76db921':
  docs: fix toc in search au class
2012-03-15 11:38:58 -07:00
Robert Ly
20d7277065 am 9c0ce08e: am 363d178f: am b285125d: Merge "docs: android u search class" into ics-mr1
* commit '9c0ce08e6e317503e175726cb4fe376708afc2e7':
2012-03-15 11:38:52 -07:00
Robert Ly
696c55d40d am d01ec4c9: am c3b24faa: am b285125d: Merge "docs: android u search class" into ics-mr1
* commit 'd01ec4c9afac7984211ec359cf666739df4342a2':
  docs: android u search class
2012-03-15 11:38:49 -07:00
Craig Mautner
bf90eaa5d2 Separate layout ops from surface ops.
Further work to isolate layout from animation and surface operations.
Remove cruft and minor refactoring.

Change-Id: I6f910ed72c7c614996641c353870c2b2ab5e8bb4
2012-03-15 11:34:24 -07:00
Dianne Hackborn
f0cbb03ad2 am 42ef93fc: am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1
* commit '42ef93fcc455b9194a7603fed439e8d4490d634f':
2012-03-15 11:33:34 -07:00
Gilles Debunne
33b7de85b6 Multiple display lists for editable text
Bug 5763685

Long text in a ScrollView (not when the View's internal
scroll is used) is cached as a unique display list when hardware
rendering is on.

As a result, each time the text is edited, the entire display
list has to be updated, which takes a significant amount of
time (up to 500ms for a few thousand lines), proportional to the
size of the text.

This CL splits the text into multiple display lists as the
text is edited. The boundaries of the display list are aligned
with paragraphs.

There is still an issue when the number of lines changes: onLayout()
is called which invalidates all the display list. When the source
of that change is line wrapping and not a change in the view's
dimensions, we should be able to simply shift down the previous DL
instead of re-creating everything.

Change-Id: I7de49a1e5637cdfc9ef06b64b1ec4b61d9ea2415
2012-03-15 11:32:50 -07:00
Dianne Hackborn
b99b7f51b0 am 4d85c98d: am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1
* commit '4d85c98d833f6fed01b4bb84427a4b7514f95978':
  Remove fade animations from framework drawables.
2012-03-15 11:32:41 -07:00
Dianne Hackborn
4d85c98d83 am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1
* commit '33ace979a452301796694ffd64506f082de42f0d':
  Remove fade animations from framework drawables.
2012-03-15 11:29:22 -07:00
Dianne Hackborn
42ef93fcc4 am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1
* commit '33ace979a452301796694ffd64506f082de42f0d':
  Remove fade animations from framework drawables.
2012-03-15 11:29:22 -07:00
Dianne Hackborn
33ace979a4 Merge "Remove fade animations from framework drawables." into ics-mr1 2012-03-15 11:27:43 -07:00
Scott Main
6c25ffb770 am 0b4ec63c: am 6513bceb: am 7f949778: Merge "docs: remove link from GP logo" into ics-mr1
* commit '0b4ec63cd1fe09aec34d1eac8bc8f5cc28450f6c':
2012-03-15 11:17:27 -07:00
Scott Main
a993d4b85a am fb058ddb: am 82916294: am 7f949778: Merge "docs: remove link from GP logo" into ics-mr1
* commit 'fb058ddb8b76513911daba970fde6098290f61d1':
  docs: remove link from GP logo
2012-03-15 11:17:22 -07:00
Junichi Monma
77d3a7a06c am 896a638b: (-s ours) am 41d72c86: Merge "DO NOT MERGE : New version of DroidSansFallback font" into ics-scoop
* commit '896a638b34368f943a84e148a59f589ed172fbe1':
  DO NOT MERGE : New version of DroidSansFallback font
2012-03-15 11:17:19 -07:00
George Mount
f63c52ac87 Merge "Add scrolling editable text with a finger drag." 2012-03-15 10:54:30 -07:00
Android Git Automerger
bf324a1c28 Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-03-15 10:38:42 -07:00
Eino-Ville Talvala
4d2ece12a6 Merge "Move CameraParameters.h to frameworks/native." 2012-03-15 10:34:00 -07:00
Scott Main
8fc949ebb1 am 1fbc85d3: am f32ab914: Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that\'s not necessary" into ics-mr1
* commit '1fbc85d32ddd8a764d522ba56cae10ca0d6c5f93':
  docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
2012-03-15 10:25:56 -07:00
Scott Main
40b4f04ac3 am 15010776: am f32ab914: Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that\'s not necessary" into ics-mr1
* commit '150107763d1b5ced8e70992268d7d6fc1888f7dd':
  docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
2012-03-15 10:25:31 -07:00
Scott Main
1fbc85d32d am f32ab914: Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that\'s not necessary" into ics-mr1
* commit 'f32ab914147ede0b02302a28cce6fd2f301b0b3e':
  docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
2012-03-15 10:22:35 -07:00
Scott Main
150107763d am f32ab914: Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that\'s not necessary" into ics-mr1
* commit 'f32ab914147ede0b02302a28cce6fd2f301b0b3e':
  docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
2012-03-15 10:22:33 -07:00
Scott Main
f32ab91414 Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary" into ics-mr1 2012-03-15 10:21:00 -07:00
George Mount
f70276a259 Add scrolling editable text with a finger drag.
Bug 6156451

 WebKit change: Ie08712fb17b237fbb2d520d745ef8a2e489fd728

Change-Id: I1a16c708e5ea2ef8bd1f99197dacbc7831764ef4
2012-03-15 10:00:44 -07:00
Kenny Root
a0db022419 Add support for EINTR in BT
During normal operation, it's common on a multi-core device to get
EINTR. This is especially noticable during a bugreport where several
services get EINTR even though it's not fatal.

This change adds TEMP_FAILURE_RETRY around the system calls that can
receive EINTR where a retry should happen.

Change-Id: If13d24f57c587392f57961fe2caf46e2a6fa843e
2012-03-15 09:56:14 -07:00
Chet Haase
e82a54aedc Merge "Fix bug with transform Animations" 2012-03-15 09:25:35 -07:00
Chet Haase
bcbec0ccd0 Fix bug with transform Animations
A recent change to enable View properties at the native DisplayList level
mistakenly cuased Animation transforms get be ignored for any View with
a DisplayList. The correct code should have checked whether DL properties
were enabled for the view (disabled by default for now).

Issue #6173975 Animations are gone

Change-Id: I5d5f53f854fb1b533a3150158e84392d7283d2a8
2012-03-15 09:22:17 -07:00
Glenn Kasten
4513bc0f28 Merge "Remove dependency on audio_* location" 2012-03-15 07:53:54 -07:00
Wu-cheng Li
a1c41e13b5 Add a new camera open API that allows taking the ownership.
The purpose is to let face unlock always get the camera
successfully. What happened was the camera applications may
have opened the camera in onResume under the lock screen.
This API lets face unlock take the camera from the camera
application. A new permission will be added, so other
applicatoins won't be able to take the camera from the face
unlock.

bug:5584464

Change-Id: Ib3d9dcbc2161815b68db42327dc01148453704c6
2012-03-15 14:50:48 +08:00
Jeff Brown
5571ffdd9d Merge "Prefetch column names in bulk cursor adaptor." 2012-03-14 18:56:07 -07:00
Jeff Brown
fb5a4964b8 Prefetch column names in bulk cursor adaptor.
If the remote end of a bulk cursor died, then it was possible
for getColumnNames() to return null, violating the invariant
that it never returns null.  As a result, the application could
crash in strange ways due to an NPE.

Since we are often interested in the column names anyhow, prefetch
them when setting up the bulk cursor adaptor.  This way, a
remote cursor will never return null even if the remote end died.

It is possible for an application to continue to use a remote cursor
even after the provider has died unless it needs to requery it
for some reason.  Of course at that point, bad things will
happen... but usually the app is better prepared for it than
if it just randomly encounters a null array of column names.

This change also optimizes the bulk cursor adaptor to return the
initial cursor window back to the client, potentially saving
an extra RPC.  Because the communication protocol between
the CursorToBulkCursorAdaptor and BulkCursorToCursorAdaptor was
getting a little hard to follow, introduced a new type called
BulkCursorDescriptor to hold all of the necessary parameters.

Deleted several unnecessary IBulkCursor methods that are never
actually called remotely.

Bug: 6168809
Change-Id: I9aaf6f067c6434a575e2fdbf678243d5ad10755f
2012-03-14 18:51:07 -07:00
James Dong
77cda104ac Merge "Defines MediaPlayer APIs to support multiple audio/video/timedtext tracks." 2012-03-14 17:45:18 -07:00
Romain Guy
d5bceea4bd Merge "Fix the build" 2012-03-14 17:38:32 -07:00
Romain Guy
06298b0e2d Fix the build
Change-Id: Ic3694c295e578f7c089e698dbcebdff685a7968f
2012-03-14 17:37:40 -07:00
Selim Gurun
146059898b Merge "Fix file path calculation for asset files." 2012-03-14 17:36:37 -07:00
Philip Milne
b269aaf860 Merge "Fix for bug 6170890." 2012-03-14 17:36:21 -07:00
Philip Milne
edd69518ff Fix for bug 6170890.
Also fix logic for consistency checking. Prior to this CL
GridLayout was causing Launcher to issue warnings to the logs
incorrectly.

Change-Id: I9d4017388e7c80c8bc5fa6cab97970835ff261fe
2012-03-14 17:27:26 -07:00
Romain Guy
c3da1b44e6 Merge "Optimize invalidate calls in lists." 2012-03-14 17:24:04 -07:00
Romain Guy
9d849a2f63 Optimize invalidate calls in lists.
AbsListView was doing too many invalidates during scrolls/flings.
Some of them were also covering too large an area of the screen.

Change-Id: I68fe5dda3657bddd673996e7cf4f3c3672c66cfc
2012-03-14 17:19:35 -07:00
Eino-Ville Talvala
bf4431bd93 Move CameraParameters.h to frameworks/native.
CameraParameters.h is indirectly required to implement the Camera
HAL. Move it to frameworks/native.

Bug: 6171735
Change-Id: I1bf4db228333be16fc7caa3c51280a9495293011
2012-03-14 17:14:19 -07:00
Android Git Automerger
f197d6a8d2 Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-03-14 17:10:53 -07:00
Robert Ly
75bb459452 am af3701f4: am 957f716c: docs: fix toc in search au class
* commit 'af3701f41382250912e7adb656a1b820d06c59eb':
  docs: fix toc in search au class
2012-03-14 16:59:38 -07:00
Robert Ly
c600323c59 am da04da21: am 957f716c: docs: fix toc in search au class
* commit 'da04da21cede129282cd31367a242ed41b9a2f9a':
  docs: fix toc in search au class
2012-03-14 16:59:06 -07:00
Marco Nelissen
0e9241dff5 Merge "Fix Xing seeking when TOC[0] == 0" 2012-03-14 16:58:13 -07:00