summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Off by one index error in word selectionGilles Debunne2010-12-141-1/+1
| | | | Change-Id: Ia6b14b22cc5cf65a235bcdf7cbec48bd76f74460
* Merge "Time out orphaned / unresponsive restore sessions"Christopher Tate2010-12-141-18/+81
|\
| * Time out orphaned / unresponsive restore sessionsChristopher Tate2010-12-131-18/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An app that fires up a restore session but then crashes or drops its session reference will currently render restore functions totally unavailable until the device is rebooted. This CL introduces an inactivity timeout [currently 60 seconds] on restore sessions, after which the session is shut down and becomes unavailable to the app who nominally still held it. Synchronization between the timeout and the normal asynchronous use of the session by the application is managed by running both the timeout action and the normal teardown process on the backup manager service's handler thread. Bug 3276362 Change-Id: I1f63b83e96e66b0e7eb15a1e20e375049babf06e
* | Merge "Don't restore wildly wrong sized wallpapers"Christopher Tate2010-12-143-10/+132
|\ \
| * | Don't restore wildly wrong sized wallpapersChristopher Tate2010-12-133-10/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the dimensions of the original are sufficiently different from the device's preferred dimensions, just don't restore the image. This avoids bad letterboxing / clipping on e.g. phone <-> tablet data migration. The expansion/shrinkage ratios used here allow restores of saved wallpaper images among HVGA devices, among WVGA variants, and among tablets; but skip restoring wallpapers across those categories (where severe clipping or letterboxing would occur). Bug 3261863 Change-Id: I75e75d6401d18f1df10d75796ee04e21d2302cfa
* | | Make TextView respect the maxLines attribute.Gilles Debunne2010-12-141-23/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 3186626 Restore some of the changes introduced in CL 78854. Also added a few comments to the documentation. Change-Id: I775be85c33ebe4a2384a40b21eec57f34fddcd33
* | | am 7afa1613: am a848d344: Merge "Fix bug in permission grant system." into ↵Costin Manolache2010-12-140-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '7afa161368308e78bb4a66b4fd32558dfd556776': Fix bug in permission grant system.
| * \ \ am a848d344: Merge "Fix bug in permission grant system." into gingerbreadCostin Manolache2010-12-142-26/+89
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'a848d3445090e114cbfe61f1c7449122a665fba6': Fix bug in permission grant system.
| | * \ \ Merge "Fix bug in permission grant system." into gingerbreadCostin Manolache2010-12-142-26/+89
| | |\ \ \
| | | * | | Fix bug in permission grant system.Costin Manolache2010-12-092-26/+89
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic7d712e5a672c3eded16fee83235db01ab3c74fa
* | | | | | Merge "Properly signal the condition if we run out of input data."Andreas Huber2010-12-141-0/+1
|\ \ \ \ \ \
| * | | | | | Properly signal the condition if we run out of input data.Andreas Huber2010-12-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7a5ada8c25c1d32ca603b3b2c75e1808e140c367
* | | | | | | Merge "Support malformed ID3 V2.4 tags written by early versions of iTunes."Andreas Huber2010-12-142-5/+25
|\ \ \ \ \ \ \
| * | | | | | | Support malformed ID3 V2.4 tags written by early versions of iTunes.Andreas Huber2010-12-142-5/+25
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I90c2a9bbf216e2ae9a37accdaa2214233f5e54ea related-to-bug: 3275576
* | | | | | | Framework-side support for Dalvik "isSensitiveThread" hook.Brad Fitzpatrick2010-12-143-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used in lock contention stats. Bug: 3226270 Change-Id: Ie6f58d130a29079a59bdefad40b80304d9bc3623
* | | | | | | Merge "Adding TimeAnimator capability (hidden for now)"Chet Haase2010-12-142-7/+85
|\ \ \ \ \ \ \
| * | | | | | | Adding TimeAnimator capability (hidden for now)Chet Haase2010-12-142-7/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge "Add a Setting preference "INPUT_METHOD_SELECTOR_VISIBILITY""satok2010-12-142-0/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a Setting preference "INPUT_METHOD_SELECTOR_VISIBILITY"satok2010-12-142-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3142286 Change-Id: I7d30c781a20863b974b496282bbd8b1ba65d72ac
* | | | | | | | | Merge "notification panel animations"Joe Onorato2010-12-1411-150/+444
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | notification panel animationsJoe Onorato2010-12-1411-150/+444
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3ca06a35be480df6e8741270c10eb1b23b1d4835
* | | | | | | | | | Merge "More API updates."Jason Sams2010-12-1310-193/+63
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | More API updates.Jason Sams2010-12-1310-193/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I754dc645ac08fa25019eed8fd8b7b3c47f178ff2
* | | | | | | | | | Merge "Hide ime switch icon when there are only one IME and no enabled subtypes"satok2010-12-131-1/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Hide ime switch icon when there are only one IME and no enabled subtypessatok2010-12-141-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4684d852cc61db125538e1255fd99fa55d60d593
* | | | | | | | | | | Merge "MTP: check for replacing existing files via the database instead of ↵Mike Lockwood2010-12-132-4/+20
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | the file system"
| * | | | | | | | | | MTP: check for replacing existing files via the database instead of the file ↵Mike Lockwood2010-12-132-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | system Change-Id: I283dab48f24d2836e48fab8e49764a9cdf13de55 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | Merge "Fix issue #3258849: Grab thumbnail when exiting an app via back"Dianne Hackborn2010-12-1314-71/+197
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix issue #3258849: Grab thumbnail when exiting an app via backDianne Hackborn2010-12-1314-71/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also issue #3281400: Rotating a retained instance fragment leaks the fragment manager And turn off fragment debug logging. Change-Id: Ibdd7db82bb35618021bcba421ba92ced7cd691c2
* | | | | | | | | | | MTP: Create files/folders with group media_rw instead of sdcard_rwMike Lockwood2010-12-131-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | Merge "WPS fixes and refactor"Irfan Sheriff2010-12-1311-162/+472
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | WPS fixes and refactorIrfan Sheriff2010-12-1311-162/+472
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Allow IP and proxy set up for WPS - Use string for WPS pin to avoid losing leading zeros - Add a seperate WPS state machine and WpsConfiguration class Change-Id: I87f43fff8bba0ae8ff02e5fc495a8bc628a8c8cf
* | | | | | | | | | am 483654fb: am 0a97435c: Merge "Update icon guidelines for Gingerbread. ↵Roman Nurik2010-12-1336-2633/+2191
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Also add new, revamped icon templates pack." into gingerbread * commit '483654fb724c7aab619303b50025b6bb25431e87': Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack.
| * | | | | | | | am 0a97435c: Merge "Update icon guidelines for Gingerbread. Also add new, ↵Roman Nurik2010-12-1336-2633/+2191
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revamped icon templates pack." into gingerbread * commit '0a97435c8d776746bb3dcf16824e2cc81eee20aa': Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack.
| | * | | | | | | Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon ↵Roman Nurik2010-12-1336-2633/+2191
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | templates pack." into gingerbread
| | | * | | | | | | Update icon guidelines for Gingerbread. Also add new, revamped icon ↵Roman Nurik2010-12-1336-2633/+2191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | templates pack. Change-Id: Ie02e5e5cade3837e863063bcec8fa5c20a83b1ba
* | | | | | | | | | Merge "Make framework modifier key handling more precise."Jeff Brown2010-12-133-22/+329
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make framework modifier key handling more precise.Jeff Brown2010-12-133-22/+329
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0cc2276b31f882170aea575288f607a3a4ee05d4
* | | | | | | | | | | Merge "Refactor OpenGLRenderer to simplify OpenGL drawing code."Romain Guy2010-12-133-143/+251
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Refactor OpenGLRenderer to simplify OpenGL drawing code.Romain Guy2010-12-133-143/+251
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first step of the refactoring: - drawColorRect - drawTextureMesh Remaining methods to refactor: - setupTextureAlpha8 - drawPath - setupShadow - drawText - drawLines - composeLayerRegion Change-Id: I0fced6a05b6b6eee10ee7cef0c3fbdaa6cefab20
* | | | | | | | | | | | Merge "LayoutLib: implement more of Canvas/Paint."Xavier Ducrohet2010-12-132-36/+103
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | LayoutLib: implement more of Canvas/Paint.Xavier Ducrohet2010-12-132-36/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8e2a7a3bddbce08db5eb641b5075bedd75f7be27
* | | | | | | | | | | | Merge "setTextIsSelectable documentation updated."Gilles Debunne2010-12-131-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | setTextIsSelectable documentation updated.Gilles Debunne2010-12-131-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib48c3b8bba606d8874b92fe56da99eab4f335056
* | | | | | | | | | | | | Merge "Fix bug 3281956 - Cherry-picked from GB"Adam Powell2010-12-131-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix bug 3281956 - Cherry-picked from GBAdam Powell2010-12-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | Avoid SIGSEGV in Bitmap_writeToParcel.Jack Palevich2010-12-131-1/+9
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | Fix bug 3280187 - ActionMode menu content not getting cleared properly when ↵Adam Powell2010-12-135-16/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | finishing Fix bug 3279956 - FastScroller resource loading errors Change-Id: I224b2b820636f88b09740a511aa0a9c480e54a2f
* | | | | | | | | | | | | Merge "Remove delay with auto connection."Jaikumar Ganesh2010-12-132-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove delay with auto connection.Jaikumar Ganesh2010-12-132-6/+10
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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