Commit Graph

4204 Commits

Author SHA1 Message Date
Adam Powell
202a6734fd am 8acdb201: Added TransformGestureDetector (still in progress) Modified VelocityTracker to track multiple pointers Added TransformTest
Merge commit '8acdb201bdad2cd03c07ebad9cda29f7971ed164' into eclair-plus-aosp

* commit '8acdb201bdad2cd03c07ebad9cda29f7971ed164':
  Added TransformGestureDetector (still in progress)
2010-01-12 15:15:43 -08:00
Adam Powell
8acdb201bd Added TransformGestureDetector (still in progress)
Modified VelocityTracker to track multiple pointers
Added TransformTest
2010-01-12 15:08:23 -08:00
Grace Kloba
ba5220fc0c am ce63c639: Merge "DO NOT MERGE." into eclair
Merge commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0' into eclair-plus-aosp

* commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0':
  DO NOT MERGE.
2010-01-12 10:02:48 -08:00
San Mehat
d26707da89 am c93c70c4: Merge "framework: storage: Ensure that filesystems are 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
2010-01-12 10:02:40 -08:00
Grace Kloba
ce63c639e9 Merge "DO NOT MERGE." into eclair 2010-01-12 10:00:03 -08:00
San Mehat
c93c70c4b8 Merge "framework: storage: Ensure that filesystems are unmounted before shutdown/reboot" into eclair 2010-01-12 09:59:35 -08:00
Grace Kloba
e67d5cee67 DO NOT MERGE.
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
2010-01-12 09:58:43 -08:00
San Mehat
7ebf017658 framework: storage: Ensure that filesystems are unmounted before shutdown/reboot
Signed-off-by: San Mehat <san@google.com>
2010-01-12 07:57:42 -08:00
Jaikumar Ganesh
495d820c01 am ccaebfc9: Don\'t set priority in Bonding state. This was causing A2DP get 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.
2010-01-11 14:20:53 -08:00
Jaikumar Ganesh
ccaebfc942 Don't set priority in Bonding state.
This was causing A2DP get connected for Car Docks, when user didn't select it.

Bug: 2364328
Dr No: Eastham
2010-01-11 14:16:29 -08:00
Grace Kloba
6c87c77de4 am a2b0d38f: First draft of multitouch in the WebView.
Merge commit 'a2b0d38f8c6311e712c32318d4ebb68e5a2fecef' into eclair-plus-aosp

* commit 'a2b0d38f8c6311e712c32318d4ebb68e5a2fecef':
  First draft of multitouch in the WebView.
2010-01-11 10:47:21 -08:00
Grace Kloba
a2b0d38f8c First draft of multitouch in the WebView.
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
2010-01-11 10:41:40 -08:00
Vasu Nori
9c74295fb1 am a1759cea: Merge "add eventlog message whenever sqlite reports db corruption error" into eclair
Merge commit 'a1759ceac2f56f1c83ad6d1bc38e30ece2bf99fd' into eclair-plus-aosp

* commit 'a1759ceac2f56f1c83ad6d1bc38e30ece2bf99fd':
  add eventlog message whenever sqlite reports db corruption error
2010-01-08 16:33:50 -08:00
Scott Main
c9a26f291b am aa3b5961: javadoc change: fix the selector sample XML in the class 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
2010-01-08 16:33:45 -08:00
Vasu Nori
a1759ceac2 Merge "add eventlog message whenever sqlite reports db corruption error" into eclair 2010-01-08 15:09:12 -08:00
Scott Main
aa3b5961c0 javadoc change: fix the selector sample XML in the class
description (was broken due to improper ordering)
2010-01-08 12:35:11 -08:00
Eric Laurent
d31d7397ba am 663ec308: Fix issue 2361949: A2DP suspend parameters set wrongly.
Merge commit '663ec308801a34de82db9ab993f0e906da690f89' into eclair-plus-aosp

* commit '663ec308801a34de82db9ab993f0e906da690f89':
  Fix issue 2361949: A2DP suspend parameters set wrongly.
2010-01-08 12:17:08 -08:00
Vasu Nori
dd1b39be1e add eventlog message whenever sqlite reports db corruption error 2010-01-08 10:11:24 -08:00
Eric Laurent
663ec30880 Fix issue 2361949: A2DP suspend parameters set wrongly.
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.
2010-01-08 08:48:18 -08:00
Dirk Dougherty
5f6002ec5f am d71c2aa1: Merge "SDK doc change: add "Optimizing Judiciously" excerpt to 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.
2010-01-07 12:33:48 -08:00
Dirk Dougherty
d71c2aa1a3 Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair 2010-01-07 12:30:14 -08:00
Dirk Dougherty
4e7db25687 SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.
Bug: 2160782
Change-Id: I537194ecddc53d4f0e8456ce958ae8db6f521593
2010-01-07 12:05:01 -08:00
Jaikumar Ganesh
2790b20c53 am 0b6c6f2c: Merge "Fix media option settings for A2DP." into eclair
Merge commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b' into eclair-plus-aosp

* commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b':
  Fix media option settings for A2DP.
2010-01-06 13:46:59 -08:00
Ying Wang
80410b55f1 am 42c98ada: Still use ro.monkey
Merge commit '42c98ada113ae5b7c72ecb6d0de721ec1d0d3534' into eclair-plus-aosp

* commit '42c98ada113ae5b7c72ecb6d0de721ec1d0d3534':
  Still use ro.monkey
2010-01-06 13:46:36 -08:00
Jaikumar Ganesh
6309689e6c Fix media option settings for A2DP.
Incoming connections move the A2DP state to Connecting
before getting authorized, which messes up the priorities.

Dr No: Eastham
Bug: 2358414
2010-01-06 11:43:10 -08:00
Ying Wang
42c98ada11 Still use ro.monkey
http://b/issue?id=1681101
2010-01-06 09:52:57 -08:00
Ying Wang
5c529a0cb5 am 08fa1428: Rename ro.monkey to monkey.running
Merge commit '08fa1428eed52083789dc3b366aea4873199bd37' into eclair-plus-aosp

* commit '08fa1428eed52083789dc3b366aea4873199bd37':
  Rename ro.monkey to monkey.running
2010-01-04 12:59:17 -08:00
Ying Wang
08fa1428ee Rename ro.monkey to monkey.running
So that Monkey can set ro.mokey before running and reset it after running.
2010-01-04 11:56:24 -08:00
Jean-Baptiste Queru
c4978805dc merge from open-source master 2009-12-21 15:32:25 -08:00
Jaikumar Ganesh
f5d2eec4fd am 11b97c50: Merge change I551ed729 into eclair
Merge commit '11b97c50e6fb6d723e88eac3c125b60ca42184f7' into eclair-plus-aosp

* commit '11b97c50e6fb6d723e88eac3c125b60ca42184f7':
  Use UNDEFINED priorities when unpaired.
2009-12-21 14:19:50 -08:00
Jaikumar Ganesh
1aa2559797 am 87ed10d7: Merge change I577dd1f3 into eclair
Merge commit '87ed10d78d290f48d382a6e628241da0c61cfb45' into eclair-plus-aosp

* commit '87ed10d78d290f48d382a6e628241da0c61cfb45':
  Accept incoming connections if no other sink is in NonDisconnecting state.
2009-12-21 14:19:43 -08:00
Android (Google) Code Review
11b97c50e6 Merge change I551ed729 into eclair
* changes:
  Use UNDEFINED priorities when unpaired.
2009-12-21 14:17:15 -08:00
Android (Google) Code Review
87ed10d78d Merge change I577dd1f3 into eclair
* changes:
  Accept incoming connections if no other sink is in NonDisconnecting state.
2009-12-21 14:16:44 -08:00
Scott Main
a2bca7477d am a25032a0: Merge change Ic31c0f62 into eclair
Merge commit 'a25032a08d1cce601c0a52057bc39d9c7e47bfad' into eclair-plus-aosp

* commit 'a25032a08d1cce601c0a52057bc39d9c7e47bfad':
  docs: update the Bluetooth guide with links to the sample
2009-12-18 17:15:38 -08:00
Android (Google) Code Review
a25032a08d Merge change Ic31c0f62 into eclair
* 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.
2009-12-18 17:12:36 -08:00
Jaikumar Ganesh
577dd1f3e2 Accept incoming connections if no other sink is in NonDisconnecting state.
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
2009-12-17 15:08:48 -08:00
NoraBora
41418ecfa7 ImageButton example doesn't work. Default state should be at the last.
see res/res/drawable/button_inset.xml
2009-12-17 11:38:15 -05:00
Scott Main
1362bbcf76 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.
2009-12-16 18:48:02 -08:00
Xavier Ducrohet
b43b35a034 am e6547423: Merge change I10073d50 into eclair
Merge commit 'e6547423e3ed7d84f0d7fee8199e5bbb015fd8c3' into eclair-plus-aosp

* commit 'e6547423e3ed7d84f0d7fee8199e5bbb015fd8c3':
  Add Annotation for optional features.
2009-12-16 12:16:24 -08:00
Android (Google) Code Review
e6547423e3 Merge change I10073d50 into eclair
* changes:
  Add Annotation for optional features.
2009-12-16 12:14:11 -08:00
Eric Fischer
7bbb199912 am 72521860: Merge change I8f657a99 into eclair
Merge commit '725218602e8505cd6fe3075253fcb792727e2431' into eclair-plus-aosp

* commit '725218602e8505cd6fe3075253fcb792727e2431':
  Avoid a crash trying to get a substring whose start is after its end.
2009-12-15 07:42:03 -08:00
Xavier Ducrohet
3274b9b7da Add Annotation for optional features.
This is used by the SDK to display available features in the
editors.

Change-Id: I10073d503d1b3dcb92a5dc526cd054285b85fa3a
2009-12-14 17:52:20 -08:00
Eric Fischer
32929413ff Avoid a crash trying to get a substring whose start is after its end.
Constrain the start of the extracted text, not just the end, to the length
of the content.

Approver: ryanpc
Bug: 2323813
2009-12-14 17:35:36 -08:00
Dianne Hackborn
e9b86b5421 am 474731d5: Merge change I2ffe306f into eclair
Merge commit '474731d5efb30c1e9184f998610054747eb8e764' into eclair-plus-aosp

* commit '474731d5efb30c1e9184f998610054747eb8e764':
  Fix issue #2304284: contacts/dialer/recentcalls constantly flashing
2009-12-11 18:28:45 -08:00
Dianne Hackborn
871ecdce67 Fix issue #2304284: contacts/dialer/recentcalls constantly flashing
Make sure the application is always given the most recent configuration
when launcher.  Use the current configuration, instead of whatever happens
to be set by the app, for reporting what it was launched with.

Change-Id: I2ffe306f56cc9092b640546dd0a28d2c29b9c0b3
2009-12-11 15:24:33 -08:00
Jaikumar Ganesh
551ed72940 Use UNDEFINED priorities when unpaired.
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
2009-12-11 12:00:31 -08:00
Scott Main
0ee7706c59 am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs
Merge commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379' into eclair-plus-aosp

* commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379':
  docs: add the Bluetooth developer guide,
2009-12-09 18:06:58 -08:00
Scott Main
ed2a70d649 docs: add the Bluetooth developer guide,
and make some revisions to the BT javadocs
2009-12-09 17:59:38 -08:00
Jaikumar Ganesh
9a68a0f5d5 am f6e32e72: Merge change Icced7a09 into eclair
Merge commit 'f6e32e72a902d9a309410bc5306a539ea850159f' into eclair-plus-aosp

* commit 'f6e32e72a902d9a309410bc5306a539ea850159f':
  Maintain a list of all Bluetooth docks.
2009-12-09 17:02:25 -08:00
Jaikumar Ganesh
6e9c443460 Maintain a list of all Bluetooth docks.
With this change, isBluetoothDock API can be used anytime and is not in tied
to dock state. The Dock State is a sticky intent so users
can query for the dock state.

Dr No: Eastham
Bug: 2133530
2009-12-09 16:10:38 -08:00