1374 Commits

Author SHA1 Message Date
The Android Open Source Project
d6e24ca28b am 4adacd23: merge from open-source master
Merge commit '4adacd23d4c91569b16fe50419f1a91f68d805bd' into kraken

* commit '4adacd23d4c91569b16fe50419f1a91f68d805bd':
  Add support for EVDO Rev B
2010-05-12 14:56:00 -07:00
The Android Open Source Project
4adacd23d4 merge from open-source master
Change-Id: If6730b50627b2231bd345e594d8d30a37557849e
2010-05-12 14:53:25 -07:00
Jean-Michel Trivi
691d03e73d am 6d7334c1: am afbc5fad: Fix build Remove from API 9 definition the two methods that were removed from API 8. 2010-05-12 10:55:59 -07:00
Jean-Michel Trivi
afbc5fad91 Fix build Remove from API 9 definition the two methods that were
removed from API 8.

Change-Id: I4b443a257b5674a7493ccda0a0427999e369fb4f
2010-05-12 10:43:22 -07:00
Xavier Ducrohet
c5c16f5f60 am 6914e17a: am 08eff49f: am d9712b69: am b1235a57: Merge "Hide two audio focus methods." into froyo 2010-05-12 09:25:25 -07:00
Xavier Ducrohet
08eff49f09 am d9712b69: am b1235a57: Merge "Hide two audio focus methods." into froyo
Merge commit 'd9712b69ce529fbf50b3b837032c1dc40e623381' into kraken

* commit 'd9712b69ce529fbf50b3b837032c1dc40e623381':
  Hide two audio focus methods.
2010-05-12 07:56:29 -07:00
Xavier Ducrohet
d9712b69ce am b1235a57: Merge "Hide two audio focus methods." into froyo
Merge commit 'b1235a57a09174179553acecef2370354bdcbf41' into froyo-plus-aosp

* commit 'b1235a57a09174179553acecef2370354bdcbf41':
  Hide two audio focus methods.
2010-05-12 07:50:19 -07:00
Xavier Ducrohet
5f53f0883a Hide two audio focus methods.
Change-Id: I53ddf736892cde8edfaffa7d69dd9c234df52efa
2010-05-11 14:28:38 -07:00
Naveen Kalla
0a5174a6e9 Add support for EVDO Rev B
Change-Id: I8588e8b342c51f4b79bced8ef8fe60d57f07aefa
2010-05-11 10:12:07 -07:00
Jeff Hamilton
3d32f6e522 Add Activity.isChangingConfiguration().
This allows activities to know if they're being
torn down due to a configuration change.

Bug: 2557550
Change-Id: Ibd9bf5a06c92dbe3789049b84133cf4754381873
2010-05-11 11:48:10 -05:00
Wu-cheng Li
f0b8679b5d am 0c3bba3e: am e1b2b3b0: Merge "Add continuous focus mode constant." into kraken 2010-05-10 20:07:54 -07:00
Wu-cheng Li
ca09961484 Add continuous focus mode constant.
bug:2612447
Change-Id: I9bc3f5a47ad50722a265d50b1d28fb82a2253dc9
2010-05-10 15:14:56 +08:00
Shimeng (Simon) Wang
db990751ef Updated URL pattern based on http://data.iana.org/TLD/tlds-alpha-by-domain.txt
Note: this change doesn't solve the Arabic country code top level domains, which
was turned on today.  For that, more changes need to be done; probably we need a way
to convert the BiDi url to punycode first; then apply this URL pattern.

issue: 2663885
Change-Id: I0597fe620c4d44259bff88ecfcbcca1565928c6f
2010-05-07 14:59:04 -07:00
Dianne Hackborn
f121be737c Improvements to fragment API:
- Remove names associated with fragments (we'll use ids).  They may
  come back for other uses.
- Add method to replace a fragment, to help in doing back stacks.
- Add names to back stack states, to allow for jumping back to
  known states.
- Add ability to set animations associated with fragments being
  added or removed.

Change-Id: Ic2799f06947b1511fb1df5965ca32568b860b3c3
2010-05-07 11:31:03 -07:00
Shimeng (Simon) Wang
325978154e Revert "Update api/current.xml after URL pattern update."
This reverts commit 81950cd2605224823011d4764438935139804b89.

Change-Id: Ibe3f1e46d99b87cfe1cbd896a2e62cd626e73b21
2010-05-06 20:42:49 -07:00
Shimeng (Simon) Wang
81950cd260 Update api/current.xml after URL pattern update.
issue: 2663885
Change-Id: Iead864541751faf796a29f5d5371c9a5c282cb1e
2010-05-06 17:01:49 -07:00
Dianne Hackborn
ba51c3d02d New fragment stuff: back stack, and layout integration.
You can now have fragment transactions pushed on to a local back
stack, which will automatically be popped when the user pressed
back in the activity.

Fragments can also now be inserted into layouts.

Change-Id: Id1c9ae3fbc54f696cd8bb5ca5957bec4d3eabf18
2010-05-06 13:19:35 -07:00
The Android Open Source Project
108817f3d8 am 8b270a7a: am 579e08e6: am f7896449: merge from open-source master 2010-05-05 18:16:31 -07:00
Dianne Hackborn
7304381ca9 am 110a031a: am f41f444d: Merge "First pass at NativeActivity." into kraken 2010-05-05 17:51:05 -07:00
The Android Open Source Project
579e08e657 am f7896449: merge from open-source master
Merge commit 'f78964490d8098387d51444c87bf520ad3f674e2' into kraken

* commit 'f78964490d8098387d51444c87bf520ad3f674e2':
  Add new keycodes for the convenience of Japanese IMEs
  Call register_localized_collators() with the current locale.
  Fixed deserialization problem in DatePicker.
  Fix for bug 2467152 files with spaces fail to open.
  Set alpha value for newly created dim surface.
  telephony: Fix CID when CID is unknown
2010-05-05 16:00:01 -07:00
The Android Open Source Project
f78964490d merge from open-source master
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
2010-05-05 15:57:42 -07:00
Dianne Hackborn
69969e48f2 First pass at NativeActivity.
This is a rough sketch of the new pure-native API, which you can
use through a NativeActivity in your manifest (no Java code in
the .apk needed!).

Intentionally no docs yet, the API is still being seriously
messed with.  But it works.

Change-Id: I0e916d58a0d159ecaf3689e41834eb8dc681c0c0
2010-05-05 15:17:26 -07:00
mogimo
b032bc0373 Add new keycodes for the convenience of Japanese IMEs
Change-Id: Ibd308cef11261147856258595f6ca0137e03e05c
2010-05-05 13:37:21 -07:00
Daniel Lehmann
88e26c21cc Allow contact-sources to rename the term "All Contacts"
Bug:2116002
Change-Id: I3609a8c0198dd33c5426a47e14720a4ccd7b8c10
2010-04-30 13:55:38 -07:00
Dianne Hackborn
e48e200fde am 1443fd09: Fix build. 2010-04-29 19:30:45 -07:00
Dianne Hackborn
1443fd096b Fix build.
Change-Id: I200b8fd7de329133c44fdb66e2bd2b09ab12637d
2010-04-29 19:26:18 -07:00
Dianne Hackborn
8640c1d0e5 am 14cee9f6: New xlarge screen size. 2010-04-28 16:58:05 -07:00
Dianne Hackborn
14cee9f688 New xlarge screen size.
Not complete, only for experimentation at this point.

This includes a reworking of how screen size configurations are matched,
so that if you are on a larger screen we can select configurations for
smaller screens if there aren't any exactly matching the current screen.

The screen size at which we switch to xlarge has been arbitrarily
chosen; the compatibility behavior has not yet been defined.

Change-Id: I1a33b3818eeb51a68fb72397568c39ab040a07f5
2010-04-28 16:51:52 -07:00
Dianne Hackborn
525bb6a0cd am b6c45927: am 44f2c6ba: am 2e4b98dc: Merge "Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE" into froyo 2010-04-27 12:27:36 -07:00
Fred Quintana
a31a945ba6 move favorites and my contacts group handling to the
provider and sync adapter

Change-Id: I768d7407a42a72b24ece8abb1891d050c8b6760e
2010-04-27 12:19:37 -07:00
Dianne Hackborn
ff121670b7 am 34483a0f: resolved conflicts for merge of 5a8f877c to kraken 2010-04-27 11:20:31 -07:00
Dianne Hackborn
b6c459276f am 44f2c6ba: am 2e4b98dc: Merge "Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE" into froyo
Merge commit '44f2c6baa68e02f7837cd1ca285d5c4f0f871b18' into kraken

* commit '44f2c6baa68e02f7837cd1ca285d5c4f0f871b18':
  Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE
2010-04-27 11:18:24 -07:00
Dianne Hackborn
34483a0f6e resolved conflicts for merge of 5a8f877c to kraken
Change-Id: I3e320cfe9fcafe4f49e1863eaeddac96bc3f72c6
2010-04-27 11:06:43 -07:00
Dianne Hackborn
44f2c6baa6 am 2e4b98dc: Merge "Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE" into froyo
Merge commit '2e4b98dcd88f14fdb35e46236ec916493c570f28' into froyo-plus-aosp

* commit '2e4b98dcd88f14fdb35e46236ec916493c570f28':
  Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE
2010-04-26 18:54:06 -07:00
Dianne Hackborn
94c567e1e3 Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE
There was a gap in the bit numbers.

Change-Id: I0feef7dc4abed5db7412659b5ad078caffe4f2d4
2010-04-26 18:50:11 -07:00
Dianne Hackborn
5a8f877cf8 am 3202d380: Fix issue #2631417: Expose FLAG_EXTERNAL_STORAGE
Merge commit '3202d380226043fa665df3c92252f791f8c52d55' into froyo-plus-aosp

* commit '3202d380226043fa665df3c92252f791f8c52d55':
  Fix issue #2631417: Expose FLAG_EXTERNAL_STORAGE
2010-04-26 18:00:08 -07:00
Dianne Hackborn
3202d38022 Fix issue #2631417: Expose FLAG_EXTERNAL_STORAGE
Also update 8.xml to match the current API.

Change-Id: I668fe56f6c156c2e8daa458baa7410fdb8ebef52
2010-04-26 17:51:34 -07:00
Adam Powell
b9eab6c793 resolved conflicts for merge of 81cd2e90 to master
Fixed public.xml value padding for kraken/master

Merge commit '81cd2e90' into manualmerge

Conflicts:
	api/current.xml

Change-Id: I09d2c5c7e6acbf4086c0bb8756a5aaf41a646d71
2010-04-23 16:49:54 -07:00
Adam Powell
81cd2e90cc Logo attribute for manifest and PackageManager methods to fetch it
Change-Id: I2c5ac44a4e2af982a616b2012901d7395013b19f
2010-04-23 15:49:07 -07:00
Suchi Amalapurapu
ef404b7aa0 am 0c64ff75: am d32f9422: am 0dde41fb: Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo 2010-04-20 15:22:15 -07:00
Suchi Amalapurapu
0c64ff7568 am d32f9422: am 0dde41fb: Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo
Merge commit 'd32f942280cc4390ab853321557eef06292b300e' into kraken

* commit 'd32f942280cc4390ab853321557eef06292b300e':
  Fix 2610961
2010-04-20 15:14:41 -07:00
Suchi Amalapurapu
d32f942280 am 0dde41fb: Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo
Merge commit '0dde41fbe0e36bfe059399c839604267ad0318c1' into froyo-plus-aosp

* commit '0dde41fbe0e36bfe059399c839604267ad0318c1':
  Fix 2610961
2010-04-20 15:08:50 -07:00
Suchi Amalapurapu
89e0c1a9f5 Fix 2610961
Unhide broadcast intents that are sent when sdcard gets mounted/unmounted.

Change-Id: Ibb5700178e98f657f1c2b6a2f83e722151c4a44f
2010-04-20 14:08:08 -07:00
Dianne Hackborn
2dedce6e84 Introducing Fragment.
Basic implementation of an API for organizing a single activity into separate,
discrete pieces.  Currently supports adding and removing fragments, and
performing basic lifecycle callbacks on them.

Change-Id: I6ea8e6bdb04d93f8105c2e983fe9b6532422de34
2010-04-19 15:09:31 -07:00
android-build SharedAccount
5504668721 fix issues in current.xml (bad merge earlier)
Change-Id: I9be4dbe04c126db7fc92f116aa73bba6c96042cf
2010-04-15 18:21:40 -07:00
android-build SharedAccount
120c457672 manual merge
Change-Id: I235ae925559b5db6d64cc8f8b188704a84d7b6a2
2010-04-15 16:36:34 -07:00
Dianne Hackborn
cd0d10f939 Introduce new API version to avoid breakage with the Froyo APIs;
introduce padding in the resources to avoid cross-branch merge pain.

Change-Id: I9975f4320dfc625e3ed68dfdbbe94cc0c3b019f4
2010-04-15 14:38:30 -07:00
Adam Powell
212db7d3f8 Added MultiSelectListPreference
Added set support to XmlUtils; added Set<String> functions to SharedPreferences.

MultiSelectListPreference allows multiple selection and persistence of
string preferences. Addresses bug 2575634.

Change-Id: Icd56022d444b0ce43cccf819cd7d600fdb00e88a
2010-04-15 10:18:17 -07:00
Vasu Nori
062fc7ce36 allow apps to specify actions to take on database corruption error
let the user specify an interface impl class to specify the actions
to take when db corruption is detected.
this class is specified when the database is opened/created.

Change-Id: I84eb57208c8fedfa7235805b0ec58165efdc1560
2010-04-15 09:31:47 -07:00
Dianne Hackborn
ded77760d1 am 90d3f458: API 8!
Merge commit '90d3f458d99d9c0f35f9ee295997661c2493cb58' into froyo-plus-aosp

* commit '90d3f458d99d9c0f35f9ee295997661c2493cb58':
  API 8!
2010-04-14 22:27:10 -07:00