Merge commit 'd5a2813bb77653f24aa9f6fba190c7e7cac59f01'
* commit 'd5a2813bb77653f24aa9f6fba190c7e7cac59f01':
Remove trackball double click. Treat each click as a single click.
Merge commit '3ff3e3fc3f3128c785d1b9d66b726426d7840cb8'
* commit '3ff3e3fc3f3128c785d1b9d66b726426d7840cb8':
Set the minimum fling to the title height.
Merge commit '76d82371a90e81f2d5214d7b16ba713cb73771d1'
* commit '76d82371a90e81f2d5214d7b16ba713cb73771d1':
Add "rtsp" to the list of URL schemes that get linkified.
Merge commit '920d01f80a34c4b9098f79433b14091caea6a38a'
* commit '920d01f80a34c4b9098f79433b14091caea6a38a':
Per suggestion in http://b/issue?id=2062340, update the UNIQUE in the
Merge commit 'd161e3f2753507ed0b1d62d2e9d16a882f6db989'
* commit 'd161e3f2753507ed0b1d62d2e9d16a882f6db989':
Use floor to calculate the range to avoid the rounding error triggered
Merge commit 'c16f6f333122ff7c642d2eaa946e9978aadb4dda'
* commit 'c16f6f333122ff7c642d2eaa946e9978aadb4dda':
Tell GlobalSearch about searches without a suggestion
Merge commit 'a47260887917546fc867b8998fa3ba77639d64a4'
* commit 'a47260887917546fc867b8998fa3ba77639d64a4':
Moving ImProvider to TalkProvider: Change Im.java to use the new TalkProvider; change the authority
Merge commit 'd42da36810b392867341b07d5bf1f2c47fa71c86'
* commit 'd42da36810b392867341b07d5bf1f2c47fa71c86':
If disk-full, don't crash the system server. Still todo: when we have disk we should trigger the event again.
Merge commit 'b04c6689d0369209dbf0485a2e0af7f02b521fad'
* commit 'b04c6689d0369209dbf0485a2e0af7f02b521fad':
Add @Widget annotation to GestureOverlayView to make it usable in ADT.
Merge commit 'f6626fecdf3764bff9d40d3eac5c98f3fb9af643'
* commit 'f6626fecdf3764bff9d40d3eac5c98f3fb9af643':
Fix issue #1983406: Soft keyboard doesn't show up in an EditText with "digits" attribute set
Merge commit 'b7860bea3bcbd5217f42f2fa5ead4c498600d517'
* commit 'b7860bea3bcbd5217f42f2fa5ead4c498600d517':
Various cleanup around resources and nine-patches.
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
mlebeau says:
"Basically, because we now show the app icon for in-app
search, showSearchIconAsBadge is a bit unnecessary, but it does in
fact still work. Basically if either showSearchIconAsBadge or
showSearchLabelAsBadge are specified, we grow the height of the search
bar and place the provided icon or the provided label, respectively,
above the text field and app icon. But we do not remove the app icon
if the developer specifies showSearchIconAsBadge - it's still just the
'badge area' above the icon."
Fixes:
http://b/issue?id=2105329
"Deprecate searchable attributes 'showSearchIconAsBadge' and 'icon'"
Change-Id: Ie2976aafe42b4ab870be9e64b34eb0ed441ebbb0
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
