summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* am 196926b9: Merge "DO NOT MERGE" into eclairGrace Kloba2010-01-142-56/+58
|\ | | | | | | | | | | | | Merge commit '196926b9803e586b06b753a0a02a6b0ba2e5a98c' into eclair-plus-aosp * commit '196926b9803e586b06b753a0a02a6b0ba2e5a98c': DO NOT MERGE
| * DO NOT MERGEGrace Kloba2010-01-132-56/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the common ScaleGestureDetector to detect the multi-touch motion. Check both supportZoom and getBuiltInZoomControls to decide whether enable the multi-touch behavior. This should the new pinch behavior only replace the old +/-. Fix http://b/issue?id=2363260 Only update textWrapScale if it is different. This should fix the performance decrease caused by initial multi-touch code. Fix http://b/issue?id=2371694
* | am 56a17690: Merge "TransformGestureDetector is now ScaleGestureDetector - ↵Adam Powell2010-01-132-316/+360
|\ \ | |/ | | | | | | | | | | | | | | scope reduced. N1 screen can\'t reliably handle translation and scaling at the same time." into eclair Merge commit '56a17690b0b9dc2a2e15ef38a37cc4c403c614fe' into eclair-plus-aosp * commit '56a17690b0b9dc2a2e15ef38a37cc4c403c614fe': TransformGestureDetector is now ScaleGestureDetector - scope reduced.
| * TransformGestureDetector is now ScaleGestureDetector - scope reduced.Adam Powell2010-01-132-316/+360
| | | | | | | | N1 screen can't reliably handle translation and scaling at the same time.
* | am 8acdb201: Added TransformGestureDetector (still in progress) Modified ↵Adam Powell2010-01-122-52/+403
|\ \ | |/ | | | | | | | | | | | | | | VelocityTracker to track multiple pointers Added TransformTest Merge commit '8acdb201bdad2cd03c07ebad9cda29f7971ed164' into eclair-plus-aosp * commit '8acdb201bdad2cd03c07ebad9cda29f7971ed164': Added TransformGestureDetector (still in progress)
| * Added TransformGestureDetector (still in progress)Adam Powell2010-01-122-52/+403
| | | | | | | | | | Modified VelocityTracker to track multiple pointers Added TransformTest
* | am ce63c639: Merge "DO NOT MERGE." into eclairGrace Kloba2010-01-122-21/+22
|\ \ | |/ | | | | | | | | | | Merge commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0' into eclair-plus-aosp * commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0': DO NOT MERGE.
| * Merge "DO NOT MERGE." into eclairGrace Kloba2010-01-122-21/+22
| |\
| | * DO NOT MERGE.Grace Kloba2010-01-122-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Couple of tweak for multi-touch in WebView. 1. If we can't zoom, don't get in multitouch mode. This avoid the logo in google.com looks fuzzy. 2. Reset mAnchor after sending VIEW_SIZE_CHANGED. 3. Don't call zoom when finishing multitouch unless zoom is called before. 4. Change the width for nativeSetSize, which was modified in the last check-in. The new logic should make both msn.com and news.google.com looks correct. 5. Use the pressure instead of distance/time to filter out the jitter just before lifting the finger. Fix http://b/issue?id=2360032
* | | am c93c70c4: Merge "framework: storage: Ensure that filesystems are ↵San Mehat2010-01-124-2/+39
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | unmounted before shutdown/reboot" into eclair Merge commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0' into eclair-plus-aosp * commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0': framework: storage: Ensure that filesystems are unmounted before shutdown/reboot
| * | Merge "framework: storage: Ensure that filesystems are unmounted before ↵San Mehat2010-01-124-2/+39
| |\ \ | | |/ | |/| | | | shutdown/reboot" into eclair
| | * framework: storage: Ensure that filesystems are unmounted before shutdown/rebootSan Mehat2010-01-124-2/+39
| | | | | | | | | | | | Signed-off-by: San Mehat <san@google.com>
* | | am ccaebfc9: Don\'t set priority in Bonding state. This was causing A2DP get ↵Jaikumar Ganesh2010-01-111-2/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | connected for Car Docks, when user didn\'t select it. Merge commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e' into eclair-plus-aosp * commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e': Don't set priority in Bonding state.
| * | Don't set priority in Bonding state.Jaikumar Ganesh2010-01-111-2/+1
| | | | | | | | | | | | | | | | | | | | | This was causing A2DP get connected for Car Docks, when user didn't select it. Bug: 2364328 Dr No: Eastham
* | | am 1edd8277: Merge "Hide unused fields" into eclairTom Taylor2010-01-111-7/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '1edd8277440c83ef44e0128e86afb8c002e49b17' into eclair-plus-aosp * commit '1edd8277440c83ef44e0128e86afb8c002e49b17': Hide unused fields
| * | Merge "Hide unused fields" into eclairTom Taylor2010-01-111-7/+12
| |\ \ | | |/ | |/|
| | * Hide unused fieldsTom Taylor2010-01-051-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When ContactHeaderWidget.bindFromPhoneNumber is called with a number that's not in contacts, onQueryComplete takes a path that doesn't hide fields that don't apply to the current phone number. As a result, the user sees the new number, but old data from the previous display (such as the facebook status). With this change, those fields are hidden. Fixes bug 2336977. Change-Id: Ib6253c18dc58c3d28b463c87d5d195a84d613600
* | | am a2b0d38f: First draft of multitouch in the WebView.Grace Kloba2010-01-112-169/+398
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'a2b0d38f8c6311e712c32318d4ebb68e5a2fecef' into eclair-plus-aosp * commit 'a2b0d38f8c6311e712c32318d4ebb68e5a2fecef': First draft of multitouch in the WebView.
| * | First draft of multitouch in the WebView.Grace Kloba2010-01-112-169/+398
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we just handle a simple pinch action. We will wait for framework support for more complicated gesture. When pinch in the webview, zoom level will be changed on the fly. But we won't re-wrap the text until user action like double tap, rotate screen. Double tap will re-layout the page and wrap the text to the screen width. We try to keep the spot you tapped at the same place on the screen after relayout. If the block after relayout fully fit on the current screen, we will center it for easy reading. Fix http://b/issue?id=2360032
* | | am a1759cea: Merge "add eventlog message whenever sqlite reports db ↵Vasu Nori2010-01-081-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | corruption error" into eclair Merge commit 'a1759ceac2f56f1c83ad6d1bc38e30ece2bf99fd' into eclair-plus-aosp * commit 'a1759ceac2f56f1c83ad6d1bc38e30ece2bf99fd': add eventlog message whenever sqlite reports db corruption error
| * | Merge "add eventlog message whenever sqlite reports db corruption error" ↵Vasu Nori2010-01-081-0/+1
| |\ \ | | | | | | | | | | | | into eclair
| | * | add eventlog message whenever sqlite reports db corruption errorVasu Nori2010-01-081-0/+1
| | | |
* | | | am aa3b5961: javadoc change: fix the selector sample XML in the class ↵Scott Main2010-01-081-0/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | description (was broken due to improper ordering) Merge commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea' into eclair-plus-aosp * commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea': javadoc change: fix the selector sample XML in the class
| * | | javadoc change: fix the selector sample XML in the classScott Main2010-01-081-1/+6
| | | | | | | | | | | | | | | | description (was broken due to improper ordering)
* | | | am 663ec308: Fix issue 2361949: A2DP suspend parameters set wrongly.Eric Laurent2010-01-081-4/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '663ec308801a34de82db9ab993f0e906da690f89' into eclair-plus-aosp * commit '663ec308801a34de82db9ab993f0e906da690f89': Fix issue 2361949: A2DP suspend parameters set wrongly.
| * | | Fix issue 2361949: A2DP suspend parameters set wrongly.Eric Laurent2010-01-081-4/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | Move reset of A2DP suspend state from handleSinkStateChange() in BluetoothA2dpService to BluetoothA2dp.ACTION_SINK_STATE_CHANGED intent receiver in AudioService. Previous implementation could cause a false reset of suspend state if a new sink attempted to connect while A2DP was suspended. New implementation only resets A2DP suspend state when a new sink is actually connected.
* | | am d71c2aa1: Merge "SDK doc change: add "Optimizing Judiciously" excerpt to ↵Dirk Dougherty2010-01-071-22/+22
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | best practices. Clean up blockquote usage in other files." into eclair Merge commit 'd71c2aa1a33a456b631ae539fe57f8eb5615fcd5' into eclair-plus-aosp * commit 'd71c2aa1a33a456b631ae539fe57f8eb5615fcd5': SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.
| * | Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best ↵Dirk Dougherty2010-01-071-22/+22
| |\ \ | | | | | | | | | | | | practices. Clean up blockquote usage in other files." into eclair
| | * | SDK doc change: add "Optimizing Judiciously" excerpt to best practices. ↵Dirk Dougherty2010-01-071-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up blockquote usage in other files. Bug: 2160782 Change-Id: I537194ecddc53d4f0e8456ce958ae8db6f521593
* | | | am 0b6c6f2c: Merge "Fix media option settings for A2DP." into eclairJaikumar Ganesh2010-01-061-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b' into eclair-plus-aosp * commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b': Fix media option settings for A2DP.
| * | | Fix media option settings for A2DP.Jaikumar Ganesh2010-01-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incoming connections move the A2DP state to Connecting before getting authorized, which messes up the priorities. Dr No: Eastham Bug: 2358414
* | | | am 42c98ada: Still use ro.monkeyYing Wang2010-01-061-2/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '42c98ada113ae5b7c72ecb6d0de721ec1d0d3534' into eclair-plus-aosp * commit '42c98ada113ae5b7c72ecb6d0de721ec1d0d3534': Still use ro.monkey
| * | | Still use ro.monkeyYing Wang2010-01-061-2/+1
| | |/ | |/| | | | | | | http://b/issue?id=1681101
* | | am 08fa1428: Rename ro.monkey to monkey.runningYing Wang2010-01-041-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '08fa1428eed52083789dc3b366aea4873199bd37' into eclair-plus-aosp * commit '08fa1428eed52083789dc3b366aea4873199bd37': Rename ro.monkey to monkey.running
| * | Rename ro.monkey to monkey.runningYing Wang2010-01-041-1/+1
| |/ | | | | | | So that Monkey can set ro.mokey before running and reset it after running.
* | merge from open-source masterJean-Baptiste Queru2009-12-212-13/+35
|\ \
| * \ Merge change I700e6d4dAndroid Code Review2009-12-211-12/+34
| |\ \ | | | | | | | | | | | | | | | | * changes: Time.parse3339 range checking and proper 'sec-frac' skip
| | * | Time.parse3339 range checking and proper 'sec-frac' skipKenny Root2009-11-161-12/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parse3339 JNI code doesn't properly do bounds checking on the input String. These changes do some bounds checking to prevent a buffer underflow condition. parse3339 should allow the fractional seconds to be optional and an arbitrary length as specified in RFC 3339. This will scan through arbitrary precision until it finds the timezone indicators. Change-Id: Ie9d01d0b24163d893c58c747d37873c83b74e6c7
| * | | ImageButton example doesn't work. Default state should be at the last.NoraBora2009-12-171-1/+1
| |/ / | | | | | | | | | see res/res/drawable/button_inset.xml
* | | am 11b97c50: Merge change I551ed729 into eclairJaikumar Ganesh2009-12-213-2/+8
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Merge commit '11b97c50e6fb6d723e88eac3c125b60ca42184f7' into eclair-plus-aosp * commit '11b97c50e6fb6d723e88eac3c125b60ca42184f7': Use UNDEFINED priorities when unpaired.
| * | Merge change I551ed729 into eclairAndroid (Google) Code Review2009-12-213-2/+8
| |\ \ | | | | | | | | | | | | | | | | * changes: Use UNDEFINED priorities when unpaired.
| | * | Use UNDEFINED priorities when unpaired.Jaikumar Ganesh2009-12-113-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the docks, we can set if a device is preferred or not before pairing process. This was getting overridden when we pair. This problem doesn't happen with normal headsets. Dr No: Eastham Bug: 2318290
* | | | am 87ed10d7: Merge change I577dd1f3 into eclairJaikumar Ganesh2009-12-211-2/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '87ed10d78d290f48d382a6e628241da0c61cfb45' into eclair-plus-aosp * commit '87ed10d78d290f48d382a6e628241da0c61cfb45': Accept incoming connections if no other sink is in NonDisconnecting state.
| * | | Merge change I577dd1f3 into eclairAndroid (Google) Code Review2009-12-211-2/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Accept incoming connections if no other sink is in NonDisconnecting state.
| | * | | Accept incoming connections if no other sink is in NonDisconnecting state.Jaikumar Ganesh2009-12-171-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bluez sends SINK_STATE_CHANGE before onAgentAuthorize, so we may be already in CONNECTING state. This will happen with some A2DP kits which don't like us connecting and thus we will never be able to connect to them. Bug:2335345 Dr No: Hiroshi
* | | | | am 77fa05a4: Merge change Iab5952e1 into eclairScott Main2009-12-191-1/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '77fa05a43d3f3f967311d6806fe743017950cf92' into eclair-plus-aosp * commit '77fa05a43d3f3f967311d6806fe743017950cf92': docs: add "required" attribute to the <uses-feature> docs
| * | | | Merge change Iab5952e1 into eclairAndroid (Google) Code Review2009-12-191-1/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: docs: add "required" attribute to the <uses-feature> docs and add a note to the CAMERA permission stating that it enables the <uses-feature> for camera. This is an incrimental update for the 2.0.1 docs. More changes to come for the 2.1 docs to include more features
| | * | | | docs: add "required" attribute to the <uses-feature> docsScott Main2009-12-191-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and add a note to the CAMERA permission stating that it enables the <uses-feature> for camera. This is an incrimental update for the 2.0.1 docs. More changes to come for the 2.1 docs to include more features
* | | | | | am a25032a0: Merge change Ic31c0f62 into eclairScott Main2009-12-181-85/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a25032a08d1cce601c0a52057bc39d9c7e47bfad' into eclair-plus-aosp * commit 'a25032a08d1cce601c0a52057bc39d9c7e47bfad': docs: update the Bluetooth guide with links to the sample
| * | | | | Merge change Ic31c0f62 into eclairAndroid (Google) Code Review2009-12-181-85/+5
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | | * changes: docs: update the Bluetooth guide with links to the sample app, scrub the sibling files, and revise the Bluetooth package summary to point to the BT dev guide.
generated by cgit v1.1 at 2025-02-13 21:51:53 +0000