Commit Graph

3210 Commits

Author SHA1 Message Date
Android (Google) Code Review
253e8e34b3 Merge change 4533
* changes:
  Implement default programs and implement defaults and parents for imports.
2009-06-17 16:54:35 -07:00
Jason Sams
9c54bdbf45 Implement default programs and implement defaults and parents for imports. 2009-06-17 16:52:59 -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
5cc37854d4 am 07ca8c71: Merge change 4438 into donut
Merge commit '07ca8c71f47ac8c61b3aef0210e44d2c48e62e48'

* commit '07ca8c71f47ac8c61b3aef0210e44d2c48e62e48':
  Fix many of the ANRs introduced by scheduling classes.
2009-06-17 15:39:06 -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
Android (Google) Code Review
5bba52f617 am 2cf3971e: Merge change 4460 into donut
Merge commit '2cf3971ea4d22f8981ae71e6ba358f19e1628d09'

* commit '2cf3971ea4d22f8981ae71e6ba358f19e1628d09':
  Use the new keystore API in vpn service.
2009-06-17 15:38:47 -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
587c89e25b am 5c1c40d2: Merge change 4455 into donut
Merge commit '5c1c40d28cb4c0dc5efbdb6e9e695685044606e9'

* commit '5c1c40d28cb4c0dc5efbdb6e9e695685044606e9':
  add feedback test with gsm7bit special case characters
2009-06-17 15:38:39 -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
Android (Google) Code Review
97b5660c97 am 9fbeb7da: Merge change 4337 into donut
Merge commit '9fbeb7da1318bf5b65588a759332d74540306c06'

* commit '9fbeb7da1318bf5b65588a759332d74540306c06':
  Change the keystore APIs.
2009-06-17 15:38:33 -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
ddf9bc76a4 Merge change 4501
* changes:
  Add support to BitmapFactory for decoding a bitmap from a MemoryFile FileDescriptor.
2009-06-17 14:32:02 -07:00
Marco Nelissen
984b5df383 Add support to BitmapFactory for decoding a bitmap from a MemoryFile FileDescriptor. 2009-06-17 14:07: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
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
Christopher Tate
ff4a203c78 am 63d27000: Allow privileged callers to schedule a backup pass for any app.
Merge commit '63d2700036d0f73cbde27f0fa724d30045b4bb07'

* commit '63d2700036d0f73cbde27f0fa724d30045b4bb07':
  Allow privileged callers to schedule a backup pass for any app.
2009-06-17 10:48:22 -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
07ca8c71f4 Merge change 4438 into donut
* changes:
  Fix many of the ANRs introduced by scheduling classes.
2009-06-17 10:38:44 -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
Android (Google) Code Review
2cf3971ea4 Merge change 4460 into donut
* changes:
  Use the new keystore API in vpn service.
2009-06-17 06:34:48 -07: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
Chung-yih Wang
68fdd3d4cd Use the new keystore API in vpn service. 2009-06-17 18:25:02 +08:00
Android (Google) Code Review
5c1c40d28c Merge change 4455 into donut
* changes:
  add feedback test with gsm7bit special case characters
2009-06-17 01:15:08 -07:00
Tammo Spalink
0ff946e7b5 add feedback test with gsm7bit special case characters 2009-06-17 16:13:52 +08: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
9fbeb7da13 Merge change 4337 into donut
* changes:
  Change the keystore APIs.
2009-06-16 23:35:57 -07:00
Chung-yih Wang
6d531bf051 Change the keystore APIs.
1. simplify the keypair selection in UI.
2. add the user certificate and key into the keystore for keygen feature.
2009-06-17 14:32:05 +08: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
Dianne Hackborn
82f3f0008e Fix many of the ANRs introduced by scheduling classes.
We weren't bumping the oom_adj of processes receiving a registered broadcast.  Previously
this wasn't a problem, because those processes are allowed to have their oom_adj
managed by whatever else is in them and if the registered receiver goes away no problem.
But now this is also controlling the scheduling class, so we need to bump them up.

This is probably good anyway, since the developer has the same assurance of their process
not being killing in the middle of registered receivers like it had always been for
manifest receivers.

Also fixed a small issue where we were not recomputing the oom_adh after finished with
a broadcast.
2009-06-16 18:49:05 -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
Android (Google) Code Review
368d9c3ae4 Merge change 4426
* changes:
  Switch fountain to use ProgramVertex rather than hard coded camers in scripts.  Remove camera code from scripts.
2009-06-16 17:51:09 -07:00
Jason Sams
b37c0a5db6 Switch fountain to use ProgramVertex rather than hard coded camers in scripts. Remove camera code from scripts. 2009-06-16 17:49:58 -07:00
Christopher Tate
63d2700036 Allow privileged callers to schedule a backup pass for any app. 2009-06-16 17:18:05 -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
c1760fa84c am f1170fb5: Merge change 4251 into donut
Merge commit 'f1170fb5386ea86d704480d321ee9d1ee4858244'

* commit 'f1170fb5386ea86d704480d321ee9d1ee4858244':
  Updating TTS engine interface for setting the language based on language, country and variant codes
2009-06-16 16:43:11 -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