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.
+ 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.
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.
Merge commit 'd68781ace179e19b70120411baf307104683fa4b' into eclair-plus-aosp
* commit 'd68781ace179e19b70120411baf307104683fa4b':
change default for dither to true
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
Merge commit 'e7eb85cae02375b8bc486d71f429ca0c60980d79'
* commit 'e7eb85cae02375b8bc486d71f429ca0c60980d79':
API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.
Merge commit '005b228cdfb369d9b3b325884c0337ba5968bf8c' into eclair-plus-aosp
* commit '005b228cdfb369d9b3b325884c0337ba5968bf8c':
API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.
This is a large batch, and covers:
-- Bluetooth Device Discovery --
BluetoothAdapter.ACTION_DISCOVERY_STARTED
BluetoothAdapter.ACTION_DISCOVERY_FINISHED
BluetoothAdapter.startDiscovery()
BluetoothAdapter.cancelDiscovery()
BluetoothAdapter.isDiscovering()
-- Bluetooth bonding (pairing) --
BluetoothAdapter.getBondedDevices()
BluetoothDevice.ACTION_BOND_STATE_CHANGED
BluetoothDevice.EXTRA_BOND_STATE
BluetoothDevice.EXTRA_PREVIOUS_BOND_STATE
BluetoothDevice.BOND_NONE
BluetoothDevice.BOND_BONDING
BluetoothDevice.BOND_BONDED
BluetoothDevice.getBondState()
BluetoothDevice.createBond()
BluetoothDevice.cancelBondProcess()
BluetoothDevice.removeBond()
-- BluetoothClass --
BluetoothDevice.ACTION_CLASS_CHANGED
BluetoothDevice.EXTRA_CLASS
BluetoothDevice.getBluetoothClass()
BluetoothClass.Service.*
BluetoothClass.Device.Major.*
BluetoothClass.Device.*
BluetoothClass.getDeviceClass()
BluetoothClass.getMajorDeviceClass()
BluetoothClass.hasService()
-- Misc BluetoothDevice --
BluetoothDevice.ACTION_ACL_CONNECTED
BluetoothDevice.ACTION_ACL_DISCONNECTED_REQUESTED
BluetoothDevice.ACTION_ACL_DISCONNECTED
BluetoothDevice.ACTION_DISCOVERED
BluetoothDevice.ACTION_NAME_CHANGED
BluetoothDevice.EXTRA_DEVICE
BluetoothDevice.EXTRA_NAME
BluetoothDevice.EXTRA_RSSI
-- Misc BluetoothAdapter --
BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED
BluetoothAdapter.EXTRA_LOCAL_NAME
BluetoothAdapter.checkBluetoothAddress()
I deprecated BluetoothIntent and moved each intent into the class it relates
to.
Change-Id: I877b1280428ab46278b2bc25668bb44cda22dc36
Also pretend to fix#2054990 (com.android.frameworktest: java.lang.NullPointerException
at android.accessibilityservice.AccessibilityService$IEventListenerWrapper.executeMessage(
AccessibilityService.java:215))... simply by making the variable that apparently was
null final, to assure myself that there is no possible way in the world for it to be
null. :p
Change-Id: I73e337d65b8360721896a0296691257b3e47564b
Merge commit '38a1081cad9385073d80d358decf04f6b2fd5723' into eclair-plus-aosp
* commit '38a1081cad9385073d80d358decf04f6b2fd5723':
Add smallIcon and accountPreferences references to AuthenticatorDescription. Update after path conflict.
