9635 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
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
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
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
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
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
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
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
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
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
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
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
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
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
Amith Yamasani
03aa34f50d Fix preloaded classes for API rename of BackupAgentHelper
Change-Id: Ica6301b2aac6879702b98edfcf67fc7bc62002db
2010-03-29 18:11:56 -07:00
Romain Guy
1faae16772 am 691b806f: Merge "Fix possible security issue. Bug #2553187" into froyo
Merge commit '691b806ff8b4a6428588e8495cb1a5819a0aee99' into froyo-plus-aosp

* commit '691b806ff8b4a6428588e8495cb1a5819a0aee99':
  Fix possible security issue.
2010-03-29 16:34:46 -07:00
Romain Guy
691b806ff8 Merge "Fix possible security issue. Bug #2553187" into froyo 2010-03-29 16:31:14 -07:00
Ben Cheng
8d0dc62fe2 am ef3f5ddc: Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
Merge commit 'ef3f5ddc2137ed99e41f00441b688fb56b855179' into froyo-plus-aosp

* commit 'ef3f5ddc2137ed99e41f00441b688fb56b855179':
  Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
2010-03-29 16:25:13 -07:00
Steve Howard
e9cd68f181 am 8deb2391: Merge "Remove upside-down portrait orientation." into froyo
Merge commit '8deb239169f9b60cf19b6f4293978e654fa15a03' into froyo-plus-aosp

* commit '8deb239169f9b60cf19b6f4293978e654fa15a03':
  Remove upside-down portrait orientation.
2010-03-29 16:25:09 -07:00
Ben Cheng
ef3f5ddc21 Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
Bug: 2553512
Change-Id: Id0dad80ecdcb8c7430dcf1ac26132ccd9c0770f5
2010-03-29 16:17:58 -07:00
Steve Howard
8deb239169 Merge "Remove upside-down portrait orientation." into froyo 2010-03-29 16:05:35 -07:00
Romain Guy
2aba11f6b9 Fix possible security issue.
Bug #2553187

Limit the max number of lines for each entry in the ResolveActivity to 2. Also
make sure to discard potential styling tags and newlines/space characters from
package name and activity labels.

Change-Id: Ibda3688267aa948b921164d3d3abc8c9236e61a2
2010-03-29 16:03:01 -07:00
Christopher Tate
245df5ad16 am 3f264c4f: Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo
Merge commit '3f264c4fba416f55247da3fafd6afbe55bf93598' into froyo-plus-aosp

* commit '3f264c4fba416f55247da3fafd6afbe55bf93598':
  API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
2010-03-29 15:53:54 -07:00
Christopher Tate
3f264c4fba Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo 2010-03-29 15:50:57 -07:00
Christopher Tate
cc84c69726 API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
Part of bug #2545514

Change-Id: Ic775e3b942c485252149c1b6c15c88517fa4e3e5
2010-03-29 15:48:14 -07:00
Dirk Dougherty
6c75455908 am c46f28dc: Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo
Merge commit 'c46f28dc0fde1889b37bdc7066ec2af96c16e358' into froyo-plus-aosp

* commit 'c46f28dc0fde1889b37bdc7066ec2af96c16e358':
  doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.
2010-03-29 15:39:56 -07:00
Dirk Dougherty
c46f28dc0f Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo 2010-03-29 15:36:53 -07:00
Jim Miller
d41d458696 am c6dc5070: Merge "Fix 2537999: Don\'t throw exception when SlidingTab has UNSPECIFIED specs" into froyo
Merge commit 'c6dc5070ef663e514add038b1d2e78761156b0c0' into froyo-plus-aosp

* commit 'c6dc5070ef663e514add038b1d2e78761156b0c0':
  Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs
2010-03-29 15:11:01 -07:00
Jim Miller
c6dc5070ef Merge "Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs" into froyo 2010-03-29 15:07:06 -07:00
Romain Guy
21ad6043cd am 6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #2553515 #2553595
Merge commit '6b1e6969828f05a2f5f55825fdf16b19c9dce2dd' into froyo-plus-aosp

* commit '6b1e6969828f05a2f5f55825fdf16b19c9dce2dd':
  Rename tab widget attributes, remove scroll barrier constant.
2010-03-29 14:49:09 -07:00
Dirk Dougherty
d76ef97930 doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.
Bug: 2554090
Change-Id: Ia13b3d156d230609e8296a3b31c2882ba13681f3
2010-03-29 14:47:39 -07:00
Steve Howard
1c310b9d2f Remove upside-down portrait orientation.
I also realized the ROTATION_NN constants were misdocumented, they
actually align the opposite direction from the "orientation" angle
computed in the code (i.e. orientation=90 is left side up, ROTATION_90
is right side up).  I just changed the comment here to keep the change
minimal; I'll update the code to be more consistent outside of this
release branch.

Bug: 2549875
Change-Id: I79c4286be582a21e730b25a8a24f2e1137c6e4cb
2010-03-29 14:43:46 -07:00
Romain Guy
6b1e696982 Rename tab widget attributes, remove scroll barrier constant.
Bug #2553515 #2553595

Change-Id: Id36280a57f00a1ee59251be6be1aae8df2189c09
2010-03-29 14:40:34 -07:00
Doug Zongker
0d531f5b59 am ab69e29c: relocate android.util.base64.* -> android.util.*
Merge commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d' into froyo-plus-aosp

* commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d':
  relocate android.util.base64.* -> android.util.*
2010-03-29 14:00:58 -07:00
Doug Zongker
ab69e29c19 relocate android.util.base64.* -> android.util.*
b/2553469 - API REVIEW: android.util.base64

Change-Id: I6a514032152a8b1899db52d020aca8e8b19e74e9
2010-03-29 13:46:47 -07:00
Romain Guy
e16741b22a am 272b504e: Merge "Tame the monkey. Bug #2547546" into froyo
Merge commit '272b504ee6aaf2515572520cd642f9a4fbf81a44' into froyo-plus-aosp

* commit '272b504ee6aaf2515572520cd642f9a4fbf81a44':
  Tame the monkey.
2010-03-29 13:06:20 -07:00
Romain Guy
7eec2bcf6f Tame the monkey.
Bug #2547546

Change-Id: I2a41f53dbd71a166ddce70f3fbec24cfedaa514a
2010-03-29 13:00:07 -07:00
Romain Guy
7e31b282dd am 0e122926: Merge "Rename private fields to break bad code examples" into froyo
Merge commit '0e1229260d66b308a0ad271c20970e3decd6f55c' into froyo-plus-aosp

* commit '0e1229260d66b308a0ad271c20970e3decd6f55c':
  Rename private fields to break bad code examples
2010-03-29 12:34:23 -07:00