37947 Commits

Author SHA1 Message Date
Gilles Debunne
a3ae4a0656 Make TextView respect the maxLines attribute.
Bug 3186626

Restore some of the changes introduced in CL 78854.

Also added a few comments to the documentation.

Change-Id: I775be85c33ebe4a2384a40b21eec57f34fddcd33
2010-12-14 10:28:35 -08:00
Costin Manolache
03955450e4 am 7afa1613: am a848d344: Merge "Fix bug in permission grant system." into gingerbread
* commit '7afa161368308e78bb4a66b4fd32558dfd556776':
  Fix bug in permission grant system.
2010-12-14 10:20:41 -08:00
Costin Manolache
7afa161368 am a848d344: Merge "Fix bug in permission grant system." into gingerbread
* commit 'a848d3445090e114cbfe61f1c7449122a665fba6':
  Fix bug in permission grant system.
2010-12-14 10:14:10 -08:00
Andreas Huber
1f356b9569 Merge "Properly signal the condition if we run out of input data." 2010-12-14 10:11:28 -08:00
Andreas Huber
69d23b2fc8 Merge "Support malformed ID3 V2.4 tags written by early versions of iTunes." 2010-12-14 10:11:11 -08:00
Costin Manolache
a848d34450 Merge "Fix bug in permission grant system." into gingerbread 2010-12-14 10:07:26 -08:00
Andreas Huber
94bced1eb2 Properly signal the condition if we run out of input data.
Change-Id: I7a5ada8c25c1d32ca603b3b2c75e1808e140c367
2010-12-14 09:54:37 -08:00
Andreas Huber
5d266dd84e Support malformed ID3 V2.4 tags written by early versions of iTunes.
Change-Id: I90c2a9bbf216e2ae9a37accdaa2214233f5e54ea
related-to-bug: 3275576
2010-12-14 09:51:11 -08:00
Brad Fitzpatrick
0bd5243b75 Framework-side support for Dalvik "isSensitiveThread" hook.
Used in lock contention stats.

Bug: 3226270
Change-Id: Ie6f58d130a29079a59bdefad40b80304d9bc3623
2010-12-14 09:28:16 -08:00
Chet Haase
48ea8d8362 Merge "Adding TimeAnimator capability (hidden for now)" 2010-12-14 09:18:33 -08:00
Chet Haase
051d35e41f Adding TimeAnimator capability (hidden for now)
This new class allows listeners to receive callbacks with elapsed time
that are sent on the same animation updates as other animators in the system.
It will allow simulations that go beyond the current animation system while
handling the actual animation timing system and ensuring that those
simulations sync up with other typical animations.

Change-Id: Iac91c39634218793f6598a7dec5ed71dc9630258
2010-12-14 09:17:02 -08:00
satok
6cb3b52df4 Merge "Add a Setting preference "INPUT_METHOD_SELECTOR_VISIBILITY"" 2010-12-14 05:45:44 -08:00
satok
5c58dfcf7d Add a Setting preference "INPUT_METHOD_SELECTOR_VISIBILITY"
Bug: 3142286

Change-Id: I7d30c781a20863b974b496282bbd8b1ba65d72ac
2010-12-14 22:37:23 +09:00
Joe Onorato
4738da2e30 Merge "notification panel animations" 2010-12-14 01:22:23 -08:00
Joe Onorato
7c270fab75 notification panel animations
Change-Id: I3ca06a35be480df6e8741270c10eb1b23b1d4835
2010-12-14 01:20:56 -08:00
Jason Sams
f2e69a911a Merge "More API updates." 2010-12-13 23:53:35 -08:00
satok
7a49e60eb3 Merge "Hide ime switch icon when there are only one IME and no enabled subtypes" 2010-12-13 22:15:17 -08:00
Mike Lockwood
b7b7cdf46a Merge "MTP: check for replacing existing files via the database instead of the file system" 2010-12-13 22:03:14 -08:00
Mike Lockwood
bafca214ea MTP: check for replacing existing files via the database instead of the file system
Change-Id: I283dab48f24d2836e48fab8e49764a9cdf13de55
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-13 21:50:09 -08:00
satok
a84b8d94fb Hide ime switch icon when there are only one IME and no enabled subtypes
Change-Id: I4684d852cc61db125538e1255fd99fa55d60d593
2010-12-14 14:32:57 +09:00
Dianne Hackborn
dbb4ecffe3 Merge "Fix issue #3258849: Grab thumbnail when exiting an app via back" 2010-12-13 20:54:48 -08:00
Dianne Hackborn
d2835935d2 Fix issue #3258849: Grab thumbnail when exiting an app via back
Also issue #3281400: Rotating a retained instance fragment leaks the fragment manager

And turn off fragment debug logging.

Change-Id: Ibdd7db82bb35618021bcba421ba92ced7cd691c2
2010-12-13 20:41:17 -08:00
Mike Lockwood
1b198ea685 MTP: Create files/folders with group media_rw instead of sdcard_rw
Otherwise the sdcard daemon that implements the Fuse file system at
/mnt/sdcard won't have write access to the files.

BUG: 3254123

Change-Id: Ib0c306bbc31ec936fd6164f17e7cd1b5dfff21b8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-13 20:11:15 -08:00
Irfan Sheriff
32f4ab457d Merge "WPS fixes and refactor" 2010-12-13 19:25:59 -08:00
Roman Nurik
21c7fe2266 am 483654fb: am 0a97435c: Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread
* commit '483654fb724c7aab619303b50025b6bb25431e87':
  Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack.
2010-12-13 19:18:26 -08:00
Roman Nurik
483654fb72 am 0a97435c: Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread
* commit '0a97435c8d776746bb3dcf16824e2cc81eee20aa':
  Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack.
2010-12-13 19:15:28 -08:00
Roman Nurik
0a97435c8d Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread 2010-12-13 19:12:42 -08:00
Jeff Brown
29f94b781e Merge "Make framework modifier key handling more precise." 2010-12-13 18:33:00 -08:00
Jeff Brown
28cbf4bd5c Make framework modifier key handling more precise.
Change-Id: I0cc2276b31f882170aea575288f607a3a4ee05d4
2010-12-13 18:31:13 -08:00
Romain Guy
029feb941d Merge "Refactor OpenGLRenderer to simplify OpenGL drawing code." 2010-12-13 18:30:15 -08:00
Romain Guy
70ca14e08a Refactor OpenGLRenderer to simplify OpenGL drawing code.
This is the first step of the refactoring:
- drawColorRect
- drawTextureMesh

Remaining methods to refactor:
- setupTextureAlpha8
- drawPath
- setupShadow
- drawText
- drawLines
- composeLayerRegion

Change-Id: I0fced6a05b6b6eee10ee7cef0c3fbdaa6cefab20
2010-12-13 18:24:33 -08:00
Xavier Ducrohet
28637e3b77 Merge "LayoutLib: implement more of Canvas/Paint." 2010-12-13 18:24:11 -08:00
Gilles Debunne
97d2dadffe Merge "setTextIsSelectable documentation updated." 2010-12-13 18:11:51 -08:00
Adam Powell
09f421481b Merge "Fix bug 3281956 - Cherry-picked from GB" 2010-12-13 18:06:00 -08:00
Roman Nurik
d602b355ba Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack.
Change-Id: Ie02e5e5cade3837e863063bcec8fa5c20a83b1ba
2010-12-13 18:04:41 -08:00
Gilles Debunne
6f100f3895 setTextIsSelectable documentation updated.
Change-Id: Ib48c3b8bba606d8874b92fe56da99eab4f335056
2010-12-13 18:04:20 -08:00
Adam Powell
3cd0c571ea Fix bug 3281956 - Cherry-picked from GB
DO NOT MERGE Fix bug 3124899 - timeout in CTS test
ExpandableListViewBasicTest

A certain sequence of events could cause AbsListView to enter an
infinite event loop. Only report reaching a scroll boundary to the
overscroll code path if the Scroller wants to move further, not if
we're done moving.

Change-Id: Ib61897f619e83b28f08b91e82f2b901cb1739e1a
2010-12-13 18:04:11 -08:00
Jack Palevich
dee4cb07a3 Avoid SIGSEGV in Bitmap_writeToParcel.
SkBitmap::getPixels() can return NULL. The rest of the JNI Bitmap
code treats this NULL as if the SkBitmap has transparent black
pixels. Bitmap_writeToParcel now does the same.

Change-Id: I5e70b42b3d22a8aea898ce342e590000325bd0f9
2010-12-13 17:21:12 -08:00
Adam Powell
128b6ba93d Fix bug 3280187 - ActionMode menu content not getting cleared properly when finishing
Fix bug 3279956 - FastScroller resource loading errors

Change-Id: I224b2b820636f88b09740a511aa0a9c480e54a2f
2010-12-13 17:06:03 -08:00
Jaikumar Ganesh
f812760381 Merge "Remove delay with auto connection." 2010-12-13 16:49:50 -08:00
Scott Main
7ec63994c3 Merge "docs: remove getting started guide for preview" 2010-12-13 16:48:43 -08:00
Scott Main
04e539eaf4 docs: remove getting started guide for preview
Change-Id: Iabd817c4eeb9433a8b70f8aab09595dc1a0dc0da
2010-12-13 16:47:03 -08:00
Chet Haase
5d1bf63131 Merge "Fix artifact with concurrent add/remove LayoutTransitions" 2010-12-13 16:47:00 -08:00
Xavier Ducrohet
8da36314fd LayoutLib: implement more of Canvas/Paint.
Change-Id: I8e2a7a3bddbce08db5eb641b5075bedd75f7be27
2010-12-13 16:42:01 -08:00
Brad Fitzpatrick
996f41da3c am 2d5b11ab: am 0927c902: Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
* commit '2d5b11aba0fec21e1ce3f358eb0d280b62704899':
  Fix StrictMode javadoc copy/paste error.
2010-12-13 16:30:17 -08:00
Nick Kralevich
b019ef6158 am 30ad1e57: am 9dbef975: Merge "Avoid leaking sockets." into gingerbread
* commit '30ad1e576a445b8ffec12ef148f5d7253ebb6ef4':
  Avoid leaking sockets.
2010-12-13 16:30:10 -08:00
Dianne Hackborn
f25eb95b4c Merge "resolved conflicts for merge of 78e9f4cb to master" 2010-12-13 16:28:01 -08:00
Chet Haase
e64ea87f96 Fix artifact with concurrent add/remove LayoutTransitions
There was a bug with LayoutTransitions where if the animations
were of different duration (such as in the current status bar clock),
it was possible to end up in a bad situation because the previous animation
might outlast the new animation, causing the opposite end result
from what was expected. The fix was to keep track of the current
add/remove animations and to cancel any running ones prior to starting
new ones.

Change-Id: I884ce33ce0671f6ba6153ee3951c8d14c5ed5714
2010-12-13 16:15:53 -08:00
Jaikumar Ganesh
2d1fc4e3f5 Remove delay with auto connection.
SDP records are now registered with a dbus call so we don't have to wait
for initiating auto connections.

Also reduce time to connect other profiles case by 2 secs.

Change-Id: I8f0eab6a95d3bfaf11a8eb7495a024949639d7fc
2010-12-13 15:58:44 -08:00
Jason Sams
d4b23b5444 More API updates.
Change-Id: I754dc645ac08fa25019eed8fd8b7b3c47f178ff2
2010-12-13 15:32:35 -08:00