Merge commit '944808f392e416858e3265b14b9e0a4410a1dbbf' into eclair-plus-aosp
* commit '944808f392e416858e3265b14b9e0a4410a1dbbf':
Fix a possible NPE in View.
Merge commit '482d54bb0cd9e00fd929185c31fea3ad845d97bc' into eclair-plus-aosp
* commit '482d54bb0cd9e00fd929185c31fea3ad845d97bc':
Add black listing of car kits by name.
Merge commit 'd247aadfc4b8117130908c44a2ed1f6d290a92ef' into eclair-plus-aosp
* commit 'd247aadfc4b8117130908c44a2ed1f6d290a92ef':
Bring up the soft keyboard when touching a focused textfield.
Merge commit 'dd8174928c9c2966b1491acd604612a3b38e600a' into eclair-plus-aosp
* commit 'dd8174928c9c2966b1491acd604612a3b38e600a':
Remove trackball double click. Treat each click as a single click.
Merge commit '298d32e1934cddf6b93e6a4588ab05630cd39ec7' into eclair-plus-aosp
* commit '298d32e1934cddf6b93e6a4588ab05630cd39ec7':
Set the minimum fling to the title height.
Dragging and flinging have different minimums for the max Y
value. Allow the fling to have the title height instead of zero
for the minimum max Y so the title can always be removed via
fling.
This fixes http://b/issue?id=2109006
Merge commit '13bc4ad18bc401c2a80e7dde8cba18841d709a78' into eclair-plus-aosp
* commit '13bc4ad18bc401c2a80e7dde8cba18841d709a78':
Add "rtsp" to the list of URL schemes that get linkified.
Merge commit 'b6e164c779881cf68768224bd67a8d949be0618a' into eclair-plus-aosp
* commit 'b6e164c779881cf68768224bd67a8d949be0618a':
Per suggestion in http://b/issue?id=2062340, update the UNIQUE in the
Merge commit '0fdae4cc744c3be3855b47e82d2244df8503258c' into eclair-plus-aosp
* commit '0fdae4cc744c3be3855b47e82d2244df8503258c':
Use floor to calculate the range to avoid the rounding error triggered
* changes:
Use floor to calculate the range to avoid the rounding error triggered scrollbar. The worst case is that you can never scroll down to the last pixel. The old special case can cause problem when getViewWidth/Height have changed which do not match mLastXXSent any more.
Merge commit '6cb1330d26d2fe8a01c33ab3fbaee2bfebb6f47e' into eclair-plus-aosp
* commit '6cb1330d26d2fe8a01c33ab3fbaee2bfebb6f47e':
Tell GlobalSearch about searches without a suggestion
Merge commit '9a0bf14c4f715a8ffa645c77c4c183dcfa3e31c8' into eclair-plus-aosp
* commit '9a0bf14c4f715a8ffa645c77c4c183dcfa3e31c8':
Moving ImProvider to TalkProvider: Change Im.java to use the new TalkProvider; change the authority
+ For bug 1810508
- Added PerformanceCollector class to collect runtime and memory usage data
* Moved performance snapshotting from Intrumentation to PerformanceCollector
- Added PerformanceResultsWriter interface which defines functions for
reporting performance data
+ Framework integration
- Added TimedTest annotation to automatically time tests and write results
to instrumentation output
- Modified PerformanceTestBase to add collection hooks and wrapper methods
- Modified WatcherResultPrinter in InstrumentationTestRunner to implement
PerformanceResultsWriter for instrumentation output of performance data
- Modified InstrumentationTestRunner and AndroidTestRunner to pass writer
instance to test
Merge commit '38eeac305a188b7ea4f586071c1d467c3f952be6' into eclair-plus-aosp
* commit '38eeac305a188b7ea4f586071c1d467c3f952be6':
Don't backup/restore telephony material from secure settings
* Remove several nonportable telephony settings from the set to be included in
the backed-up dataset
* Explicitly ignore those settings if they're encountered during a restore
operation, so that we don't inadvertently do things like configure a GSM
phone to use CDMA logic.
Merge commit 'd3e061fc8f4a2a1e6b98ee43fd706ac09c786b61' into eclair-plus-aosp
* commit 'd3e061fc8f4a2a1e6b98ee43fd706ac09c786b61':
If disk-full, don't crash the system server. Still todo: when we have disk we should trigger the event again.
scrollbar. The worst case is that you can never scroll down to the last
pixel. The old special case can cause problem when getViewWidth/Height
have changed which do not match mLastXXSent any more.
Remove FIND_HEIGHT from computeVerticalScrollRange per conversation with Leon.
Change computeMaxScrollY to use computeVerticalScrollRange which matches
how it computes X.
Change onMeasure to use contentToViewDimension() as it has the same logic.
Merge commit '02ee5387d3b9904f18d639f4d49612f4b3563eed' into eclair-plus-aosp
* commit '02ee5387d3b9904f18d639f4d49612f4b3563eed':
Add @Widget annotation to GestureOverlayView to make it usable in ADT.
1) Handle incoming 2.1 pairing requests
2) Modify displaying error messages on bond failures.
3) Add delay while accepting incoming pairing for certain 2.1 devices.
When MITM is on, the link key request might come more than once.
Auto accept with a delay.
4) Handle DisplayPasskey callback for pairing a 2.1 keyboard with
a 2.1 device
Merge commit '162ec9993e9695946a6b954fd53eebb63e055540' into eclair-plus-aosp
* commit '162ec9993e9695946a6b954fd53eebb63e055540':
Fix issue #1983406: Soft keyboard doesn't show up in an EditText with "digits" attribute set
Merge commit '8cae124af2142687a6833dbaab8a43df6dd67b43' into eclair-plus-aosp
* commit '8cae124af2142687a6833dbaab8a43df6dd67b43':
Various cleanup around resources and nine-patches.
Remove the stuff that doesn't use preloaded drawables when in
compatibility mode, since this works fine ever since we were able
to deal with drawables in a different density than the canvas.
Change the snapshot function on View to return a snapshot at
the same size that will actually be drawn on screen (when in
compatibility mode), to be able to show scaling artifacts and
all.
This change was original an attempt to fix issue #2101917: Text
field edges appears to be improperly rounded. That turns out to
probably be something deeper in the graphics system, but also
included here is the debugging code I did to try to track down the
problem to make it easy to turn on again later.
Change-Id: I34bfca629639c7ff103f3989d88874112ef778d9
Merge commit '7ff269f359a8848fd0c39993d8fe21a8324806f9' into eclair-plus-aosp
* commit '7ff269f359a8848fd0c39993d8fe21a8324806f9':
Handle DisconnectRequested message sent by Bluez.
This is the framework part of http://b/issue?id=2099399
"executing a search in QSB should create a shortcut (like
when you click on a search suggestion)"
Change-Id: I2d07d9bfc808112948629ca16b24bc870fbd5fa6
add Searchable resource information to the Available Resources doc
and update some some of the attribute documentation to indicate
that the icon label is not recommended.
and fixing merge issue...
Change-Id: I1b1a62aa9804f4a0bf2f93328dde90b9f7aec50a
