summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix bug 3210201 - Popup window wrong size/position when IME hidden"Adam Powell2010-12-142-0/+7
|\
| * Fix bug 3210201 - Popup window wrong size/position when IME hiddenAdam Powell2010-12-142-0/+7
| | | | | | | | | | | | | | | | Fixes a case where ViewRoot does not recompute its size properly. This caused various offsets to get out of sync and the window would draw improperly. Change-Id: Id0abb37bbf27b60de2dca4077c21040ec84ef163
* | Merge "Updated spinner assets from UX"Adam Powell2010-12-1422-0/+0
|\ \
| * | Updated spinner assets from UXAdam Powell2010-12-1422-0/+0
| | | | | | | | | | | | Change-Id: Ied9f7f3996fb7420978762228bef3f9a8dbef8c8
* | | Merge "DHCP core classes, defining data, behavior, and state transitions for ↵Robert Greenwalt2010-12-149-0/+1555
|\ \ \ | | | | | | | | | | | | the DHCP protocol. The DHCP client and DHCP server classes are not included in this commit: still working out some integration issues with ethernet & wifi services"
| * | | DHCP core classes, defining data, behavior, and state transitions for the DHCPStan Chesnutt2010-12-149-0/+1555
| | | | | | | | | | | | | | | | | | | | | | | | | | | | protocol. The DHCP client and DHCP server classes are not included in this commit: still working out some integration issues with ethernet & wifi services Change-Id: I0c9cc48b7d960005b73ecb757c1fa66f0eb68471
* | | | Merge "Add support for non-malloc backed textures."Jason Sams2010-12-143-42/+78
|\ \ \ \
| * | | | Add support for non-malloc backed textures.Jason Sams2010-12-133-42/+78
| | | | | | | | | | | | | | | | | | | | Change-Id: Iee8e987591caa17b4c8186f8173089925140a568
* | | | | Merge "LayoutLib: Misc fix to rendering."Xavier Ducrohet2010-12-143-1/+4
|\ \ \ \ \
| * | | | | LayoutLib: Misc fix to rendering.Xavier Ducrohet2010-12-143-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia73fab1be3c01e6ce5791973e636e45a0f75ceb6
* | | | | | Merge "MTP: Make recursive delete more efficient"Mike Lockwood2010-12-141-16/+32
|\ \ \ \ \ \
| * | | | | | MTP: Make recursive delete more efficientMike Lockwood2010-12-141-16/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iec9df8ac910f5257236b59c95b0ee3d7d05f367c Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | am 042042b8: am 2bd83c00: Merge "Work on issue #3255640: Need to bump GB to ↵Dianne Hackborn2010-12-140-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API 10 version name "2.4"" into gingerbread * commit '042042b809e3a0ff6cea915ccc7b176948833be9': Work on issue #3255640: Need to bump GB to API 10 version name "2.4"
| * \ \ \ \ \ \ am 2bd83c00: Merge "Work on issue #3255640: Need to bump GB to API 10 ↵Dianne Hackborn2010-12-141-0/+418795
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version name "2.4"" into gingerbread * commit '2bd83c00a0c72d3f6bd929c4df5fe83ee31b4704': Work on issue #3255640: Need to bump GB to API 10 version name "2.4"
| | * \ \ \ \ \ \ Merge "Work on issue #3255640: Need to bump GB to API 10 version name "2.4"" ↵Dianne Hackborn2010-12-141-0/+418795
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread
| | | * | | | | | | Work on issue #3255640: Need to bump GB to API 10 version name "2.4"Dianne Hackborn2010-12-141-0/+418795
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New API definition for API level 10. Change-Id: I1d78374ca5a17d568dc6f6b1ae8fb456f4d4aa88
* | | | | | | | | | Merge "HWC Stres Test Enhancments"Louis Huemiller2010-12-141-34/+57
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | HWC Stres Test EnhancmentsLouis Huemiller2010-12-141-34/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + YV12 width/height divisable by 2 + Row width determined by getStride() + Misc comment and whitespace fixes + printf changed to testPrintI Change-Id: I27551141bafbfb258eb1b6b7f63c5295b1f9501a
* | | | | | | | | | | Merge "Expose split touch API on PopupWindow."Jeff Brown2010-12-142-10/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Expose split touch API on PopupWindow.Jeff Brown2010-12-142-10/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Already exposed the new window flags and layout parameters, just forgot to make this API visible at the same time. Bug: 3049580 Change-Id: If8dc3568eb2806fa21881c31b9f879d6045ca890
* | | | | | | | | | | | Merge "Move HashMapTest from frameworks/base to libcore (second half)"Jesse Wilson2010-12-141-281/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Move HashMapTest from frameworks/base to libcore (second half)Jesse Wilson2010-12-141-281/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I178e376ab12d82e23a8b0ddd267a6c150c9bbddf http://b/3073226
* | | | | | | | | | | | | Merge "Colors are in the [0..1] range, not [0..255]"Romain Guy2010-12-141-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Colors are in the [0..1] range, not [0..255]Romain Guy2010-12-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes rendering in YouTube and other applications. Change-Id: Ib5f3df632cde97374113ed42f895f136b2796373
* | | | | | | | | | | | | Merge "Heterogeneous comment for convertView in getView documentation"Gilles Debunne2010-12-141-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Heterogeneous comment for convertView in getView documentationGilles Debunne2010-12-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I28d6b93600d840e9b3e8bf74d0f14d93c4be4fd9
* | | | | | | | | | | | | Merge "Fix an issue where a fixed number of bits per sample is used for seek ↵James Dong2010-12-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | position calculation."
| * | | | | | | | | | | | | Fix an issue where a fixed number of bits per sample is used for seek ↵James Dong2010-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | position calculation. The patch was from NV. bug - 3278233 Change-Id: I9bc22b6b0ee6bfa5d4617a8c497f67eb577efca4
* | | | | | | | | | | | | | Merge "Update shortcuts."Jeff Brown2010-12-143-93/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Update shortcuts.Jeff Brown2010-12-133-93/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also modified the shortcut key handling so that it drops chorded Search+X keys when even if no shortcut was found. Without this change, pressing an unhandled shortcut causes the Search widget to pop up and the character to be typed. Bug: 3022227 Change-Id: Ic0921428bd1270604ca28caf1f8493727127f4ed
* | | | | | | | | | | | | | | Merge "LayoutLib: Use the new ninepatch API to suppor density."Xavier Ducrohet2010-12-144-8/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | LayoutLib: Use the new ninepatch API to suppor density.Xavier Ducrohet2010-12-134-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LayoutLib now compiles against a prebuilt of ninepatch. Change-Id: I0a1ca60af90933c171ab3aa456b47f0329df2f55
* | | | | | | | | | | | | | | Merge "Removed no longer used longPressCallback in TextView"Gilles Debunne2010-12-141-7/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Removed no longer used longPressCallback in TextViewGilles Debunne2010-12-141-7/+0
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iadac5579764ef14c2ec7a677c686a396cedc31fa
* | | | | | | | | | | | | | | Merge "OpenGLRenderer would not render colors < ALPHA_THRESHOLD Bug #3282805"Romain Guy2010-12-142-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | OpenGLRenderer would not render colors < ALPHA_THRESHOLDRomain Guy2010-12-142-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #3282805 This bug was introduced with a previous refactoring. This also fixes issues with setting the alpha when drawing bitmaps. Change-Id: Id47641d26a4536c7e540041f92243bf6db9fc96d
* | | | | | | | | | | | | | Merge "Do not increase backoff before it expires"Alon Albert2010-12-141-5/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Do not increase backoff before it expiresAlon Albert2010-12-141-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia5f382f3cc0b0d41bf382d98665dc50512513dda
* | | | | | | | | | | | | | | Merge "1. Add Context to a RenderScript or RenderScriptGL instance. This ↵Shih-wei Liao2010-12-1416-58/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is to allow RenderScript to better interact with the Android environment. E.g., per-app cache. 2. Plumbing, testing. 3. Added getApplicationContext in RenderScript.java."
| * | | | | | | | | | | | | | | 1. Add Context to a RenderScript or RenderScriptGL instance.Shih-wei Liao2010-12-1416-58/+82
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to allow RenderScript to better interact with the Android environment. E.g., per-app cache. 2. Plumbing, testing. 3. Added getApplicationContext in RenderScript.java. Change-Id: I85edeebe38825e20b2e86f4f4815689dfc332ef9
* | | | | | | | | | | | | | | am 0ccc8b73: am 5441a9ff: Merge "GL texture filtering changed from AND to ↵Dan Morrill2010-12-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | / / / / / / | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread * commit '0ccc8b7345eac0b507c221be47e55926cbda8957': GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen).
| * | | | | | | | | | | | | am 5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename ↵Dan Morrill2010-12-141-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread * commit '5441a9ff2128cf2c5088974c74b79d2d1734f755': GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen).
| | * | | | | | | | | | | | Merge "GL texture filtering changed from AND to OR, so rename tag name to ↵Dan Morrill2010-12-141-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread
| | | * | | | | | | | | | | GL texture filtering changed from AND to OR, so rename tag name to match.Dan Morrill2010-12-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen). Change-Id: I0f20aed7f95169d9adfc7fe128191eb6e49d116f
* | | | | | | | | | | | | | 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