Fabrice Di Meglio
e3675a334b
Merge "Fix bug #3388534 Long file names are improperly displayed when played"
2011-08-15 18:40:34 -07:00
Jeff Brown
a4e22480d7
Merge "Find next focus id from inside-out. Bug: 5165543"
2011-08-15 18:21:54 -07:00
Jeff Sharkey
3ba60f4461
Merge "Adjust holo tabs to match spec."
2011-08-15 18:17:43 -07:00
Romain Guy
93963bde30
Merge "Fix synchronization issue in ArrayAdapter External bug #19235 "
2011-08-15 18:15:22 -07:00
Adam Powell
53ff168e16
Merge "Fix bug 5049406 - ActionBar UP with no home icon, tap highlight looks broken"
2011-08-15 18:09:47 -07:00
Matthew Xie
7f20de3236
Merge "Change prepare bluetooth timeout from 7 seconds to 10 seconds"
2011-08-15 18:01:57 -07:00
Eric Laurent
9a6cf5d9d7
Merge "Fix issue 5131056: key beeps when screen is locked"
2011-08-15 18:01:37 -07:00
Jaikumar Ganesh
cbc58452d8
Merge "Add utility functions for pause and tonewait pause."
2011-08-15 17:33:21 -07:00
Jaikumar Ganesh
dfae44030c
Merge "Fix stuck in pairing when BT is turned off."
2011-08-15 17:33:12 -07:00
Jean-Michel Trivi
9a62aaaabf
Merge "Bug 5045498 javadoc for the remote control client API"
2011-08-15 17:14:04 -07:00
Jean-Michel Trivi
91e7b14365
Merge "Bug 5045498 Send media button event receiver to remote control"
2011-08-15 17:12:33 -07:00
Mathias Agopian
ddc864e6be
Merge "have the sensorsevice test print the delay of the first received event"
2011-08-15 17:11:49 -07:00
Adam Powell
08935c6ed6
Merge "Fix bug 5165223 Fix Holo Spinner item/dropdown alignment."
2011-08-15 17:05:42 -07:00
Eric Laurent
d16e88b229
Merge "Deprecate use of some audio effects on output mix."
2011-08-15 15:49:55 -07:00
Mathias Agopian
579c90b3d2
Merge changes I4d4580e8,I47b21293,I0767ac2a
...
* changes:
fix test-opengl-swapinterval
revert last change to EGLUtils::selectConfigForPixelFormat
boot animation doesn't use EGLUtils anymore
2011-08-15 15:44:33 -07:00
Mathias Agopian
7dddeac971
fix test-opengl-swapinterval
...
EGLConfig selection should now work on any device
Change-Id: I4d4580e891d1faf817fa853838406fb49d12e50a
2011-08-15 15:25:40 -07:00
Mathias Agopian
f9606df42b
revert last change to EGLUtils::selectConfigForPixelFormat
...
EGLUtils::selectConfigForPixelFormat is only used by
command line tests and it simply selects a config
based on the EGL_NATIVE_VISUAL_ID.
2011-08-15 15:25:39 -07:00
Eric Fischer
97f8767ebe
Merge "Import revised translations."
2011-08-15 13:22:31 -07:00
Kenny Root
e010f5d0a6
Merge "Fix external size calculations"
2011-08-15 13:20:34 -07:00
Jeff Brown
abb769a8dc
Merge "Fix blocked event handling in InputDispatcher. Bug: 5161854"
2011-08-15 13:09:08 -07:00
Robert Ly
a1c5953cc4
Merge "docs: fix for bug 5057581"
2011-08-15 12:16:41 -07:00
Matthew Xie
0998f5b28d
Merge "Implement switchConnectable with Powered property setting instead of scan modes"
2011-08-15 11:49:31 -07:00
Bart Sears
6524ecec3c
Merge "Fix xml coding style (turn tabs to spaces)"
2011-08-15 11:43:40 -07:00
Daniel Lehmann
7ad6322540
Merge "Renaming com.google.i18n.phonenumbers to com.android.i18n.phonenumbers to avoid name collision."
2011-08-15 11:39:58 -07:00
Amith Yamasani
29c70bca6d
Merge "Revert "Use a weakreference to prevent the static variable from holding an Activity." Bug was fixed in a different way."
2011-08-15 11:14:19 -07:00
Tom Taylor
cbf6d5e4c0
Merge "Add private permission for sending SMS via Messaging app"
2011-08-15 10:59:30 -07:00
Adam Powell
b4b6400e7f
Merge "Fix bug 5159596 - Slider grabs touch point when trying to scroll a list"
2011-08-15 10:29:10 -07:00
Eric Fischer
f471c29794
Merge "Move date format strings to donottranslate.xml and add locale overrides."
2011-08-15 10:24:49 -07:00
Claudia de Veaux
1346ba61e3
Merge "Edit to APN read/write APN Settings permissions. Bug: 5145868"
2011-08-15 10:24:19 -07:00
Gilles Debunne
d7ec85947d
Merge "Text suggestions are enabled for a subset of input types"
2011-08-15 10:07:59 -07:00
Jeff Sharkey
9dce7554d1
Merge "Change Preferences padding to match UI spec."
2011-08-14 21:18:02 -07:00
Jeff Brown
c126125bf4
Merge "Use PARCELABLE_WIRTE_RETURN_VALUE flag in InputChannel. Bug: 5161290"
2011-08-14 20:13:19 -07:00
Adam Powell
9f19e423c5
Merge "Fix bug 4981687 - WiFi connection dialog should dismiss when tapped outside."
2011-08-14 17:38:27 -07:00
Adam Powell
2ee067737b
Merge "Fix bug 5154361 - New force close dialog text breaks button order rules"
2011-08-14 17:23:29 -07:00
Adam Powell
90ff7a3bed
Merge "Fix bug 5159736 - Make DeviceDefault the default"
2011-08-14 16:57:45 -07:00
Jean-Michel Trivi
7fe957332f
Merge "Fail request for audio focus when linkToDeath fails"
2011-08-14 16:12:09 -07:00
Daniel Lehmann
db22472d9c
Merge "Several API changes as requested by ES:"
2011-08-14 16:01:59 -07:00
Mike Lockwood
e0f85f3000
Merge "MediaScanner: Clear file path before deleting records to avoid accidental file deletions"
2011-08-14 14:39:12 -07:00
Jean-Michel Trivi
d4ac7e99a1
Merge "Fix leak of global references and AudioFocusDeathHandler objects."
2011-08-14 14:24:09 -07:00
Adam Powell
32ce5e85e4
Merge "Fix bug 5078498 - Icons jump around on split action bar"
2011-08-12 23:36:20 -07:00
Wink Saville
6dc0316d14
Merge "Update sim_removed_message string."
2011-08-12 23:22:08 -07:00
Romain Guy
4150aca8e4
Merge "<blink/> is not an acceptable default behavior. Bug #5156334 "
2011-08-12 19:39:20 -07:00
Dianne Hackborn
1c15b5dbdd
Merge "Turn off hinting by default for higher density displays."
2011-08-12 19:17:09 -07:00
Eric Laurent
30169dd70d
Merge "Issue 5081351: isWiredHeadsetOn() permission."
2011-08-12 18:48:35 -07:00
Amith Yamasani
38dd8f2720
Merge "Use a weakreference to prevent the static variable from holding an Activity."
2011-08-12 18:35:50 -07:00
Mathias Agopian
d5f6a19e72
Merge "fix an orientation change drawing artifact."
2011-08-12 17:13:01 -07:00
Mathias Agopian
c5953904ad
fix an orientation change drawing artifact.
...
a wrong orientation would be briefly shown when
rotation the screen. this happened when the window manager
set a custom transformation and the h/w composer was used.
the custom transformation was applied twice in that case.
Bug: 5037522
Change-Id: Ic1f87b63cd843f4475e4265d1624463825d775c4
2011-08-12 17:09:09 -07:00
James Dong
1238d1663b
Merge "If release has been called before finalize, do not expect MediaPlayer still exists"
2011-08-12 16:41:56 -07:00
Conley Owens
38f60b29f5
am e5cb629f: Merge "Add missing include" include exists
...
* commit 'e5cb629f3761b272ea52104c1093e0007f5c41b5':
Add missing include
2011-08-12 16:27:01 -07:00
Amith Yamasani
887947c36e
am 648dc03c: am 4dbd1bc6: am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"
...
* commit '648dc03cd038a726b25929f9ffc142eb16e891e8':
VolumePreference.onActivityStop only stops playback
2011-08-12 16:26:57 -07:00
