summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0Joe Fernandez2011-11-183-16/+466
|\ | | | | | | | | * commit '366113fa1bea5ef39cf6557f18ff00310eb6e458': docs: Camera Features for developers
| * Merge "docs: Camera Features for developers" into ics-mr0Joe Fernandez2011-11-173-16/+466
| |\
| | * docs: Camera Features for developersJoe Fernandez2011-11-173-16/+466
| | | | | | | | | | | | Change-Id: Ie85f9a5c6808a921b0f80a30749442369740a9c6
* | | am 48eaa6c9: docs: update caption for action bar figure to match new screenshotScott Main2011-11-181-4/+5
|\ \ \ | |/ / | | | | | | | | | * commit '48eaa6c9e5ab224201b17d2ea3e7e43e04c40f3b': docs: update caption for action bar figure to match new screenshot
| * | docs: update caption for action bar figure to match new screenshotScott Main2011-11-171-4/+5
| | | | | | | | | | | | Change-Id: I233383ca7168ddb96231d3d22a5dcd6342462103
* | | Merge "Tie screen saver to the screen off timeout." into ics-mr1Daniel Sandler2011-11-171-4/+44
|\ \ \
| * | | Tie screen saver to the screen off timeout.Daniel Sandler2011-11-171-4/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The window manager now monitors the plug state; the screen saver will never be automatically started if the device is running off battery. Change-Id: Ib1064d9cdd540238957df3ba7020303b0f6943c2
* | | | Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen ↵Adam Powell2011-11-175-6/+2
|\ \ \ \ | | | | | | | | | | | | | | | (UX)" into ics-mr1
| * | | | Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)Adam Powell2011-11-175-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the window-level progress spinner; another is already shown while connecting. Use the correct Settings icon for SystemUI. Specify the activity title for the USB mass storage screen in the manifest to avoid title flashing during startup. Change-Id: Ic57af56bf1661a5eaa91fff77471dc8447340d16
* | | | | Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" ↵Jim Miller2011-11-173-4/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into ics-mr1
| * | | | | Fix 5636798: clear PIN/PUK fields when device sleeps or user cancelsJim Miller2011-11-173-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug is the result of onPause()/onResume() not being called properly when we have both lock and unlock screens present, which is true for the SIM and PUK unlock cases. The fix is to invoke onPause() and onResume() on both of them if they exist. Verified the rest of the code correctly handles having both. Also, when the user cancels, we now clear the fields. Change-Id: If7fbd31df7eab9e3d60656d50d2392607a4bf471
* | | | | | Merge "add a self instrumentation into framework perf app" into ics-mr1Guang Zhu2011-11-174-13/+73
|\ \ \ \ \ \
| * | | | | | add a self instrumentation into framework perf appGuang Zhu2011-11-174-13/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's essentially a test app on itself to facilitate running the perf automatically. Change-Id: I5aad3565e64719d219e76969a989ca80aa6df286
* | | | | | | Merge "Hide/show ime switch icon properly" into ics-mr1satok2011-11-171-10/+17
|\ \ \ \ \ \ \
| * | | | | | | Hide/show ime switch icon properlysatok2011-11-181-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5481999 Change-Id: I4b3dde7285a9ac49da8d5d1133fddd0807b03f4d
* | | | | | | | Merge "Fix 5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1Jim Miller2011-11-173-42/+58
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix 5620754: don't show pattern screen after SIM PUK unlockJim Miller2011-11-173-42/+58
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where we would inadvertently show the pattern screen after PUK-unlocking the device. Could potentially happen after SIM unlock as well, but that path appears to be fast enough that it's rarely seen. The cause was not getting the SIM state change before deciding to show the Unlock screen. We now immediately invoke the callback if SIM/PUK unlock succeeds without waiting for the round-trip from the radio layer. Change-Id: I02dcb456da415b82f30f8e3abc43f788f3931b33
* | | | | | | | Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1Jamie Gennis2011-11-171-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | SurfaceTexture: fix a bug with buffer reallocationJamie Gennis2011-11-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes an issue involving buffer reallocation and the ALLOW_DEQUEUE_CURRENT_BUFFER mode in SurfaceTexture. The bug happened when the buffer slot currently attached to the GL texture was selected for dequeuing, but the dequeue operation caused the buffer to be reallocated. Because the buffer is new, the image producer could fill the buffer and queue it before an updateTexImage call, which would result in the "slot %d is current" error in queueBuffer. Bug: 5631630 Change-Id: Icdd8bc5cad3c7db43953446d9be2603aaea11a8d
* | | | | | | | | Merge "EGL: fix blob cache extension detection" into ics-mr1Jamie Gennis2011-11-171-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | EGL: fix blob cache extension detectionJamie Gennis2011-11-171-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5474671 Change-Id: I6359063ccf23f076fc84c80b8a2f6731a65eef18
* | | | | | | | | Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" ↵David Brown2011-11-172-1/+26
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1
| * | | | | | | | | Fix a crash caused by SIP addresses containing "%40" instead of "@"David Brown2011-11-172-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CallerInfo.doSecondaryLookupIfNecessary() was assuming that SIP addresses would always contain the character '@', but that's not always true since the username/domainname delimiter can actually be "%40" (the URI-escaped equivalent.) This would cause the in-call UI to crash if you ever called a SIP address like "xyz%40example.com". TESTED: - Make an outgoing call to the SIP address "xyz%40example.com" ==> The call ultimately fails, but the in-call UI no longer crashes when it first comes up. Bug: 5637074 Change-Id: I62d15a7ccd509924d38b780b92e657b9efa26125
* | | | | | | | | | Merge "GLES: add image external enums" into ics-mr1Jamie Gennis2011-11-173-1/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | GLES: add image external enumsJamie Gennis2011-11-153-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds Java definitions for the enums of the GL_OES_EGL_image_external OpenGL ES extension. Bug: 3482193 Change-Id: Ib50326f8be9b9cc9021753855c3846ddcdc5eaa2
* | | | | | | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ief57a18b44889bbdfb1bd7bd7c379f49b2f126b8
| * \ \ \ \ \ \ \ \ \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ am 08d40d71: Merge "docs: Big update to action bar guide for ICS. Added ↵Scott Main2011-11-1713-443/+1057
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussio * commit '08d40d71806d482fa92f6a9b952487c3ccc63bb3': docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917
| * | | | | | | | | | | | Merge "docs: Big update to action bar guide for ICS. Added section for ↵Scott Main2011-11-1713-443/+1057
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917" into ics-mr0
| | * | | | | | | | | | | | docs: Big update to action bar guide for ICS.Scott Main2011-11-1713-443/+1057
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917 Change-Id: If61a5f2aad5ed21b0b23b3fc14309a50617f86ce
* | | | | | | | | | | | | | am 69e24843: Merge "Licensing docs: clarifies server response for draft apps ↵Bill Gruber2011-11-171-10/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 2900690" into ics-mr0 * commit '69e24843fc89dcdd35802dbb6a2b693650ec8a41': Licensing docs: clarifies server response for draft apps Bug 2900690
| * | | | | | | | | | | | | Merge "Licensing docs: clarifies server response for draft apps Bug 2900690" ↵Bill Gruber2011-11-171-10/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr0
| | * | | | | | | | | | | | | Licensing docs: clarifies server response for draft appsBill Gruber2011-11-161-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 2900690 Change-Id: Ibd1f14739e553bdc237fdb67322e43bef30dfd17
* | | | | | | | | | | | | | | am ef20eb25: Merge "Filters docs: removes references to forward-locking Bug ↵Bill Gruber2011-11-171-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3055286" into ics-mr0 * commit 'ef20eb2595d0c74eabbcafe6ec50387de37e18de': Filters docs: removes references to forward-locking Bug 3055286
| * | | | | | | | | | | | | | Merge "Filters docs: removes references to forward-locking Bug 3055286" into ↵Bill Gruber2011-11-171-9/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr0
| | * | | | | | | | | | | | | Filters docs: removes references to forward-lockingBill Gruber2011-11-161-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 3055286 Change-Id: Idb64984a1f3437749d9a865885bf4e0b258e60d3
* | | | | | | | | | | | | | | am 7d4c4721: docs: add sums/sizes for adt 15.0.1Scott Main2011-11-171-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7d4c4721c6dd5473464d4620749b302a413c7ebd': docs: add sums/sizes for adt 15.0.1
| * | | | | | | | | | | | | | docs: add sums/sizes for adt 15.0.1Scott Main2011-11-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9dc5e429c09cb31a86d1e867f76f4d3a3997dd87
* | | | | | | | | | | | | | | am 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ↵Fred Chung2011-11-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0 * commit '4750cbd9311b763265f8ab6ddee187e0c9a71665': DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e
| * | | | | | | | | | | | | | Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ↵Fred Chung2011-11-173-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0
| | * | | | | | | | | | | | | | DO NOT MERGE: Bluetooth HDP sample.Fred Chung2011-11-163-0/+12
| | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e Change-Id: I6f9bd5fec6e841395b9fc85d419510c81bfb620c
* | | | | | | | | | | | | | | am 4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0Robert Ly2011-11-172-1/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4f361741185d523b5469a264521eeeb4eee9344d': docs: adt 15.0.1 rel notes
| * | | | | | | | | | | | | | Merge "docs: adt 15.0.1 rel notes" into ics-mr0Robert Ly2011-11-172-1/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | docs: adt 15.0.1 rel notesRobert Ly2011-11-142-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1b8ef6cf578ff88164934250bae9a3af8d2c2200
* | | | | | | | | | | | | | | Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1Christopher Tate2011-11-171-0/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add a few GC-flexing microbenchmark testsChristopher Tate2011-11-171-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added ObjectGc and FinalizingGc to stress single-object allocation and collection with/without the presence of finalizers. Also added GcOp() to the menu of available single-shot tests. Change-Id: I36d3254dfe2e97e504f9e4f77c8addda98ab4f4b
* | | | | | | | | | | | | | | | Merge "Re-enable vril-dump for adb bugreport." into ics-mr1Jake Hamby2011-11-171-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Re-enable vril-dump for adb bugreport.Jake Hamby2011-11-171-3/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vril-dump was causing adb bugreport to hang on Xoom. The OEM fixed the utility and we can now run it again as part of the bug report. Bug: 5482585 Change-Id: I1db3b50c327d50d18fb9c6327c4cd521e09f3916
* | | | | | | | | | | | | | | | am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0Matthew Xie2011-11-172-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6da97a24e329851888890d4e380066037d08bcd7': Check the bluetooth state for getUuid call
| * | | | | | | | | | | | | | | Merge "Check the bluetooth state for getUuid call" into ics-mr0Matthew Xie2011-11-162-7/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
generated by cgit v1.1 at 2024-07-10 23:23:13 +0000