3759 Commits

Author SHA1 Message Date
Jack Wang
65e301c09b am e441dcbb: Merge change 22561 into eclair
Merge commit 'e441dcbb4ed197cf248420308f5eaa935333651e' into eclair-plus-aosp

* commit 'e441dcbb4ed197cf248420308f5eaa935333651e':
  Performance measurement framework:
2009-09-11 18:09:34 -07:00
Jack Wang
ff1df69dd4 Performance measurement framework:
+ 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
2009-09-11 17:15:15 -07:00
Christopher Tate
3c73187566 am 38eeac30: Merge change 24797 into eclair
Merge commit '38eeac305a188b7ea4f586071c1d467c3f952be6' into eclair-plus-aosp

* commit '38eeac305a188b7ea4f586071c1d467c3f952be6':
  Don't backup/restore telephony material from secure settings
2009-09-11 17:13:23 -07:00
Android (Google) Code Review
38eeac305a Merge change 24797 into eclair
* changes:
  Don't backup/restore telephony material from secure settings
2009-09-11 20:04:01 -04:00
Christopher Tate
0738e88935 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.
2009-09-11 16:35:39 -07:00
Costin Manolache
d42da36810 am d3e061fc: Merge change 24609 into eclair
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.
2009-09-11 16:29:47 -07:00
Android (Google) Code Review
d3e061fc8f Merge change 24609 into eclair
* changes:
  If disk-full, don't crash the system server. Still todo: when we have disk we should trigger the  event again.
2009-09-11 19:24:44 -04:00
Romain Guy
b04c6689d0 am 02ee5387: Merge change 24764 into eclair
Merge commit '02ee5387d3b9904f18d639f4d49612f4b3563eed' into eclair-plus-aosp

* commit '02ee5387d3b9904f18d639f4d49612f4b3563eed':
  Add @Widget annotation to GestureOverlayView to make it usable in ADT.
2009-09-11 14:36:20 -07:00
Android (Google) Code Review
02ee5387d3 Merge change 24764 into eclair
* changes:
  Add @Widget annotation to GestureOverlayView to make it usable in ADT.
2009-09-11 17:30:46 -04:00
Romain Guy
51099c5aa6 Add @Widget annotation to GestureOverlayView to make it usable in ADT.
Change-Id: I86251f0d35e38460f09779f047aabfa99d2e97ae
2009-09-11 14:29:15 -07:00
Jaikumar Ganesh
e08e60a7cb am 32d8571f: Changes for BT 2.1
Merge commit '32d8571f509c392dca732c243e9b2138c15daecf' into eclair-plus-aosp

* commit '32d8571f509c392dca732c243e9b2138c15daecf':
  Changes for BT 2.1
2009-09-11 14:27:33 -07:00
Jaikumar Ganesh
32d8571f50 Changes for BT 2.1
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
2009-09-11 14:12:48 -07:00
Dianne Hackborn
f6626fecdf am 162ec999: Merge change 24635 into eclair
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
2009-09-11 13:54:04 -07:00
Dianne Hackborn
b7860bea3b am 8cae124a: Various cleanup around resources and nine-patches.
Merge commit '8cae124af2142687a6833dbaab8a43df6dd67b43' into eclair-plus-aosp

* commit '8cae124af2142687a6833dbaab8a43df6dd67b43':
  Various cleanup around resources and nine-patches.
2009-09-11 13:47:56 -07:00
Android (Google) Code Review
162ec9993e Merge change 24635 into eclair
* changes:
  Fix issue #1983406: Soft keyboard doesn't show up in an EditText with "digits" attribute set
2009-09-11 16:46:19 -04:00
Dianne Hackborn
8cae124af2 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
2009-09-11 13:31:45 -07:00
Jaikumar Ganesh
e291ee8000 am 7ff269f3: Merge change 24735 into eclair
Merge commit '7ff269f359a8848fd0c39993d8fe21a8324806f9' into eclair-plus-aosp

* commit '7ff269f359a8848fd0c39993d8fe21a8324806f9':
  Handle DisconnectRequested message sent by Bluez.
2009-09-11 12:31:00 -07:00
Android (Google) Code Review
7ff269f359 Merge change 24735 into eclair
* changes:
  Handle DisconnectRequested message sent by Bluez.
2009-09-11 15:24:01 -04:00
Jaikumar Ganesh
5e59ca8ae4 Handle DisconnectRequested message sent by Bluez. 2009-09-11 12:16:19 -07:00
Mike Reed
e450e55d63 am d68781ac: Merge change 24675 into eclair
Merge commit 'd68781ace179e19b70120411baf307104683fa4b' into eclair-plus-aosp

* commit 'd68781ace179e19b70120411baf307104683fa4b':
  change default for dither to true
2009-09-11 12:01:12 -07:00
Mike Reed
211db4a287 change default for dither to true 2009-09-11 14:40:15 -04:00
Scott Main
98a578c9f8 am f65bc182: am d27b1083: docs only. 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...
Merge commit 'f65bc1823a8c09caab8237bf96323cf05df02287' into eclair-plus-aosp

* commit 'f65bc1823a8c09caab8237bf96323cf05df02287':
  docs only.
2009-09-10 19:42:07 -07:00
Scott Main
f65bc1823a am d27b1083: docs only. 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...
Merge commit 'd27b10837525f341eee7d46013e2177b0bad3c60' into eclair

* commit 'd27b10837525f341eee7d46013e2177b0bad3c60':
  docs only.
2009-09-10 19:33:56 -07:00
Scott Main
d27b108375 docs only.
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
2009-09-10 19:22:48 -07:00
Nick Pelly
e7eb85cae0 am 005b228c: 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.
2009-09-10 19:01:25 -07:00
Nick Pelly
005b228cdf 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
2009-09-10 18:52:21 -07:00
Dianne Hackborn
7ed6ee5692 Fix issue #1983406: Soft keyboard doesn't show up in an EditText with "digits" attribute set
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
2009-09-10 18:41:28 -07:00
Scott Main
5cadc0e584 am 9b6911cb: Merge change 24630 into eclair
Merge commit '9b6911cb85a9c9a0fef145f91c9999da5a75ce21' into eclair-plus-aosp

* commit '9b6911cb85a9c9a0fef145f91c9999da5a75ce21':
  docs only.
2009-09-10 18:34:08 -07:00
Android (Google) Code Review
9b6911cb85 Merge change 24630 into eclair
* changes:
  resolved conflicts for merge of e0408aa1 to eclair
2009-09-10 21:27:20 -04:00
Jim Miller
bd75da5da4 am 38a1081c: Merge change 24514 into eclair
Merge commit '38a1081cad9385073d80d358decf04f6b2fd5723' into eclair-plus-aosp

* commit '38a1081cad9385073d80d358decf04f6b2fd5723':
  Add smallIcon and accountPreferences references to AuthenticatorDescription. Update after path conflict.
2009-09-10 18:19:29 -07:00
Robert Greenwalt
404d8d164f am f3f72003: Merge change 24588 into eclair
Merge commit 'f3f720031932500d92090b0093393651e7a713e0' into eclair-plus-aosp

* commit 'f3f720031932500d92090b0093393651e7a713e0':
  Fix for multi-apn MMS access.
2009-09-10 18:19:24 -07:00
Android (Google) Code Review
38a1081cad Merge change 24514 into eclair
* changes:
  Add smallIcon and accountPreferences references to AuthenticatorDescription. Update after path conflict.
2009-09-10 21:12:11 -04:00
Android (Google) Code Review
f3f7200319 Merge change 24588 into eclair
* changes:
  Fix for multi-apn MMS access.
2009-09-10 21:10:58 -04:00
Jim Miller
70e1ad7d99 Add smallIcon and accountPreferences references to AuthenticatorDescription. Update after path conflict.
Update API for new AuthenticatorDescription preferences.xml
2009-09-10 18:10:53 -07:00
Scott Main
da0a56df96 resolved conflicts for merge of e0408aa1 to eclair 2009-09-10 18:08:37 -07:00
Robert Greenwalt
8206ff30c2 Fix for multi-apn MMS access.
Mark cellular variants with the same availability, regardless of which are currently in use.
Availability just means the radio is enabled and sees the network, but has no guarantees that
we could connect to an APN if requested.

Fix the requestRouteToHost logic to support apn switches without WIFI.

bug:2093841
2009-09-10 18:01:01 -07:00
Costin Manolache
b6437245c2 If disk-full, don't crash the system server. Still todo: when we have disk we should trigger the event again. 2009-09-10 16:58:40 -07:00
San Mehat
95e022ec6a am 181b31a0: Process: Add support for using scheduler policies instead of cgroups. Preference is given to cgroups if available.
Merge commit '181b31a0d87d525ea64102a965210331e0c6885b' into eclair-plus-aosp

* commit '181b31a0d87d525ea64102a965210331e0c6885b':
  Process: Add support for using scheduler policies instead of cgroups.
2009-09-10 15:42:46 -07:00
San Mehat
181b31a0d8 Process: Add support for using scheduler policies instead of cgroups.
Preference is given to cgroups if available.

Signed-off-by: San Mehat <san@google.com>
2009-09-10 15:09:38 -07:00
Scott Main
df4578e8ab docs only.
add documentation to notify developers about variable
camera specifications and add some more links

Change-Id: I46ef9811af17858cbc6547f88e626becb481b043
2009-09-10 15:02:49 -07:00
Wink Saville
9971e50b69 am 88e3f827: Allow an alternate eri file.
Merge commit '88e3f827e657ef741099b24896c17533fa9ef61e' into eclair-plus-aosp

* commit '88e3f827e657ef741099b24896c17533fa9ef61e':
  Allow an alternate eri file.
2009-09-10 15:00:52 -07:00
Wink Saville
88e3f827e6 Allow an alternate eri file.
For testing purposes it is deseriable to allow
vendors to provide an alternate eri file. This
fixes Part A of bug 2108379.

Bug:2108379
Change-Id: I51703c9ac211ced053418e28e277dfab68deea21
2009-09-10 14:51:09 -07:00
Dianne Hackborn
635c4b41ca am e8f0603e: Merge change 24567 into eclair
Merge commit 'e8f0603eb631ecef5f41105711f4afdea8c6d8d8' into eclair-plus-aosp

* commit 'e8f0603eb631ecef5f41105711f4afdea8c6d8d8':
  Fix issue #1943927: need notification in status bar when adb is active
2009-09-10 14:30:53 -07:00
Romain Guy
e1d85dca89 am 5b61bea7: Merge change 24581 into eclair
Merge commit '5b61bea7aba93fc812991116fbbf9c4dbccb4890' into eclair-plus-aosp

* commit '5b61bea7aba93fc812991116fbbf9c4dbccb4890':
  Dialog titles would sometimes use a font too large.
2009-09-10 14:30:48 -07:00
Android (Google) Code Review
e8f0603eb6 Merge change 24567 into eclair
* changes:
  Fix issue #1943927: need notification in status bar when adb is active
2009-09-10 17:28:57 -04:00
Dianne Hackborn
477e3be424 Fix issue #1943927: need notification in status bar when adb is active
Just a string tweak.

Change-Id: I823445a2db80e6101ebb592a5cee05f369dd4d1d
2009-09-10 14:28:04 -07:00
Android (Google) Code Review
5b61bea7ab Merge change 24581 into eclair
* changes:
  Dialog titles would sometimes use a font too large.
2009-09-10 17:26:05 -04:00
Romain Guy
4bdf17c697 Dialog titles would sometimes use a font too large.
This was due to code in DialogTitle.java which would multiply the textSize of
the theme twice.

Change-Id: Id44e39e729ebd43b08c967a67cde0d33dd8f2efb
2009-09-10 14:11:20 -07:00
Dianne Hackborn
62e5480a70 am bcbcaa7e: Wallpapers, animations, pending intent.
Merge commit 'bcbcaa7edd32ba67c6290d79f7e7821c4b5b39ac' into eclair-plus-aosp

* commit 'bcbcaa7edd32ba67c6290d79f7e7821c4b5b39ac':
  Wallpapers, animations, pending intent.
2009-09-10 13:06:08 -07:00
Dmitri Plotnikov
1224c8830d am 84b4d37d: [Issue 2099206] Encoding phone number prior to sending it to the phone lookup filter
Merge commit '84b4d37dd1e9269f73c2a9cacadcd88ec4256e3f' into eclair-plus-aosp

* commit '84b4d37dd1e9269f73c2a9cacadcd88ec4256e3f':
  [Issue 2099206] Encoding phone number prior to sending it to the phone lookup filter
2009-09-10 13:05:58 -07:00