Commit Graph

1741 Commits

Author SHA1 Message Date
Nick Pelly
14b8f4ccc6 resolved conflicts for merge of ed336839 to master 2009-06-17 19:06:51 -07:00
Android (Google) Code Review
267b168ec8 am 3f4263fa: Merge change 4411 into donut
Merge commit '3f4263fac6bcc68b3c7fff8e6ac9ad2d97b2ad4c'

* commit '3f4263fac6bcc68b3c7fff8e6ac9ad2d97b2ad4c':
  Squashed commit of the following:
2009-06-17 18:46:21 -07:00
Android (Google) Code Review
5117dbd751 am 5553f152: Merge change 3936 into donut
Merge commit '5553f1528e94377ae5adf423e91331f5eb57dd44'

* commit '5553f1528e94377ae5adf423e91331f5eb57dd44':
  add exception message to ApplicationErrorReport
2009-06-17 18:46:17 -07:00
Android (Google) Code Review
961f4a2fe7 am 826a54dd: Merge change 4489 into donut
Merge commit '826a54dd74317f87d4afa8c0f1fc3491a69169ff'

* commit '826a54dd74317f87d4afa8c0f1fc3491a69169ff':
  Add SmsManager permission test.
2009-06-17 18:45:58 -07:00
Suchi Amalapurapu
3e4b23b573 Merge commit '0781df94' into manualmerge
Conflicts:
	Android.mk
	api/current.xml
2009-06-17 18:24:44 -07:00
Android (Google) Code Review
83d63a8c2b Merge change 4532 into donut
* changes:
  Fixes #1924909. When restoring managed dialogs, do exactly the same thing as when showing a dialog.
2009-06-17 17:04:33 -07:00
Android (Google) Code Review
41194b241f Merge change 4539 into donut
* changes:
  Fixes #1925003. Make ListView honor the android:choiceMode XML attribute.
2009-06-17 17:01:55 -07:00
Android (Google) Code Review
6d873211c9 Merge change 4533
* changes:
  Implement default programs and implement defaults and parents for imports.
2009-06-17 16:54:35 -07:00
Android (Google) Code Review
e272cd8e4c Merge change 4524 into donut
* changes:
  FileRestoreHelper and RestoreHelperDispatcher work.
2009-06-17 16:34:41 -07:00
Joe Onorato
f509f669cf FileRestoreHelper and RestoreHelperDispatcher work. 2009-06-17 16:20:55 -07:00
Romain Guy
f4887d989d resolved conflicts for merge of 3571ff40 to master 2009-06-17 15:55:53 -07:00
Android (Google) Code Review
f000b5d29e Merge change 4515 into donut
* changes:
  Tell DBUS not to call _exit() if the DBUS connection disconnects.
2009-06-17 15:41:51 -07:00
Android (Google) Code Review
b89d302aa1 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
6ae11859ae 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
12fcd1e944 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
b1ec0ba86f 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
0680c44fc8 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
ccb50459fe 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
cd70c81228 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
b08e0936d7 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
f51e666401 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
f757bd0710 am 5f15d151: checkpoint BackupDatAInput / RestoreHelper
Merge commit '5f15d151b5101fadfe6cba1e8f4aa6367e8c603e'

* commit '5f15d151b5101fadfe6cba1e8f4aa6367e8c603e':
  checkpoint BackupDatAInput / RestoreHelper
2009-06-17 15:38:08 -07:00
Christopher Tate
ae13d759db 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
368cc9dc2d Merge change 4411 into donut
* changes:
  Squashed commit of the following:
2009-06-17 15:20:58 -07:00
Android (Google) Code Review
f23796ab47 Merge change 4501
* changes:
  Add support to BitmapFactory for decoding a bitmap from a MemoryFile FileDescriptor.
2009-06-17 14:32:02 -07:00
Android (Google) Code Review
1511793343 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
Android (Google) Code Review
77aebe2f9a Merge change 3936 into donut
* changes:
  add exception message to ApplicationErrorReport
2009-06-17 13:34:41 -07:00
Android (Google) Code Review
1593a4a2b1 Merge change 4489 into donut
* changes:
  Add SmsManager permission test.
2009-06-17 12:51:17 -07:00
Android (Google) Code Review
b878b848e4 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
Android (Google) Code Review
b9efe0fd29 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
997dccb794 Merge change 4483 into donut
* changes:
  Fixes #1414069. Display recent activities with two lines of text.
2009-06-17 10:58:47 -07:00
Christopher Tate
b25abf851f 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
8d1472003a am e705f2c5: Make gestures visible again.
Merge commit 'e705f2c52e683bdad2e845b50df6b6cbed660614'

* commit 'e705f2c52e683bdad2e845b50df6b6cbed660614':
  Make gestures visible again.
2009-06-17 10:48:19 -07:00
Android (Google) Code Review
33c7366ba1 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
3c4d30218c 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
Android (Google) Code Review
74b00231cc Merge change 4460 into donut
* changes:
  Use the new keystore API in vpn service.
2009-06-17 06:34:48 -07:00
Android (Google) Code Review
ad0a7180a9 Merge change 4455 into donut
* changes:
  add feedback test with gsm7bit special case characters
2009-06-17 01:15:08 -07:00
Android (Google) Code Review
112b5faa7e 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
cc7d4d68e0 Merge change 4337 into donut
* changes:
  Change the keystore APIs.
2009-06-16 23:35:57 -07:00
Chung-yih Wang
4c40420cd2 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
caf7587025 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
91a89592fe 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
Joe Onorato
03aa8d7d04 checkpoint BackupDatAInput / RestoreHelper 2009-06-16 18:46:50 -07:00
Android (Google) Code Review
8c6bd7bf42 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
Android (Google) Code Review
4b4e2b3cdb 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
a230463a5a 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
4d58d38cc9 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
4d86bc3791 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
Android (Google) Code Review
7565e58208 Merge change 4387
* changes:
  beef up the syncadapter API
2009-06-16 15:34:34 -07:00
Android (Google) Code Review
da210b815b Merge change 4374 into donut
* changes:
  Fixes a potential NPE in View.
2009-06-16 15:04:37 -07:00