Adam Cohen
3f6c27133b
Merge "Adding default padding to AppWidgetHostView for widgets >= API level 14"
2011-09-30 19:26:05 -07:00
Chia-chi Yeh
11230bb769
Merge "SipService: handle connectivity changes correctly."
2011-09-30 17:12:49 -07:00
Teng-Hui Zhu
9ec4757b17
Compiling issue fix since SurfTex header changed.
...
Change-Id: I7790626d287d4b44cd9d9fc9f902237b6d059678
2011-09-30 16:59:19 -07:00
Eric Fischer
ef33a412ce
Merge "Import revised translations."
2011-09-30 16:38:53 -07:00
Adrian Ludwig
f96c1c7b39
Merge "Update existing security FAQ and Developer Overview"
2011-09-30 15:46:41 -07:00
Jamie Gennis
e3963a97ec
Merge "SurfaceTexture: parameterize the texture target"
2011-09-30 15:28:46 -07:00
Jamie Gennis
fb1b5a2f33
SurfaceTexture: parameterize the texture target
...
This change adds a hack to allow Android Browser to use a SurfaceTexture
to stream RGBA images to a GL_TEXTURE_2D texture object.
Change-Id: Idb90064d5d4b920959ef3be7451362ac5012460e
2011-09-30 14:19:41 -07:00
The Android Open Source Project
61ee4f25ff
Reconcile with ics-factoryrom-release
...
Change-Id: I0b476b0f30ab6e5747e67ab667fef7231b171787
2011-09-30 13:24:24 -07:00
The Android Automerger
474c1e1ae5
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-30 13:12:46 -07:00
Steven Ross
75d523de7e
Merge "Moving fallback check code to Settings"
2011-09-30 13:08:29 -07:00
Ying Wang
a8fdbce107
Merge "Correction the use of SMALLER_FONT_FOOTPRINT"
2011-09-30 13:02:55 -07:00
Marco Nelissen
779503fb28
Merge "Remove Ringtone.setWakeMode, it's not needed."
2011-09-30 11:13:39 -07:00
Andreas Huber
8e5a89178e
Merge "Gracefuly return on detecting wrong AAC format from corrupted files"
2011-09-30 11:13:21 -07:00
Steven Ross
237877fa3c
Merge "calling back SetupFaceLock to clean up temporary gallery"
2011-09-30 11:08:47 -07:00
Gilles Debunne
847029bc2a
Merge "Bug 5384675: Color in add to dictionary"
2011-09-30 10:58:30 -07:00
Gilles Debunne
9a4a2574fe
Merge "Bug 5384535: Underline for typo even if there are no suggestions"
2011-09-30 10:58:10 -07:00
Gilles Debunne
3668eed339
Merge "Bug 5254884: suggestions are no logner copied in the clipboard"
2011-09-30 10:58:01 -07:00
Gilles Debunne
d7251348b9
Merge "Bug 5250788: EditText gets slower has the entered text gets longer"
2011-09-30 10:57:51 -07:00
repo sync
e15b5d785a
am 8b42fcef: Fix wifi data activity icons
...
* commit '8b42fcef5ac33d94b76e3002861d4ea4081a6a4f':
Fix wifi data activity icons
2011-09-30 10:21:53 -07:00
Gloria Wang
a0c0e0f3c6
Merge "Wait for some time before stopping the media recorder. Fix for bug 5239001."
2011-09-30 10:17:37 -07:00
repo sync
dedd950f2f
Merge "Fix wifi data activity icons"
2011-09-30 09:57:51 -07:00
repo sync
489832d7a1
Merge "Fix IPv6 on wifi"
2011-09-30 09:57:36 -07:00
Mark Wagner
2510c1b447
Merge "bugfix 5381702 MMS app puts temporary files on sdcard in wrong location"
2011-09-30 09:55:10 -07:00
Xavier Ducrohet
d4daf2533a
Merge "LayoutLib: Fix native delegate for Display."
2011-09-30 09:41:35 -07:00
Wei Huang
a318536ae1
Merge "Convert content type "image/jpg" to "image/jpeg"."
2011-09-30 09:23:03 -07:00
Kenny Root
8c39ccd36a
Merge "Add DUMP permission checks to services"
2011-09-30 08:57:43 -07:00
Daniel Sandler
d34e912aa0
Merge "Add carrier info back to notification drawer."
2011-09-30 07:48:51 -07:00
Daniel Sandler
b032b55427
Merge "Bring back nyandroid ADB icon."
2011-09-30 07:48:43 -07:00
The Android Open Source Project
b88ce750bc
Reconcile with ics-factoryrom-release
...
Change-Id: Ia9dffe4458e064a55878e989ba73763158e008fe
2011-09-30 07:09:59 -07:00
satok
3911d4269d
Merge "Fix a logic to recconect IME in InputMethodManagerService"
2011-09-30 03:31:35 -07:00
satok
d3582d4df7
Merge "Use user's settings for the spell check language instead of the system locale"
2011-09-30 01:52:40 -07:00
Luca Zanolin
bb98d72d15
Merge "The x and y position of the pop-up where not calculated correctly when the text view had internal scrolling."
2011-09-30 01:01:35 -07:00
The Android Automerger
765d62cf9c
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-29 18:46:30 -07:00
Mathias Agopian
271c778621
am 5d9a4f33: Merge "improve hwc log output" into ics-factoryrom
...
* commit '5d9a4f33d3f1fcce55b686597d370d749b5c5c0d':
improve hwc log output
2011-09-29 18:37:44 -07:00
Mathias Agopian
f940a3b4c1
Merge "improve hwc log output" into ics-factoryrom
2011-09-29 18:34:22 -07:00
Mathias Agopian
7bc371924e
improve hwc log output
...
we now print the handle of each buffer
Change-Id: I4104cd6d3a0a303baf44c5c69de3bf36c237892e
2011-09-29 18:12:20 -07:00
Mathias Agopian
8351f535cb
Merge "improve hwc log output"
2011-09-29 18:09:35 -07:00
Mathias Agopian
aebac5f34a
improve hwc log output
...
we now print the handle of each buffer
Change-Id: I70884ae458a9dcf10cfc403258d48eaa4618b7f4
2011-09-29 18:07:08 -07:00
Svetoslav Ganov
7e3b038f65
Merge "ActivityChooserView shows "see all" improperly."
2011-09-29 17:54:22 -07:00
Fabrice Di Meglio
1732540356
Merge "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"
2011-09-29 17:53:09 -07:00
Christopher Tate
dbc714f93e
Merge "Enforce DUMP permission on BackupManagerService's dump() method"
2011-09-29 17:28:29 -07:00
Romain Guy
e01ca3e4ab
Merge "TextureView works best when it draws stuff. Bug #5391188 "
2011-09-29 17:23:52 -07:00
Amith Yamasani
4a417f6499
Merge "Handle the case of Preference lists that have header views inserted at the top."
2011-09-29 16:48:55 -07:00
Romain Guy
7995850e14
Merge "Add system property to force hw acceleration."
2011-09-29 16:39:16 -07:00
Mangesh Ghiware
ce82988348
Merge "Force a WebView pictureset reset on screen rotation."
2011-09-29 15:57:51 -07:00
The Android Automerger
02b9ba3607
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-29 15:21:22 -07:00
Philip Milne
24cfe8d400
Merge "Fix for 5393156"
2011-09-29 15:01:27 -07:00
Kenny Root
75af8237e1
Merge "Add package-verifier to aapt dump badging"
2011-09-29 15:00:42 -07:00
The Android Open Source Project
1d4a293b9d
Reconcile with ics-factoryrom-release
...
Change-Id: Iec5fbc58aa0d892e8fe3767aad9de7726ec0aa12
2011-09-29 14:24:50 -07:00
Roman Nurik
775bdf08ce
Merge "Add 'updated' banner in guide TOC for media formats, rename Widgets design guide to App Widgets design guide"
2011-09-29 14:10:07 -07:00
