Commit Graph

38903 Commits

Author SHA1 Message Date
Adam Powell
a984b38df5 Fix doc build
Change-Id: Ia0425bc956540bbd5f16138ad182ae365bf1c85a
2010-06-04 14:20:10 -07:00
Jeff Hamilton
a896308c0e am a724feb2: am 66236db3: am 1e2e2aea: am 4b330921: Don\'t crash when low storage is encountered pre-boot completion. 2010-06-04 14:11:19 -07:00
Dianne Hackborn
1578e1acbc am 420e7ec7: am fef42db9: Add sample code. 2010-06-04 14:11:14 -07:00
Dianne Hackborn
d0b15cecc6 resolved conflicts for merge of f3307ae8 to master
Change-Id: Ic59db363391f73343eba32894113914ceea5a963
2010-06-04 14:09:02 -07:00
Jeff Hamilton
a724feb277 am 66236db3: am 1e2e2aea: am 4b330921: Don\'t crash when low storage is encountered pre-boot completion. 2010-06-04 13:55:02 -07:00
Jeff Hamilton
66236db38d am 1e2e2aea: am 4b330921: Don\'t crash when low storage is encountered pre-boot completion.
Merge commit '1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac' into kraken

* commit '1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac':
  Don't crash when low storage is encountered pre-boot completion.
2010-06-04 13:52:45 -07:00
Jeff Hamilton
1e2e2aea8c am 4b330921: Don\'t crash when low storage is encountered pre-boot completion.
Merge commit '4b3309211ed6f3532b44481945a4725143d50b8a' into froyo-plus-aosp

* commit '4b3309211ed6f3532b44481945a4725143d50b8a':
  Don't crash when low storage is encountered pre-boot completion.
2010-06-04 13:50:31 -07:00
Dianne Hackborn
420e7ec77a am fef42db9: Add sample code. 2010-06-04 13:41:58 -07:00
Dianne Hackborn
fef42db925 Add sample code.
Change-Id: I8f598dcbccbb0c43cedc1e1d02f6e3a46d6ebc67
2010-06-04 13:38:43 -07:00
Adam Powell
1bba846ed1 Merge "Added ListPopupWindow. Refactored AutoCompleteTextView and Spinner (optionally) to use it. Added associated styles." 2010-06-04 13:33:40 -07:00
Dianne Hackborn
f3307ae892 am faed5fbf: Merge "Add support for heavy-weight applications." into kraken 2010-06-04 13:31:54 -07:00
Dianne Hackborn
faed5fbf15 Merge "Add support for heavy-weight applications." into kraken 2010-06-04 13:30:32 -07:00
Jeff Hamilton
4b3309211e Don't crash when low storage is encountered pre-boot completion.
Bug: 2741633
Change-Id: Ic073ead64ff43b2e2c32b439756cd71c2b6550b8
2010-06-04 15:16:06 -05:00
The Android Open Source Project
eefd63e357 am 0a0c57f9: am 7c035d8a: am 2d743fe2: merge from open-source master 2010-06-04 13:02:38 -07:00
The Android Open Source Project
0a0c57f929 am 7c035d8a: am 2d743fe2: merge from open-source master 2010-06-04 13:00:37 -07:00
The Android Open Source Project
7c035d8a65 am 2d743fe2: merge from open-source master
Merge commit '2d743fe2f39397d41334001d897eb78da56e94ef' into kraken

* commit '2d743fe2f39397d41334001d897eb78da56e94ef':
  Add better error handling for savePicture and restorePicture
2010-06-04 12:58:09 -07:00
Roman Nurik
e577d72a3b Revamp resources listing, part 1 (frameworks/base)
- Revamp resource index page with big icons for resource types and a category listing.
- Update resource TOC to show resource types and topics, instead of actual resource links.
- Add resource browser/search results page (browser.html?tag=foo).
- Add resources-data.js file containing metadata and links to all resources.

Change-Id: Ieca87c6e42dda3c609824b71fb8a638abb11850c
2010-06-04 12:29:48 -07:00
Adam Powell
c3fa6304c9 Added ListPopupWindow. Refactored AutoCompleteTextView and Spinner
(optionally) to use it. Added associated styles.

ListPopupWindow allows apps to present a popup window of options to
the user that will correctly dodge the IME if needed.

Change-Id: I509c6c45036856daab686a6edeb7a9de1e72eb0a
2010-06-04 12:18:16 -07:00
Vasu Nori
d2cecfd375 fix broken-test
Change-Id: I3d33cda2e4f1ba68843d6a81b8c624ce4af8519f
2010-06-04 12:05:58 -07:00
Robert Greenwalt
77b32ddbbe Make the DUN apn data secure.
Rather than come out of the user-modifiable APN DB, the DUN APN data will
come first from a built-in resource and then potentially overriden by a secure
setting (which is gservices upgradable).

Also made the "require-dun" setting secure-setting overridable.
bug:2736390

Change-Id: I1e4644c3839f06c977b83797641f3948785146a2
2010-06-04 11:13:34 -07:00
The Android Open Source Project
2d743fe2f3 merge from open-source master
Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471
2010-06-04 11:08:36 -07:00
Alex Sakhartchouk
0829f0d51f Merge "Creating the jni and java layer to integrate a3d" 2010-06-04 10:10:24 -07:00
Dianne Hackborn
860755faa6 Add support for heavy-weight applications.
Only one can be running at a time, their process can not be killed,
and a notification is posted while it is running.

Change-Id: I843015723947e0c934ae63a1aeee139327c0bc01
2010-06-04 10:09:13 -07:00
Alex Sakhartchouk
aae74ad614 Creating the jni and java layer to integrate a3d
Change-Id: I438359633bae59bf9188cd2c4664a92ca16c5f37
2010-06-04 10:06:50 -07:00
Jaikumar Ganesh
4a575c682b am bcc112b1: am f8acea6c: Merge "Delete local references to avoid reference table overflow." into kraken 2010-06-04 09:49:10 -07:00
Jaikumar Ganesh
bcc112b16a am f8acea6c: Merge "Delete local references to avoid reference table overflow." into kraken 2010-06-04 09:47:47 -07:00
Jaikumar Ganesh
f8acea6ccb Merge "Delete local references to avoid reference table overflow." into kraken 2010-06-04 09:46:03 -07:00
Alon Albert
d81689aefc Add support for logging curl commands for binary POST data
Change-Id: Ibf55b95c2ae11681b18b20ba5643057ea0083f7f
2010-06-04 09:39:36 -07:00
Mike Lockwood
b0ccc7ca75 Merge "MTP: Add support for host cancellation of file transfers." 2010-06-04 07:20:16 -07:00
Mike Lockwood
a82d3c550b MTP: Add support for host cancellation of file transfers.
Change-Id: I72df423f8017286e41adae525e6fbcb6b8440687
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-04 09:49:21 -04:00
Wu-cheng Li
baff93de27 am ab5e67c6: am cefb01ab: Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken 2010-06-04 03:41:44 -07:00
Wu-cheng Li
ab5e67c60d am cefb01ab: Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken 2010-06-04 03:39:44 -07:00
Wu-cheng Li
cefb01abbf Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken 2010-06-04 03:38:25 -07:00
Wu-cheng Li
8aba232dbc Add KEY_SUPPORTED_METERING_MODES and fix some typos.
bug:2737111
Change-Id: I108ae7057786921bf99385ad66dbc1f02d6a1448
2010-06-04 17:18:17 +08:00
Eric Laurent
4b18200b9c am 030a1553: am 2ea200c5: Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken 2010-06-04 00:18:07 -07:00
Eric Laurent
030a15531c am 2ea200c5: Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken 2010-06-04 00:16:05 -07:00
Eric Laurent
2ea200c5a7 Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken 2010-06-04 00:14:46 -07:00
Doug Kwan
77205ace4e Merge "Add missing library to linker command line." 2010-06-03 22:53:25 -07:00
Doug Kwan
bebfb6aa0c Add missing library to linker command line.
Change-Id: Ia9ddf6e6bb5e72c32372a2f460806b6cbb7ec660
2010-06-03 22:49:34 -07:00
Wu-cheng Li
3c358eb7bd am 2f98f99c: am 5f5df382: Merge "Add camera metering mode API." into kraken 2010-06-03 22:35:40 -07:00
Wu-cheng Li
2f98f99cd1 am 5f5df382: Merge "Add camera metering mode API." into kraken 2010-06-03 22:33:15 -07:00
Wu-cheng Li
5f5df382e5 Merge "Add camera metering mode API." into kraken 2010-06-03 22:32:05 -07:00
Jing Yu
7ba85e4f42 Merge "Add missing libraries, in order for gold to work." 2010-06-03 21:05:51 -07:00
Jing Yu
42006894ed Add missing libraries, in order for gold to work.
gold is more strict than ld. If building A depends on libB directly,
we must specify -lB at link time.

Change-Id: Iac7cec58cbae5e0cbcfc9adab924db6733192d20
2010-06-03 20:53:52 -07:00
Kenny Root
c4a1a927a8 Merge "Fix alignment issues with RTL paragraphs." 2010-06-03 18:26:55 -07:00
Daisuke Miyakawa
d9f89b2201 Merge "Delete vCard code to platform/framework/opt/vcard." 2010-06-03 17:42:23 -07:00
Brad Fitzpatrick
e407a608b0 resolved conflicts for merge of 7d6362de to master
Change-Id: Ic26dd6d617f0edba549c992256511613df00caa6
2010-06-03 17:15:48 -07:00
Jaikumar Ganesh
a7c0bdc4e4 Delete local references to avoid reference table overflow.
Change-Id: I2218b97647e381bfe6d329b1b6134bb76c1832b6
2010-06-03 16:59:01 -07:00
Vasu Nori
df0089e1d2 Merge "set some members to final, set database errorhandler to default if null." 2010-06-03 16:46:31 -07:00
The Android Automerger
ef920ddf2d Merge branch 'froyo' into froyo-release 2010-06-03 16:21:08 -07:00