20782 Commits

Author SHA1 Message Date
Christopher Tate
b3f7fe44f5 am 22375e4a: Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo
Merge commit '22375e4a736c0d646c3cf0905c15126f7f4107c2' into froyo-plus-aosp

* commit '22375e4a736c0d646c3cf0905c15126f7f4107c2':
  Make RestoreSession.getAvailableRestoreSets() asynchronous
2010-03-30 13:13:52 -07:00
Christopher Tate
22375e4a73 Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo 2010-03-30 13:09:50 -07:00
Daniel Sandler
2fa4ab04b4 am 454a956b: am a7035909: Remove logspew.
Merge commit '454a956b52884083e3436fe2ea7e478df2bcbeea' into kraken

* commit '454a956b52884083e3436fe2ea7e478df2bcbeea':
  Remove logspew.
2010-03-30 12:56:36 -07:00
Daniel Sandler
454a956b52 am a7035909: Remove logspew.
Merge commit 'a7035909453c9980a5f8547f5090c70c4281156c' into froyo-plus-aosp

* commit 'a7035909453c9980a5f8547f5090c70c4281156c':
  Remove logspew.
2010-03-30 12:53:28 -07:00
Daniel Sandler
a703590945 Remove logspew.
Change-Id: I8b56a9c289dcc87080116e6af27721e24d49c3b0
2010-03-30 15:45:31 -04:00
Christopher Tate
2d449afe3d Make RestoreSession.getAvailableRestoreSets() asynchronous
This transaction can involve the transport having to query a remote backend
over the wire, so it can take a Long Time(tm).  Make it main-thread-safe by
making it asynchronous, with the results passed as a callback to the invoker's
RestoreObserver.  We also make the IRestoreObserver callback interface
properly oneway.

Bug #2550665
Bug #2549422

Change-Id: If18a233a0a3d54c7b55101715c9e6195b762c5a0
2010-03-30 12:42:35 -07:00
Patrick Scott
d43a2b5a23 am 7fb1a891: am ae405d56: Merge "Fix a simple logic mistake." into froyo
Merge commit '7fb1a89128a87c30441bc839c935f8e1fb993a26' into kraken

* commit '7fb1a89128a87c30441bc839c935f8e1fb993a26':
  Fix a simple logic mistake.
2010-03-30 11:49:12 -07:00
Patrick Scott
7fb1a89128 am ae405d56: Merge "Fix a simple logic mistake." into froyo
Merge commit 'ae405d56215e4ab43e8210b66e741a0bf9d5edcf' into froyo-plus-aosp

* commit 'ae405d56215e4ab43e8210b66e741a0bf9d5edcf':
  Fix a simple logic mistake.
2010-03-30 11:45:55 -07:00
Patrick Scott
ae405d5621 Merge "Fix a simple logic mistake." into froyo 2010-03-30 11:41:29 -07:00
Jean-Michel Trivi
797e1b6552 am 38cb6197: am 2a5d9f9b: Fix bug 2553592 API REVIEW: android.speech Change 1 of 4 Notes from API Council review: Rename RecognitionManager to SpeechRecognizer
Merge commit '38cb619770cf7b4207f464edc4839c79c03ad372' into kraken

* commit '38cb619770cf7b4207f464edc4839c79c03ad372':
  Fix bug 2553592 API REVIEW: android.speech
2010-03-30 11:23:23 -07:00
Jean-Michel Trivi
38cb619770 am 2a5d9f9b: Fix bug 2553592 API REVIEW: android.speech Change 1 of 4 Notes from API Council review: Rename RecognitionManager to SpeechRecognizer
Merge commit '2a5d9f9b577376768372837723f0f42098aba13b' into froyo-plus-aosp

* commit '2a5d9f9b577376768372837723f0f42098aba13b':
  Fix bug 2553592 API REVIEW: android.speech
2010-03-30 11:20:32 -07:00
Jean-Michel Trivi
2a5d9f9b57 Fix bug 2553592 API REVIEW: android.speech
Change 1 of 4
Notes from API Council review:
Rename RecognitionManager to SpeechRecognizer

Change-Id: I892c0d714d928d5e31575c72b6a36281fc4c7a8a
2010-03-30 11:14:55 -07:00
The Android Open Source Project
b7248b7b81 merge from open-source master
Change-Id: Iad50c5ab4915d0868b3f79ea6ba0d657a6f98525
2010-03-30 11:13:47 -07:00
Patrick Scott
0cf6046b8d Fix a simple logic mistake.
If the icon is precomposed or the icon IS null, set the touch icon url. This
ensures there will be a touch icon set if either precomposed or regular is
specified. Precomposed icons take precedence.

Bug: 2546984
Change-Id: Id9291006ecda8659b823ab9629eb98a6f8d45f5e
2010-03-30 14:02:29 -04:00
Romain Guy
26fe7d27ee Merge "Fix last character of password field being visible after rotation" 2010-03-30 10:54:40 -07:00
San Mehat
35602efe48 am b07d6992: (-s ours) am d4610977: Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo
Merge commit 'b07d69920199817904ccb9056e3dd56cf736e438' into kraken

* commit 'b07d69920199817904ccb9056e3dd56cf736e438':
  framework: Hide StorageManager for froyo - DO NOT MERGE
2010-03-30 10:46:23 -07:00
San Mehat
b07d699201 am d4610977: Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo
Merge commit 'd4610977d9217cbd70dd59f61914c74d1ca61036' into froyo-plus-aosp

* commit 'd4610977d9217cbd70dd59f61914c74d1ca61036':
  framework: Hide StorageManager for froyo - DO NOT MERGE
2010-03-30 10:39:36 -07:00
Jaikumar Ganesh
4160244b52 am 77239140: am 0e090309: Relax the requirement of making a DBUS call for creating the Bluez Device.
Merge commit '772391402f26f418eee70039e89c0b6a8a9d69eb' into kraken

* commit '772391402f26f418eee70039e89c0b6a8a9d69eb':
  Relax the requirement of making a DBUS call for creating the Bluez Device.
2010-03-30 10:36:54 -07:00
San Mehat
d4610977d9 Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo 2010-03-30 10:35:44 -07:00
Jaikumar Ganesh
772391402f am 0e090309: Relax the requirement of making a DBUS call for creating the Bluez Device.
Merge commit '0e09030977aea8b40fd177139528d4b5637c9771' into froyo-plus-aosp

* commit '0e09030977aea8b40fd177139528d4b5637c9771':
  Relax the requirement of making a DBUS call for creating the Bluez Device.
2010-03-30 10:30:48 -07:00
Jaikumar Ganesh
0e09030977 Relax the requirement of making a DBUS call for creating the Bluez Device.
Bug: 2136464

When the bluez device is created, we get the onDeviceCreated signal.
We add it to our  cache when that happens. We can have a device created
even when its not bonded - as a result of OPP. So use this cache to avoid
a DBUS call to Bluez.

Change-Id: I9465da7d72a12a6888128ff40ac1fe598cbae3c3
2010-03-30 10:23:55 -07:00
Kenny Root
5d8dfc172b am 664c7adb: am 7a17f0c0: Merge "Import revised translations" into froyo
Merge commit '664c7adb1847dd304f36239dc63b4986bf828dc1' into kraken

* commit '664c7adb1847dd304f36239dc63b4986bf828dc1':
  Import revised translations
2010-03-30 09:38:14 -07:00
Kenny Root
664c7adb18 am 7a17f0c0: Merge "Import revised translations" into froyo
Merge commit '7a17f0c04e0d09d003e6842f9af1d7cd0efc198f' into froyo-plus-aosp

* commit '7a17f0c04e0d09d003e6842f9af1d7cd0efc198f':
  Import revised translations
2010-03-30 09:27:15 -07:00
Kenny Root
7a17f0c04e Merge "Import revised translations" into froyo 2010-03-30 09:23:16 -07:00
Kenny Root
42205f871b Import revised translations
Change-Id: I1580bddbcf945ed733725b486b2699582096d3a5
2010-03-30 09:15:10 -07:00
San Mehat
63cce836e4 framework: Hide StorageManager for froyo - DO NOT MERGE
Change-Id: Icd58d5be0de1cc0549a5d766421bcc773c8cd868
Signed-off-by: San Mehat <san@google.com>
2010-03-30 08:14:32 -07:00
Bjorn Bringert
76b2ff3391 am 3f434566: am fef8cebc: Clean up SearchableInfo API, JavaDoc and formatting
Merge commit '3f434566ff3ce11f4ab21536d96cd4fa31366bf2' into kraken

* commit '3f434566ff3ce11f4ab21536d96cd4fa31366bf2':
  Clean up SearchableInfo API, JavaDoc and formatting
2010-03-30 04:06:03 -07:00
Bjorn Bringert
3f434566ff am fef8cebc: Clean up SearchableInfo API, JavaDoc and formatting
Merge commit 'fef8cebcdcf0cbd4a0dafba87e33e3b500fb1321' into froyo-plus-aosp

* commit 'fef8cebcdcf0cbd4a0dafba87e33e3b500fb1321':
  Clean up SearchableInfo API, JavaDoc and formatting
2010-03-30 03:59:36 -07:00
Bjorn Bringert
fef8cebcdc Clean up SearchableInfo API, JavaDoc and formatting
This change cleans up the JavaDoc in SearchableInfo,
removes trailing whitespace, fixes an if-statement
style violoation, and re-hides some things that were
exposed for Froyo that query deprecated or discouraged
attributes:

SearchableInfo.getSearchButtonText()
SearchableInfo.getLabelId()
SearchableInfo.getIconlId()
class SearchableInfo.ActionKeyInfo
SearchableInfo.findActionKey()

Bug http://b/issue?id=2553524

Change-Id: Iee5521c844f74137166730e523d29ba07ef1856b
2010-03-30 11:40:34 +01:00
Dianne Hackborn
93d7144462 am e5132805: am e2522466: Fix issue #2547337: switching night modes
Merge commit 'e5132805110ba98e301b792cc0c2141b1729b680' into kraken

* commit 'e5132805110ba98e301b792cc0c2141b1729b680':
  Fix issue #2547337: switching night modes
2010-03-29 21:23:08 -07:00
Dianne Hackborn
839e1b6c39 am 2fecae38: am ad5499dd: Hopefully get rid of some ANRs.
Merge commit '2fecae386d952197d63fb75f8ec245d87159a684' into kraken

* commit '2fecae386d952197d63fb75f8ec245d87159a684':
  Hopefully get rid of some ANRs.
2010-03-29 21:23:03 -07:00
Dianne Hackborn
e513280511 am e2522466: Fix issue #2547337: switching night modes
Merge commit 'e2522466552f9c6b7fcea866709710f53aa1f2a8' into froyo-plus-aosp

* commit 'e2522466552f9c6b7fcea866709710f53aa1f2a8':
  Fix issue #2547337: switching night modes
2010-03-29 21:19:39 -07:00
Dianne Hackborn
2fecae386d am ad5499dd: Hopefully get rid of some ANRs.
Merge commit 'ad5499dd204a1512471778462a805a288595f2f2' into froyo-plus-aosp

* commit 'ad5499dd204a1512471778462a805a288595f2f2':
  Hopefully get rid of some ANRs.
2010-03-29 21:19:36 -07:00
Dianne Hackborn
e252246655 Fix issue #2547337: switching night modes
Dumb.

Change-Id: Iaa72eaac54422f7fd95cf1050f6b7b6da55af0c3
2010-03-29 21:13:31 -07:00
Adam Powell
ecf4406ce5 am 370fe2a9: am 9d32d24d: Remove overscrolling
Merge commit '370fe2a91e9e824c6339fc836377c4aa6d80fc06' into kraken

* commit '370fe2a91e9e824c6339fc836377c4aa6d80fc06':
  Remove overscrolling
2010-03-29 21:09:28 -07:00
Dianne Hackborn
ad5499dd20 Hopefully get rid of some ANRs.
Don't hold the activity manager lock the entire time we are processing an ANR,
which often causes us to cause a second ANR as someone else calls into the
activity manager and gets blocked.

Change-Id: Ife4db82b12d6f4378ac2705bd6f60beb1244a1e6
2010-03-29 21:07:23 -07:00
Adam Powell
370fe2a91e am 9d32d24d: Remove overscrolling
Merge commit '9d32d24dbd8a015c9d5c44ed4901d5a666eb8e7f' into froyo-plus-aosp

* commit '9d32d24dbd8a015c9d5c44ed4901d5a666eb8e7f':
  Remove overscrolling
2010-03-29 21:02:47 -07:00
Adam Powell
9d32d24dbd Remove overscrolling
Change-Id: I7e9db8d8a9b8ef67f0c0c82bf57c9155b7ebabea
2010-03-29 20:46:45 -07:00
Oscar Montemayor
1caca2248b am 1ec71365: (-s ours) am f5f30067: Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo
Merge commit '1ec71365f98baa24f8df82d9c4a79dd6edc940eb' into kraken

* commit '1ec71365f98baa24f8df82d9c4a79dd6edc940eb':
  DO NOT MERGE
2010-03-29 19:03:28 -07:00
Oscar Montemayor
1ec71365f9 am f5f30067: Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo
Merge commit 'f5f300678abb79574bb56eee13c8dd2b7b98b740' into froyo-plus-aosp

* commit 'f5f300678abb79574bb56eee13c8dd2b7b98b740':
  DO NOT MERGE
2010-03-29 19:01:16 -07:00
Oscar Montemayor
f5f300678a Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo 2010-03-29 18:56:57 -07:00
Charles Chen
e549ce98cf am 629d03f1: am a599dafe: Merge "Fix for bug 2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo
Merge commit '629d03f12251220daf26abc5be86d4649318a331' into kraken

* commit '629d03f12251220daf26abc5be86d4649318a331':
  Fix for bug 2548048 - it was impossible for applications to discover
2010-03-29 18:44:59 -07:00
Charles Chen
629d03f122 am a599dafe: Merge "Fix for bug 2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo
Merge commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45' into froyo-plus-aosp

* commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45':
  Fix for bug 2548048 - it was impossible for applications to discover
2010-03-29 18:41:48 -07:00
Charles Chen
a599dafe4f Merge "Fix for bug 2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo 2010-03-29 18:37:41 -07:00
Charles Chen
42229259a6 Fix for bug 2548048 - it was impossible for applications to discover
if their TTS settings were being overridden by the user or not.

Change-Id: I28856a1b79c9455435671d13ed614a1ccb4e95ea
2010-03-29 18:35:30 -07:00
Amith Yamasani
51e2c99160 am e7eb3a35: am 8c6af52f: Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo
Merge commit 'e7eb3a35fe35b858597410d4b41c9d027c4b83c3' into kraken

* commit 'e7eb3a35fe35b858597410d4b41c9d027c4b83c3':
  Fix preloaded classes for API rename of BackupAgentHelper
2010-03-29 18:33:55 -07:00
Amith Yamasani
e7eb3a35fe am 8c6af52f: Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo
Merge commit '8c6af52fdd572e19cd40a0be53615eb6c80ccde5' into froyo-plus-aosp

* commit '8c6af52fdd572e19cd40a0be53615eb6c80ccde5':
  Fix preloaded classes for API rename of BackupAgentHelper
2010-03-29 18:28:14 -07:00
Amith Yamasani
8c6af52fdd Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo 2010-03-29 18:24:59 -07:00
Joe Onorato
f523384cab am 82bac8ec: am 59fc58dc: fix the build
Merge commit '82bac8ece4d0e07f0490c9852b295f465acd1dee' into kraken

* commit '82bac8ece4d0e07f0490c9852b295f465acd1dee':
  fix the build
2010-03-29 18:13:38 -07:00
Oscar Montemayor
1f4df90bfa DO NOT MERGE
Removing unused features from source tree.
Please refer to Bug#2502219.

Change-Id: I879c29bfd5ffe933f64bb1082aaae7c956450a5a
2010-03-29 18:12:24 -07:00