22582 Commits

Author SHA1 Message Date
Mike Reed
f066611aab retool resize logic to use max dimension and max area.
Change-Id: I32446b41afe9e7c241868c0cb7b9b7d9056b2d38
http://b/issue?id=2598253
2010-04-16 15:19:02 -04:00
Mike LeBeau
3c43c5cfb2 am 5fee638e: am f04be52a: am 0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo 2010-04-16 07:36:13 -07:00
Mike LeBeau
5fee638e4b am f04be52a: am 0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo
Merge commit 'f04be52a382544ff8006e227c1578a219ba0f23e' into kraken

* commit 'f04be52a382544ff8006e227c1578a219ba0f23e':
  For search suggestions in the search dialog, allow the 'title'
2010-04-16 07:30:18 -07:00
Mike LeBeau
f04be52a38 am 0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo
Merge commit '0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a' into froyo-plus-aosp

* commit '0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a':
  For search suggestions in the search dialog, allow the 'title'
2010-04-16 07:27:34 -07:00
Mike LeBeau
0c5ad4f1b3 Merge "For search suggestions in the search dialog, allow the 'title' line of text to be up to 2 lines (rather than the usual 1) if no 'description' line is provided." into froyo 2010-04-16 07:23:12 -07:00
Leon Scroggins III
ae9f8e4abd Request focus when MotionEvent.ACTION_UP is received.
Bug 2585857

Change-Id: I2e852d2225db4d1ba48815354a31e0823e4d3a8d
2010-04-16 09:23:08 -04:00
Carl Shapiro
d8f3ec6e83 Add command line flags to enable lock profiling. 2010-04-15 22:42:17 -07:00
Mike Lockwood
6f537a99cf am 48b8b4fd: Merge "GpsLocationProvider: Eliminate MIN_FIX_COUNT." into kraken 2010-04-15 20:34:03 -07:00
Mike Lockwood
f50bac9ab6 am ad903e80: Merge "GpsLocationProvider: Remove NTP sanity checking now that the NTP client has been fixed." into kraken 2010-04-15 20:33:58 -07:00
Mike Lockwood
48b8b4fd46 Merge "GpsLocationProvider: Eliminate MIN_FIX_COUNT." into kraken 2010-04-15 20:26:33 -07:00
Mike Lockwood
ad903e8010 Merge "GpsLocationProvider: Remove NTP sanity checking now that the NTP client has been fixed." into kraken 2010-04-15 20:26:09 -07:00
Daisuke Miyakawa
186bad00b4 Refactor vCard code.
- make the usage of VCardSourceDetector.
- simplyfy flag usage.
- remove unnecessary argument "canceled"

Change-Id: I6dd9723df7230be7478f6817c0ac2e6cbedc6ca7
2010-04-16 11:38:48 +09:00
android-build SharedAccount
5504668721 fix issues in current.xml (bad merge earlier)
Change-Id: I9be4dbe04c126db7fc92f116aa73bba6c96042cf
2010-04-15 18:21:40 -07:00
Jim Miller
5661490a57 am 318249e4: Merge "Manual merge of Ida6a4cdd3abcbcab7e2fe8450a25c0dc36765f04" into kraken 2010-04-15 18:01:32 -07:00
Jim Miller
318249e467 Merge "Manual merge of Ida6a4cdd3abcbcab7e2fe8450a25c0dc36765f04" into kraken 2010-04-15 17:55:18 -07:00
Jim Miller
5169fc57e3 Manual merge of Ida6a4cdd3abcbcab7e2fe8450a25c0dc36765f04
Fix 2572446: Also watch keyboard changes in PIN/Password unlock.

The PIN/Password unlock screen was monitoring orientation changes.
However, while docked, this isn't useful since orientation remains
fixed. This change makes PasswordUnlockScreen also looks for
changes to config.hardKeyboardHidden.

Tested:
WVGA device while docked and opening/closing the keyboard.

Change-Id: Iaadb277028f2dd1f85fd0f627a686a86ac51a2ed
2010-04-15 17:53:23 -07:00
Jim Miller
9771190e3a am 43725d4d: Merge "Manual merge of Idf6bb25438336616e6453e7afe0e79f227af98d3" into kraken 2010-04-15 17:51:30 -07:00
Robert Greenwalt
d29def562f am 9e17d740: am 32ebaf57: am e80c6f49: Merge "Add multi-sim support to ThrottleService." into froyo 2010-04-15 17:51:26 -07:00
Jim Miller
43725d4d44 Merge "Manual merge of Idf6bb25438336616e6453e7afe0e79f227af98d3" into kraken 2010-04-15 17:47:01 -07:00
Robert Greenwalt
9e17d7408b am 32ebaf57: am e80c6f49: Merge "Add multi-sim support to ThrottleService." into froyo
Merge commit '32ebaf57d8646542b80e848441830a5ef834aed3' into kraken

* commit '32ebaf57d8646542b80e848441830a5ef834aed3':
  Add multi-sim support to ThrottleService.
2010-04-15 17:45:26 -07:00
Robert Greenwalt
32ebaf57d8 am e80c6f49: Merge "Add multi-sim support to ThrottleService." into froyo
Merge commit 'e80c6f49d5055e299b7ada91b5967feab66e467b' into froyo-plus-aosp

* commit 'e80c6f49d5055e299b7ada91b5967feab66e467b':
  Add multi-sim support to ThrottleService.
2010-04-15 17:42:24 -07:00
Mike Lockwood
d53ba017ee GpsLocationProvider: Eliminate MIN_FIX_COUNT.
Now we stop after one fix rather than waiting for 10 when requesting occasional
fixes to conserve power.

Change-Id: Ic420f2d20780db983fc4db22246e0a486eecc58e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-15 20:41:26 -04:00
Jim Miller
ecaced9a78 Manual merge of Idf6bb25438336616e6453e7afe0e79f227af98d3
Fix 2575838: Update emergency button in AccountUnlockScreen DO NOT MERGE

AccountUnlockScreen wasn't registered to receive updates from
UpdateMonitor. It now correctly updates the Emergency call button
to allow the user to return to the call in progress (InCallScreen).

Tested on WVGA device with keyboard:
- hitting Home during call, observing state, and pressing button to return to call.
- hitting Home while not in call to ensure it still invokes EmergencyDialer.
- above in various keyboard states.

Change-Id: Ic4480ff69ff4479557ddb7f76c751b005b1c60bf
2010-04-15 17:39:17 -07:00
Robert Greenwalt
e80c6f49d5 Merge "Add multi-sim support to ThrottleService." into froyo 2010-04-15 17:37:55 -07:00
Robert Greenwalt
e6e9882341 Add multi-sim support to ThrottleService.
Uses the last used data until the SIM is available (if ever).  Supports data from
several SIMs for all the world travelers out there.

bug: 2576057
Change-Id: I70e34a51f1c2ccda41a480652b0233b68ff3f538
2010-04-15 17:23:59 -07:00
Ben Murdoch
68a3ed59d0 Merge "Reset the webview settings after each test to ensure that each new test starts in a consistent, known state. This fixes a bug for example with the appcache tests, where disable.html turns off appcache support but it is never restored causing future tests to fail." 2010-04-15 17:08:04 -07:00
Mike Lockwood
1879d284bf GpsLocationProvider: Remove NTP sanity checking now that the NTP client has been fixed.
Change-Id: Iedf3f5ff333db7298de6cd6e86fface1f8421738
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-15 20:05:24 -04:00
android-build SharedAccount
120c457672 manual merge
Change-Id: I235ae925559b5db6d64cc8f8b188704a84d7b6a2
2010-04-15 16:36:34 -07:00
Mathias Agopian
699399775f Merge "when a zero dimension buffer is allocated, turn the allocation into a 1x1 buffer instead of Nx1 (or 1xN)" into kraken 2010-04-15 15:24:35 -07:00
Mathias Agopian
67bbac844d when a zero dimension buffer is allocated, turn the allocation into
a 1x1 buffer instead of Nx1 (or 1xN)

Change-Id: I27eeb15e83e13002dd9405f4e52b54f7dffc0fe7
2010-04-15 15:23:25 -07:00
Jake Hamby
145ff609de Spelling corrections and other minor cosmetic cleanups.
- Fixed a bunch of typos in comments (plus a few variable names)
- Removed unused import lines from telephony classes
- Added @Override attribute to overriding methods
- Made SmsMessage.PduParser inner class private & deleted unused constructor
- Added type specifiers to declarations of ArrayList and HashMap
- SimulatedCommands.getRegistrationState() had an ArrayIndexOutOfBoundsException
  trying to write to index 14 of a 14-element array. I removed the
  out-of-bounds assignment.

Change-Id: I054b5156aa64ab6639028d5b45a7e688b2deee08
2010-04-15 15:23:12 -07:00
Dianne Hackborn
f5678e911a Merge "Introduce new API version to avoid breakage with the Froyo APIs; introduce padding in the resources to avoid cross-branch merge pain." into kraken 2010-04-15 14:41:13 -07:00
Dianne Hackborn
cd0d10f939 Introduce new API version to avoid breakage with the Froyo APIs;
introduce padding in the resources to avoid cross-branch merge pain.

Change-Id: I9975f4320dfc625e3ed68dfdbbe94cc0c3b019f4
2010-04-15 14:38:30 -07:00
Shimeng (Simon) Wang
62d8a0f8a9 Merge "Convert obsolete language codes to new standards in Accept-Language and User-Agent." 2010-04-15 14:36:28 -07:00
Shimeng (Simon) Wang
0e4cb9d89f Convert obsolete language codes to new standards in Accept-Language and User-Agent.
Bug:2593415
Change-Id: I6b0bd161a0a2222da6ab7812614c1ba03d8c22eb
2010-04-15 14:25:49 -07:00
Dianne Hackborn
e02ffa34a8 am 292bdbd9: am e3094117: Merge "A little more improvement of the Service javadoc." into froyo
Merge commit '292bdbd9c4503d3f79d0fa8dd12074c0d4dd5293' into kraken

* commit '292bdbd9c4503d3f79d0fa8dd12074c0d4dd5293':
  A little more improvement of the Service javadoc.
2010-04-15 13:39:16 -07:00
Robert Greenwalt
007302adeb am d65d5f11: am bf943f29: Merge "Fix SntpClient to give accurate time info." into froyo
Merge commit 'd65d5f114f74ed4d7d4defee5d56eeaa133fda72' into kraken

* commit 'd65d5f114f74ed4d7d4defee5d56eeaa133fda72':
  Fix SntpClient to give accurate time info.
2010-04-15 13:37:31 -07:00
Dianne Hackborn
292bdbd9c4 am e3094117: Merge "A little more improvement of the Service javadoc." into froyo
Merge commit 'e3094117a094d8ed2dbd2f4cac15e48b73ceadf4' into froyo-plus-aosp

* commit 'e3094117a094d8ed2dbd2f4cac15e48b73ceadf4':
  A little more improvement of the Service javadoc.
2010-04-15 13:36:44 -07:00
Dianne Hackborn
e3094117a0 Merge "A little more improvement of the Service javadoc." into froyo 2010-04-15 13:33:21 -07:00
Robert Greenwalt
d65d5f114f am bf943f29: Merge "Fix SntpClient to give accurate time info." into froyo
Merge commit 'bf943f296864d9647268fb5a55805ebf1fcba173' into froyo-plus-aosp

* commit 'bf943f296864d9647268fb5a55805ebf1fcba173':
  Fix SntpClient to give accurate time info.
2010-04-15 13:33:03 -07:00
Robert Greenwalt
bf943f2968 Merge "Fix SntpClient to give accurate time info." into froyo 2010-04-15 13:28:43 -07:00
Mathias Agopian
141264fabb am 24af70e8: am e7d5a2f9: am 45423465: Merge "fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo 2010-04-15 12:34:56 -07:00
Suchi Amalapurapu
50fa66c5b0 am 180ee659: am 1e21ec92: am 40b6996a: Merge "Add ordered broadcast when removing packages." into froyo 2010-04-15 12:34:47 -07:00
Ben Murdoch
a8b9768a14 Reset the webview settings after each test to ensure that each new test starts
in a consistent, known state. This fixes a bug for example with the appcache
tests, where disable.html turns off appcache support but it is never restored
causing future tests to fail.

Change-Id: I71e2607d29ec6358cfdc6ab37a6861c161e84cd8
2010-04-15 12:34:18 -07:00
Mike Lockwood
2fe323f412 am 63aa5a6f: clear calling identity in GpsLocationProvider.sendExtraCommand(). 2010-04-15 12:34:15 -07:00
Mike Lockwood
89bdbc98e7 am a3d2d769: GpsStatus: Bounds check PRN to avoid array indexing exceptions. 2010-04-15 12:34:08 -07:00
Mike Lockwood
f1307b2ac4 am 04598b67: GPS: Support for GPS HAL managing its own scheduling 2010-04-15 12:34:01 -07:00
Mike Lockwood
17d820d876 am f440b4aa: Merge "GpsLocationProvider: optimize wake lock usage." into kraken 2010-04-15 12:33:49 -07:00
Patrick Scott
5383c2ba66 am 56645e26: Merge branch \'kraken\' of ssh://android-git:29418/platform/frameworks/base into kraken 2010-04-15 12:33:41 -07:00
Vasu Nori
119c106f8d am 9d3b3e13: am bad5f620: am 0bbcdc6c: Merge "verify database state before calling sqlite. Bug:2593970" into froyo 2010-04-15 12:33:34 -07:00