1647 Commits

Author SHA1 Message Date
Suchi Amalapurapu
e1fae30e20 Merge commit '0781df94' into manualmerge
Conflicts:
	Android.mk
	api/current.xml
2009-06-17 18:24:44 -07:00
Romain Guy
31708d4645 resolved conflicts for merge of 3571ff40 to master 2009-06-17 15:55:53 -07:00
Android (Google) Code Review
380b6b3e4a am ef29f6af: Merge change 4483 into donut
Merge commit 'ef29f6afb4746eae8263ab901a5d3677bc04574b'

* commit 'ef29f6afb4746eae8263ab901a5d3677bc04574b':
  Fixes #1414069. Display recent activities with two lines of text.
2009-06-17 15:39:13 -07:00
Android (Google) Code Review
321d593efe am a0a854d4: Merge change 4398 into donut
Merge commit 'a0a854d47f9dc38ce41505f973aea01842694fb5'

* commit 'a0a854d47f9dc38ce41505f973aea01842694fb5':
  Using Locale to specify language and country for a TTS language to load,
2009-06-17 15:39:03 -07:00
Satish Sampath
dd34fb0529 am bf23fe06: Prepare SearchManager framework for adding Genie logging.
Merge commit 'bf23fe062ab4321143717c21827d329e087cc72f'

* commit 'bf23fe062ab4321143717c21827d329e087cc72f':
  Prepare SearchManager framework for adding Genie logging.
2009-06-17 15:38:42 -07:00
Android (Google) Code Review
a06a9267fd am 528a29f8: Merge change 4326 into donut
Merge commit '528a29f886f9cb9266e1fda2d2c9e0ea7ea88faf'

* commit '528a29f886f9cb9266e1fda2d2c9e0ea7ea88faf':
  Don't get location in search dialog.
2009-06-17 15:38:36 -07:00
Mitsuru Oshima
2fc22e4f7c am d9aef73f: Squashed commit of the following:
Merge commit 'd9aef73f72cb11ba7f278a0ef13c6d02ffc95851'

* commit 'd9aef73f72cb11ba7f278a0ef13c6d02ffc95851':
  Squashed commit of the following:
2009-06-17 15:38:12 -07:00
Joe Onorato
251c89c0a7 am 5f15d151: checkpoint BackupDatAInput / RestoreHelper
Merge commit '5f15d151b5101fadfe6cba1e8f4aa6367e8c603e'

* commit '5f15d151b5101fadfe6cba1e8f4aa6367e8c603e':
  checkpoint BackupDatAInput / RestoreHelper
2009-06-17 15:38:08 -07:00
Christopher Tate
1bd88ca88f am aa088447: Hold the current transport instantiated all the time.
Merge commit 'aa088447baadd2e0bbcfd18cc529645610c13ddc'

* commit 'aa088447baadd2e0bbcfd18cc529645610c13ddc':
  Hold the current transport instantiated all the time.
2009-06-17 15:37:53 -07:00
Android (Google) Code Review
2aa30ffd14 Merge change 4471
* changes:
  MemoryFile.isMemoryFile was internally determining the length of the ashmem region. This is actually useful information to have, so expose that more directly.
2009-06-17 14:04:35 -07:00
Marco Nelissen
ec100900e6 MemoryFile.isMemoryFile was internally determining the length of
the ashmem region. This is actually useful information to have,
so expose that more directly.
2009-06-17 13:00:07 -07:00
Android (Google) Code Review
0781df943e Merge change 4129 into donut
* changes:
  Remove circular dependency in PackageManager. api freeStorage uses PendingIntent from android.app Create a new public IntentSender class that can be used by PackageManager instead. This new class uses IIntentSender internally and can only be created by PendingIntent for now. Provide a new getIntentSender api in PendingIntent to create an instance of this class. Move IIntentSender and IIntentReceiver from android.app to android.content Change imports of IIntentSender and IIntentReceiver to reflect the new package name The PackageManager api has been named as freeStorageWithIntent and will be renamed as freeStorage once the older api(which has been deprecated) will be removed shortly.
2009-06-17 11:33:22 -07:00
Suchi Amalapurapu
1ccac75e1f Remove circular dependency in PackageManager. api freeStorage uses PendingIntent from android.app
Create a new public IntentSender class that can be used by PackageManager instead.
This new class uses IIntentSender internally and can only be created by PendingIntent for now.
Provide a new getIntentSender api in PendingIntent to create an instance of this class.
Move IIntentSender and IIntentReceiver from android.app to android.content
Change imports of IIntentSender and IIntentReceiver to reflect the new package name
The PackageManager api has been named as freeStorageWithIntent and will be renamed as freeStorage
once the older api(which has been deprecated) will be removed shortly.
2009-06-17 11:31:26 -07:00
Android (Google) Code Review
3571ff40d3 Merge change 4486 into donut
* changes:
  Fixes #1107690. Updates javadoc for Intent.java, android:value -> android:name.
2009-06-17 11:05:56 -07:00
Android (Google) Code Review
ef29f6afb4 Merge change 4483 into donut
* changes:
  Fixes #1414069. Display recent activities with two lines of text.
2009-06-17 10:58:47 -07:00
Romain Guy
4969af7d9f Fixes #1107690. Updates javadoc for Intent.java, android:value -> android:name.
Also fixes the <type android:value /> tags, they are now <data android:mimeType />
2009-06-17 10:53:19 -07:00
Romain Guy
8195e4f0ad am e705f2c5: Make gestures visible again.
Merge commit 'e705f2c52e683bdad2e845b50df6b6cbed660614'

* commit 'e705f2c52e683bdad2e845b50df6b6cbed660614':
  Make gestures visible again.
2009-06-17 10:48:19 -07:00
Romain Guy
d20927410c Fixes #1414069. Display recent activities with two lines of text. 2009-06-17 10:40:29 -07:00
Android (Google) Code Review
a0a854d47f Merge change 4398 into donut
* changes:
  Using Locale to specify language and country for a TTS language to load, rather than a String. Cleanup in doc for TextToSpeech, and addition of queue mode constants.
2009-06-17 10:36:43 -07:00
Jean-Michel Trivi
679d728f09 Using Locale to specify language and country for a TTS language to load,
rather than a String.
Cleanup in doc for TextToSpeech, and addition of queue mode constants.
2009-06-17 10:16:17 -07:00
Cary Clark
3e399de960 add WebView.FindAddress option to ignore case sensitivity
New public interface is set @hide for now. Old interface
uses the new one.

Requires a companion change to external/webkit
http://b/issue?id=1649036
2009-06-17 10:00:57 -04:00
Satish Sampath
bf23fe062a Prepare SearchManager framework for adding Genie logging.
- Instead of passing the suggest provider component name as the field
  EXTRA_DATA, we now pass via the field COMPONENT_NAME
- Kept EXTRA_DATA field as is so we can use it for real extra data.
2009-06-17 13:33:12 +01:00
Android (Google) Code Review
528a29f886 Merge change 4326 into donut
* changes:
  Don't get location in search dialog.
2009-06-17 00:58:19 -07:00
Android (Google) Code Review
9f655a4a04 am 8db24105: Merge change 4402 into donut
Merge commit '8db24105cb92c8513ae1ab6adceb1c1caf9c323f'

* commit '8db24105cb92c8513ae1ab6adceb1c1caf9c323f':
  Fixes #1899284 and #1899287. Give applications more control over the gesture's path.
2009-06-16 21:59:18 -07:00
Android (Google) Code Review
e57b288e24 am 8ad47399: Merge change 4374 into donut
Merge commit '8ad473994d402e42ec3c8f44f31e99ef2f7e9237'

* commit '8ad473994d402e42ec3c8f44f31e99ef2f7e9237':
  Fixes a potential NPE in View.
2009-06-16 21:59:15 -07:00
Mitsuru Oshima
d9aef73f72 Squashed commit of the following:
commit 9798cd23605c96c1d6a29202f4d31f5454079b61
Author: Mitsuru Oshima <oshima@google.com>
Date:   Tue Jun 16 13:50:44 2009 -0700

    Made other toShortString in performDestroyActivity safe.

commit 19bf973df81d9d01210effb39c99e5236f2229c1
Author: Mitsuru Oshima <oshima@google.com>
Date:   Fri Jun 12 15:50:03 2009 -0700

    * component can be null after destory?
     This was causing NPE in catch block, which hides the actual exception.

Conflicts:

	core/java/android/app/ActivityThread.java
2009-06-16 20:22:12 -07:00
Joe Onorato
5f15d151b5 checkpoint BackupDatAInput / RestoreHelper 2009-06-16 18:46:50 -07:00
Christopher Tate
aa088447ba Hold the current transport instantiated all the time.
We no longer instantiate the transport just for the duration of handling a
backup or restore operation.  Instead, we hold the object forever (replacing it
if instructed to do so).  This makes it easier for transports to watch system
state and help set backup timing policy.

Also fixes up the IBackupTransport documentation a bit.
2009-06-16 18:25:46 -07:00
Romain Guy
e705f2c52e Make gestures visible again. 2009-06-16 17:07:21 -07:00
Android (Google) Code Review
714000456b am febde5fc: Merge change 4389 into donut
Merge commit 'febde5fc290eb422f78b47f393dc451394751d59'

* commit 'febde5fc290eb422f78b47f393dc451394751d59':
  More bmgr work; fix clear-data signalling
2009-06-16 16:43:17 -07:00
Android (Google) Code Review
dfd0363ada am 5633034f: Merge change 4115 into donut
Merge commit '5633034f79bfa67c4219f16fd6d23e962e800be2'

* commit '5633034f79bfa67c4219f16fd6d23e962e800be2':
  * component can be null after destory?
2009-06-16 16:43:01 -07:00
Android (Google) Code Review
8db24105cb Merge change 4402 into donut
* changes:
  Fixes #1899284 and #1899287. Give applications more control over the gesture's path.
2009-06-16 15:56:49 -07:00
Romain Guy
b973eef289 Fixes #1899284 and #1899287. Give applications more control over the gesture's path.
This change adds new APIs to control the gesture's path by deciding whether the
path should be drawn and by getting the ability to get the Path itself and
draw it differently.
2009-06-16 15:53:27 -07:00
Android (Google) Code Review
a238b46876 Merge change 4387
* changes:
  beef up the syncadapter API
2009-06-16 15:34:34 -07:00
Fred Quintana
21bb0deb36 beef up the syncadapter API 2009-06-16 15:25:24 -07:00
Android (Google) Code Review
8ad473994d Merge change 4374 into donut
* changes:
  Fixes a potential NPE in View.
2009-06-16 15:04:37 -07:00
Christopher Tate
f68eb500f9 More bmgr work; fix clear-data signalling
The 'list sets' and 'restore token#' commands from bmgr now do what they are
supposed to.  At this point we see the restore target's data being cleared
properly and its agent being launched and invoked for restore.
2009-06-16 13:58:17 -07:00
Dmitri Plotnikov
9d044514f7 Changing aggregation exception API.
Switching from contact-contact pairs to aggregate-contact pairs
2009-06-16 13:22:21 -07:00
Romain Guy
779398e7eb Fixes a potential NPE in View.
Calling getLocationOnScreen() before the View is attached to a window can
throw an NPE. This change simply guards against the exception.
2009-06-16 13:17:50 -07:00
Android (Google) Code Review
5633034f79 Merge change 4115 into donut
* changes:
  * component can be null after destory?  This was causing NPE in catch block, which hides the actual exception.
2009-06-16 13:14:09 -07:00
Android (Google) Code Review
f0176b5929 Merge change 4359
* changes:
  Allow proper text editing after clicking with the trackball.
2009-06-16 13:02:50 -07:00
Leon Scroggins
1bd0d6a53f Allow proper text editing after clicking with the trackball.
As with the recent change to make a touch bring up the WebTextView,
so that the trackball can be used, and we get text editing goodness,
we also need to bring up the WebTextView when clicking the trackball.
Also do not call overrideUrlLoading for an input field and add a
comment.
2009-06-16 15:04:28 -04:00
Android (Google) Code Review
ed776592e1 am b4f7592b: Merge change 4299 into donut
Merge commit 'b4f7592b03c8424302c10e61474b0e2d0a71a630'

* commit 'b4f7592b03c8424302c10e61474b0e2d0a71a630':
  Allow pre-Donut apps to use indirect Buffers in GL11 Pointer methods.
  Fix IntentFilter constructor to properly process the action parameter.
2009-06-16 08:37:21 -07:00
Android (Google) Code Review
22a9f7a52e am 6297cb2e: Merge change 4287 into donut
Merge commit '6297cb2eb57c183e202744516a96b2dbbf204a09'

* commit '6297cb2eb57c183e202744516a96b2dbbf204a09':
  Sketch out a 'bmgr' command line tool
2009-06-16 08:37:18 -07:00
Android (Google) Code Review
206dab6e3b am e65fdfb8: Merge change 4262 into donut
Merge commit 'e65fdfb8affd92b3bb2d41f0bd149f704ec48f26'

* commit 'e65fdfb8affd92b3bb2d41f0bd149f704ec48f26':
  Add utility methods to AndroidTestCase for asserting permission requirements for launching activities and accessing ContentProviders.
2009-06-16 08:36:56 -07:00
Android (Google) Code Review
3c3d3081aa am 727f36c6: Merge change 4265 into donut
Merge commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef'

* commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef':
  process: Fix bug where if a thread exited while we were changing its control
  Fix the build: Remove ADD_SYSTEM_SERVICE, which I had accidentally
2009-06-16 08:36:48 -07:00
Android (Google) Code Review
29930a1cb8 am 3dcea047: Merge change 4237 into donut
Merge commit '3dcea047c5c7a61a56f618815e298d7bd38e2678'

* commit '3dcea047c5c7a61a56f618815e298d7bd38e2678':
  Remove obsolete FOTA_UPDATE permission (which should never have been
2009-06-16 08:36:35 -07:00
Grace Kloba
e5856bca98 am a03f0465: hide the new constant as it is pending api approval
Merge commit 'a03f046522f568a79b75556aa54c0407b1151511'

* commit 'a03f046522f568a79b75556aa54c0407b1151511':
  hide the new constant as it is pending api approval
2009-06-16 08:36:26 -07:00
Android (Google) Code Review
01e28a15b4 am 5570f2f2: Merge change 4252 into donut
Merge commit '5570f2f24a74a1f16c781722731ba39f2907cbb3'

* commit '5570f2f24a74a1f16c781722731ba39f2907cbb3':
  Add more comment for EXTRA_APPEND_LOCATION
2009-06-16 08:36:22 -07:00
Android (Google) Code Review
48f72206dc am aa67df9f: Merge change 4248 into donut
Merge commit 'aa67df9f2f8e4c0993c5954e598031bbf4aaf7a3'

* commit 'aa67df9f2f8e4c0993c5954e598031bbf4aaf7a3':
  Remove ADD_SYSTEM_SERVICE and SET_PROCESS_FOREGROUND permissions.
2009-06-16 08:36:12 -07:00