Dianne Hackborn
16624bd4fe
Merge "Add mechanism for Parcel to not allow FDs to be written to it."
2011-10-03 17:13:54 -07:00
Justin Ho
eb53548f9a
Resolve conflicts for merge 121e805a to master
...
Conflicts:
CleanSpec.mk
Change-Id: I750218dbd78e15c1ae3324b3bcfbcd28a4da2676
2011-10-03 17:06:26 -07:00
Dianne Hackborn
8938ed2c8e
Add mechanism for Parcel to not allow FDs to be written to it.
...
This is to help implement issue #5224703 .
Change-Id: I026a5890495537d15b57fe61227a640aac806d46
2011-10-03 16:58:41 -07:00
Adam Powell
a030b2ba7c
Merge "Don't obtain attributes for the whole theme when looking for selection mode drawables."
2011-10-03 16:57:05 -07:00
Justin Ho
e7bbe54012
Merge "Adding additional variety to sound set 7" into ics-factoryrom
2011-10-03 16:49:58 -07:00
Scott Main
c407be6ef8
Merge "docs: remove gerunds from UI dev guides and resolve linkbacks"
2011-10-03 16:06:47 -07:00
Scott Main
741a3cc86d
Merge "docs: fix a bug in the search results in which clicking a sorting tab does not open that tab until you click a tab again. This occured due to the order of events being out of order in terms of when we invoke the click() on a tab based on the search being invoked. I'm pretty sure this worked fine before, so I think this might have been introduced by a behavior change in CSE. The fix is to simply invoke the click() for a tab when the respective search results actually return using an additional callback."
2011-10-03 15:44:50 -07:00
Justin Ho
6c3613a559
Merge "allow override of HDMI rotation"
2011-10-03 15:32:14 -07:00
John Reck
459d518d35
Merge "Hardware accelerated button focus rings"
2011-10-03 15:01:10 -07:00
Irfan Sheriff
d6f3f2439c
Merge "Remember wifi disable due to airplane"
2011-10-03 13:53:42 -07:00
Adam Powell
e035a0fd29
Merge "Fix bugs around overlay action modes."
2011-10-03 13:32:47 -07:00
Gilles Debunne
d6506eb738
Merge "Bug 5327547: re-check word after it (may) have been added to user dictionary."
2011-10-03 12:58:52 -07:00
Gilles Debunne
4ed5e76bcc
Merge "Bug 5384674: When only one suggestion is returned, it is displayed twice"
2011-10-03 12:58:42 -07:00
Gilles Debunne
c94887b842
Merge "New underline color for the Voice recognized suggestions"
2011-10-03 12:58:34 -07:00
Scott Main
ec8b1a3166
Merge "docs: fix wacky markup bug caused by lack of sentence terminator"
2011-10-03 12:19:55 -07:00
Svetoslav Ganov
da976c73b2
Merge "Adding accessibility support to the share UI."
2011-10-03 11:53:48 -07:00
Daniel Sandler
cf76344be5
Merge "Slightly less ugly ICS adb icons."
2011-10-03 11:30:10 -07:00
Russell Brenner
2bc2a9dc38
Merge "Center box text vertically"
2011-10-03 11:29:16 -07:00
Daniel Sandler
beae029386
Merge "Fix contentDescriptions in status bar."
2011-10-03 11:08:52 -07:00
Xavier Ducrohet
22b27f006b
am 6c465bbe: (-s ours) Cherry-pick f1dee1 from master for SDK. do not merge.
...
* commit '6c465bbe805354dc0101d2cac1d7ce374bb336a0':
Cherry-pick f1dee1 from master for SDK. do not merge.
2011-10-03 10:43:49 -07:00
Fabrice Di Meglio
c673c03671
Merge "Fix potential issue with the TextLayoutCache with glyphs"
2011-10-03 09:56:39 -07:00
Fabrice Di Meglio
ffdd6d90cc
Merge "Improve TextLayoutCache performances a bit"
2011-10-03 09:56:32 -07:00
Xavier Ducrohet
6aaf8f2a14
Merge "Layoutlib: add support for ITextServicesManager."
2011-10-03 09:11:23 -07:00
Teng-Hui Zhu
41d0ebb784
am 2842ca8a: am bcb14ce1: (-s ours) Compiling issue fix since SurfTex header changed.
...
* commit '2842ca8ac63ad5e7b6a6eb89285d14db424c2bab':
Compiling issue fix since SurfTex header changed.
2011-10-01 12:05:59 -07:00
Teng-Hui Zhu
9caddc886c
am bcb14ce1: (-s ours) Compiling issue fix since SurfTex header changed.
...
* commit 'bcb14ce1fc06ba7161e7e30420264dd0f2ad8433':
Compiling issue fix since SurfTex header changed.
2011-10-01 12:01:46 -07:00
Michael Jurka
ea5158621f
Merge "Fixing accessibility support in Recent Apps"
2011-09-30 19:46:58 -07:00
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