summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix the issue where onFrameAvailable is not triggered if ↵Jamie Gennis2011-06-231-1/+8
|\ | | | | | | SurfaceTexture is in sync mode."
| * Fix the issue where onFrameAvailable is not triggered if SurfaceTexture is ↵Grace Kloba2011-06-221-1/+8
| | | | | | | | | | | | | | | | in sync mode. If there is more frame after updateTexImage, trigger the listener again. Change-Id: I1415ae9a914cc8bb139cb369464b1f6a2aa24058
* | Merge "Fix issue #4770360: older app compatibility mode is really tiny on ↵Dianne Hackborn2011-06-234-36/+64
|\ \ | | | | | | | | | ICS phones"
| * | Fix issue #4770360: older app compatibility mode is really tiny on ICS phonesDianne Hackborn2011-06-234-36/+64
| | | | | | | | | | | | | | | | | | | | | We were applying the density compat mode scaling multiple times to display metrics, causing bad values. Change-Id: Iafafd9a5e94b9d774cd2715bf968e91602a1bd82
* | | Handle baseline aligned rows in which some components define baseline and ↵Philip Milne2011-06-231-18/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some don't. Also: . Make all of the methods in Alignment package private. . Inlucde Tor's test case Change-Id: If78a6a3b653723d9e12d6b162fd0c86b11a82dff
* | | am 1cc0fa41: am db45e0bd: am ecce539f: Merge "Release wakelock after use" ↵Irfan Sheriff2011-06-231-1/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2 * commit '1cc0fa416f195732cc7c04cebfaabe7f3fe994c7': Release wakelock after use
| * \ \ am db45e0bd: am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2Irfan Sheriff2011-06-221-1/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'db45e0bdd02c2b9416b89999422561929feb5cc0': Release wakelock after use
| | * \ \ am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2Irfan Sheriff2011-06-221-1/+9
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ecce539f3d739fbf4b395639a485fddf51f688d6': Release wakelock after use
| | | * | | Release wakelock after useIrfan Sheriff2011-06-211-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DHCP renewal can finish pretty quick most times and holding a timed wakelock wastes battery. Hold a non-reference counted lock and release it immediate while having the safety of a 40s release Bug: 4575773 Change-Id: I49d2e8c27b2723690aef26417c4b9a145843a401
| * | | | | am 38053dad: am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration ↵Irfan Sheriff2011-06-221-7/+18
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling"" * commit '38053dad9f8b988a162fba89545f4f7b8a09d34c': Revert "DO NOT MERGE Revert "Fix lease duration handling""
| | * | | | am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling""Irfan Sheriff2011-06-221-7/+18
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '41b35884ff68a62f5fc8f65dcc26342d0889113d': Revert "DO NOT MERGE Revert "Fix lease duration handling""
| | | * | | Revert "DO NOT MERGE Revert "Fix lease duration handling""Irfan Sheriff2011-06-211-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7dd120058972226158176b292c00841efecc259f.
| * | | | | am cf99765b: resolved conflicts for merge of 914ed90f to honeycomb-LTEIrfan Sheriff2011-06-223-3/+395
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'cf99765b6255d73aa4fbc61d5bd78ec65fbd0370': Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
| | * | | | resolved conflicts for merge of 914ed90f to honeycomb-LTEIrfan Sheriff2011-06-223-3/+395
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e
| | | * | | Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""Irfan Sheriff2011-06-213-3/+395
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 58d1bb497e0d83e28a02fbcdc1f33f29a992db7e.
| * | | | | am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to ↵Irfan Sheriff2011-06-223-395/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE" into honeycomb-LTE * commit '5d5b73be515d839d72e1cf7aeffdfdfb56d66045': DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
| | * | | | resolved conflicts for merge of 267a6181 to honeycomb-LTEIrfan Sheriff2011-06-223-395/+3
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04
| | | * | | DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"Irfan Sheriff2011-06-213-395/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fe3b33d4ead06c546202753e38188db5e2eaa7fa. Change-Id: I3a9ae1f0d17e7a154d27d4f3f3eb1efa21a34f64
| * | | | | am 885c3c11: am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration ↵Irfan Sheriff2011-06-211-18/+7
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling"" into honeycomb-mr2 * commit '885c3c11cf1e20c456ddf681a06a4a878426a632': DO NOT MERGE Revert "Fix lease duration handling"
| | * | | | am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into ↵Irfan Sheriff2011-06-211-18/+7
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit 'bc4ddef479011e200d0273fe73c22922a85de1fe': DO NOT MERGE Revert "Fix lease duration handling"
| | | * | | DO NOT MERGE Revert "Fix lease duration handling"Irfan Sheriff2011-06-211-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 56878760c3f0255dbcc8d78572f784b96ee36cb0.
* | | | | | Add onSurfaceTextureUpdated to the TextureView listener.Grace Kloba2011-06-221-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The app needs a way to throttle the producer side. Expose this to enable it. Change-Id: I04b6a3fc444117a9fc2449fb87c3c834247c8ef1
* | | | | | Merge "Enable bandwidth module from stats service."Jeff Sharkey2011-06-222-0/+4
|\ \ \ \ \ \
| * | | | | | Enable bandwidth module from stats service.Jeff Sharkey2011-06-222-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During systemReady(), tell netd to enable bandwidth tracking module, which is used to provide detailed stats and controls. Change-Id: Iecfd8b17a3b90f5a817d731fbe1c71777681ed6e
* | | | | | | Fix bug 4887033 - android.app.cts.AlertDialog_BuilderTest#testDisableCancelableAdam Powell2011-06-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I659201124c4c6730046be55a918c64ca57a9f4db
* | | | | | | Merge "Tweak action bar metrics."Adam Powell2011-06-225-16/+48
|\ \ \ \ \ \ \
| * | | | | | | Tweak action bar metrics.Adam Powell2011-06-225-16/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Free up some more pixels in the action bar and better define how icons within it resize. Change-Id: I0768180e595ee7b23190a26607e8989fa1bac38f
* | | | | | | | Merge "Prevent possible NPE in TextureView"Romain Guy2011-06-221-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Prevent possible NPE in TextureViewRomain Guy2011-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I539813d614c7eb1f68dad6b605cbad5b5144c5e9
* | | | | | | | | Merge "Add the ability to specify the opacity of a TextureView"Romain Guy2011-06-227-40/+69
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add the ability to specify the opacity of a TextureViewRomain Guy2011-06-227-40/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TextureView assumes its content is opaque by default. Change-Id: Iba873423566a5b67c388081838bd910dceba32ba
* | | | | | | | resolved conflicts for merge of 6ce70394 to masterNick Pelly2011-06-221-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | Change-Id: I7a4a08409c0133a1738b03b476f2b388c7aec5bf
| * | | | | | | am 6f1a8edc: am 17523abb: NFC Adapter Extras API update.Nick Pelly2011-06-201-3/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6f1a8edcc00db40a8ad300e15a23f7f1de298c3b': NFC Adapter Extras API update.
| | * \ \ \ \ \ \ am 17523abb: NFC Adapter Extras API update.Nick Pelly2011-06-201-3/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '17523abb45b7f77f35af53e895d74be13f2314e0': NFC Adapter Extras API update.
| | | * | | | | | | NFC Adapter Extras API update.Nick Pelly2011-06-171-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove o registerTearDownApdus() o deregisterTearDownApdus() They were already NO-OPS, and don't work in the general case. Add o authenticate(byte[] token) This future proofs us for a more flexible access control scheme. Change-Id: I4cb67ceeb63d61cbc333c9b244a96d8687402168
* | | | | | | | | | Merge "Update LockScreen layouts to latest UX spec."Jim Miller2011-06-2236-398/+475
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update LockScreen layouts to latest UX spec.Jim Miller2011-06-2236-398/+475
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - better placement and consistent handling of emergency button. - use new GridLayout for landscape modes. - add dimensionable parameters for time and status line fonts. - fix assets and emergencyCallButton resource references when building for tablets. Change-Id: I5f4c9cfb6a88ce3ccd8ab4fdafede8e6e59f9407
* | | | | | | | | | | Merge "Use local variable instead of webview method."Shimeng (Simon) Wang2011-06-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use local variable instead of webview method.Shimeng (Simon) Wang2011-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the thread warning. Change-Id: Id2eec46fda8413cfaed49d2a97de40491b7496a2
* | | | | | | | | | | | Merge "Fix flashing artifacts caused by invalidation bugs"Chet Haase2011-06-221-2/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix flashing artifacts caused by invalidation bugsChet Haase2011-06-221-2/+11
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Therea re 2 fixes here: - We sometimes cleared a flag in ViewAncestor too soon that controlled how invalidated areas were redrawn (related to whether the invalidates happened on opaque views or not). - TransitionDrawable was always setting/restoring alpha values on its drawables every time it was drawn. setAlpha on BitmapDrawable causes an invalidation, so essentially this was an infinite invalidation/redrawing loop. The fix was to notice when the animation was done and to simply draw the appropriate drawable[s]. Change-Id: I1849a5a909b0039a0e9bce0aa3cfc33c50f8f854
* | | | | | | | | | | | Get the profile proxies after the BT Service is up.Jaikumar Ganesh2011-06-221-1/+1
| |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to get the profile proxies before service is up will cause a NPE. Change-Id: I604041d6823775abbc2fe10794afaac83d6827ce
* | | | | | | | | | | Merge "Collapse UI events in TextureView."Romain Guy2011-06-222-19/+21
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Collapse UI events in TextureView.Romain Guy2011-06-222-19/+21
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia6c0cef0f694edc4b685c1ade1a9ba509a51e541
* | | | | | | | | | Merge "resolved conflicts for merge of 7a652bc8 to master"Robert Greenwalt2011-06-222-12/+14
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | resolved conflicts for merge of 7a652bc8 to masterRobert Greenwalt2011-06-222-12/+14
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| / / / / / / / | | |/ / / / / / / Change-Id: Id0a41cae36f5a3b30f2fe8a202c934153b9cd03f
| | * | | | | | | resolved conflicts for merge of b427f0e6 to honeycomb-plus-aospRobert Greenwalt2011-06-202-12/+14
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713
| | | * | | | | | Fix tethering upstream determination.Robert Greenwalt2011-06-202-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used to use iface names, but on mobile ifaces are multipurpose. Refined to use ConnectivityService types. bug:4530116 Change-Id: Iaa632d5f540d27ffff683bd7d94f8004bf422e71
* | | | | | | | | Merge "Fix the issue where TextureView stuck if the producer side is too fast."Romain Guy2011-06-221-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix the issue where TextureView stuck if the producer side is too fast.Grace Kloba2011-06-221-1/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When SurfaceTexture is in sync mode, the consumer needs to pull the pending frames. Otherwise the onFrameAvailable won't be called and no more update. This simple fix is to skip frame to keep up with the producer side. Change-Id: Ica833695dc0b0221d2543f46f0dd41aa55d1aa16