Andreas Huber
8c737e7e65
am d109a7d4: Merge "We were accidentally sending out an output buffer before the final port settings change"
...
* commit 'd109a7d428cfb6f2f8f504ea9a2b3185a2b46283':
We were accidentally sending out an output buffer before the final port settings change
2011-08-23 10:35:27 -07:00
Andreas Huber
d109a7d428
Merge "We were accidentally sending out an output buffer before the final port settings change"
2011-08-23 10:32:35 -07:00
Andreas Huber
887b7295da
We were accidentally sending out an output buffer before the final port settings change
...
Change-Id: I4de0d3c377bb12e59524ed370ab3ed0b9a9b70a6
related-to-bug: 5122512
2011-08-23 10:22:49 -07:00
Eric Laurent
7db340cd9e
am cf56f1e7: Merge "Revert "Change condition to enter silent mode.""
...
* commit 'cf56f1e7ad7586831faa5bacb537f71cdb227e61':
Revert "Change condition to enter silent mode."
2011-08-23 08:46:46 -07:00
Eric Laurent
c910571438
am b1d6e76a: Merge "AudioFlinger: add check for audio HAL init failure"
...
* commit 'b1d6e76af75f705a6165cf69a13365828fc6354a':
AudioFlinger: add check for audio HAL init failure
2011-08-23 08:44:55 -07:00
Eric Laurent
cf56f1e7ad
Merge "Revert "Change condition to enter silent mode.""
2011-08-23 08:44:13 -07:00
Eric Laurent
b1d6e76af7
Merge "AudioFlinger: add check for audio HAL init failure"
2011-08-23 08:42:59 -07:00
Eric Laurent
73a56fe477
Revert "Change condition to enter silent mode."
...
This reverts commit c11c3ae4dd5d4054e5b44a7bdfe6b203bdb69976.
2011-08-23 08:27:41 -07:00
Eric Laurent
8b4dbf7ff5
AudioFlinger: add check for audio HAL init failure
...
Do not call audio HAL functions on the primary HW interface
if it could not be initialized properly.
Change-Id: If54059c8fd188d6c1686f9e0439994fe9411478a
2011-08-23 08:25:03 -07:00
Narayan Kamath
da3dda2589
am a7785806: Merge "Framework changes to support new TTS settings features."
...
* commit 'a77858066843182c91272c3e25c7eec10579eb93':
Framework changes to support new TTS settings features.
2011-08-23 03:30:58 -07:00
Narayan Kamath
a778580668
Merge "Framework changes to support new TTS settings features."
2011-08-23 03:28:04 -07:00
Narayan Kamath
e5b8c4dfc7
Framework changes to support new TTS settings features.
...
Locale is now stored per engine, instead of as a global
option.
bug:5149036
Change-Id: I9848172623fe8aea1dd8e6678bca008da6a4cfb1
2011-08-23 10:20:42 +01:00
Chih-Chung Chang
daf309d30b
am 9c8caeff: Merge "Pass correct indices for thumbnails of MediaImageItem."
...
* commit '9c8caeff6662e3a3e0d2f3df06000a743c3793db':
Pass correct indices for thumbnails of MediaImageItem.
2011-08-23 01:20:38 -07:00
Chih-Chung Chang
9c8caeff66
Merge "Pass correct indices for thumbnails of MediaImageItem."
2011-08-23 01:17:09 -07:00
Chih-Chung Chang
f1824a9762
Pass correct indices for thumbnails of MediaImageItem.
...
Change-Id: I8e52014ab76c63994385bc54106c19b425be8550
2011-08-23 16:00:28 +08:00
Wu-cheng Li
1bd38c4136
am a46c372a: Merge "Make camera FOCUS_MODE_CONTINUOUS_PICTURE public."
...
* commit 'a46c372a75972dbfe73b1813d69fa047c3454b83':
Make camera FOCUS_MODE_CONTINUOUS_PICTURE public.
2011-08-23 00:06:01 -07:00
Wu-cheng Li
a46c372a75
Merge "Make camera FOCUS_MODE_CONTINUOUS_PICTURE public."
2011-08-23 00:05:00 -07:00
Mathias Agopian
f1162f10e7
am 7f76a3cf: fix "show screen update" debug option.
...
* commit '7f76a3cf667b95caccb3e6d3f5cf160180717340':
fix "show screen update" debug option.
2011-08-22 21:48:13 -07:00
Mathias Agopian
7f76a3cf66
fix "show screen update" debug option.
...
Change-Id: I7d8b24124768b5f7d59d3bb0b019e9baaa0dfc4f
NOTE: from now on, this also disable the h/w composer
2011-08-22 21:44:41 -07:00
Mathias Agopian
6b27a8f38b
am 67403e09: BLUR_BEHIND flag is not supported anymore
...
* commit '67403e096e6f59b7cd18a90d0d3f5c3d17c31407':
BLUR_BEHIND flag is not supported anymore
2011-08-22 20:07:40 -07:00
Mathias Agopian
67403e096e
BLUR_BEHIND flag is not supported anymore
...
Bug: 5185650
Change-Id: I56541d4967b90b150a734be1bbeff696eb6a4fb3
2011-08-22 20:03:58 -07:00
Matthew Xie
d96daf1ae5
Set bluetooth discoverable off at power on time if the timeout is no forever
...
Set bluetooth discoverable off at power on time if the discoverable timeout
is no forever
bug 5068151
Change-Id: I413e8de5f49030b741a8b84a566065d112ee60be
2011-08-22 19:45:48 -07:00
Jaikumar Ganesh
598c90dbd2
am 04c43012: Merge "Fix sendConnection State intent api params."
...
* commit '04c4301251b9feff743fa92f3b7290b8dc32ebd9':
Fix sendConnection State intent api params.
2011-08-22 19:31:16 -07:00
Jaikumar Ganesh
04c4301251
Merge "Fix sendConnection State intent api params."
2011-08-22 19:29:57 -07:00
Jaikumar Ganesh
ef4f8f2c08
Fix sendConnection State intent api params.
...
Reported by: sj222.choi@samsung.com
Change-Id: I2e767b372bd5d9fa42d083a37e402a013388a3c2
2011-08-22 18:18:24 -07:00
Adam Powell
c38457907a
am e20c279d: Merge "Fix bug 5198868 - Showing previous hidden options menu doesn\'t work"
...
* commit 'e20c279d9a6719a7c0d8c6606c7ba1bd207db8d3':
Fix bug 5198868 - Showing previous hidden options menu doesn't work
2011-08-22 18:17:58 -07:00
Adam Powell
e20c279d9a
Merge "Fix bug 5198868 - Showing previous hidden options menu doesn't work"
2011-08-22 18:15:18 -07:00
Adam Powell
04dc06f52a
Fix bug 5198868 - Showing previous hidden options menu doesn't work
...
Fix bad assumption in flagging action items.
Change-Id: Ic67b56195bc308e73d1564cbf1b77e41eaa4ecab
2011-08-22 18:11:11 -07:00
Adam Powell
c4f68f1a17
am 76a05fef: Merge "Fix bug 5143392 - Add padding to left of action bar app icon to prevent icon from moving when drilling into hierarchy"
...
* commit '76a05fefbd401b386cd8ae264037bc3c8219bb0a':
Fix bug 5143392 - Add padding to left of action bar app icon to prevent icon from moving when drilling into hierarchy
2011-08-22 17:54:35 -07:00
Adam Powell
76a05fefbd
Merge "Fix bug 5143392 - Add padding to left of action bar app icon to prevent icon from moving when drilling into hierarchy"
2011-08-22 17:52:46 -07:00
Adam Powell
b1e2f25b7e
Fix bug 5143392 - Add padding to left of action bar app icon to
...
prevent icon from moving when drilling into hierarchy
Fix up the layout of home/up/titles in the action bar such that showing/hiding
the "up" indicator never changes the position of the icon, logo, or title.
Change-Id: Ic2117babe3a54619a4b787d5374295955a58fb34
2011-08-22 17:43:30 -07:00
Romain Guy
07d67ef379
am c4eb3160: Merge "Don\'t use bilinear filtering on unscaled bitmaps Bug #5198590 "
...
* commit 'c4eb316062b64bb15532765f780a96d2aa85eeff':
Don't use bilinear filtering on unscaled bitmaps Bug #5198590
2011-08-22 17:37:54 -07:00
Romain Guy
c4eb316062
Merge "Don't use bilinear filtering on unscaled bitmaps Bug #5198590 "
2011-08-22 17:34:23 -07:00
Romain Guy
6816972eb6
Don't use bilinear filtering on unscaled bitmaps
...
Bug #5198590
Change-Id: I4333d850501ac849eeeeb247e4178dd469b9de3d
2011-08-22 17:33:33 -07:00
Adam Powell
fd1f85f47c
am dce2ff86: Merge "Fix bug 5185375 - ICS Fit+Finish: Full-screen IME"
...
* commit 'dce2ff8681c97658b1b520fd9cc244ef7a603664':
Fix bug 5185375 - ICS Fit+Finish: Full-screen IME
2011-08-22 17:09:50 -07:00
Adam Powell
bf28cef2e1
am 0ddc899d: Merge "Fix bug 5189070 - Don\'t try to show overflow popups for nonexistant menus"
...
* commit '0ddc899dc5f2acebb1daa19369dbfe81d257690d':
Fix bug 5189070 - Don't try to show overflow popups for nonexistant menus
2011-08-22 17:06:41 -07:00
Fabrice Di Meglio
f51ff04f19
am c2d256b4: Merge "Improve TextDirection resolution"
...
* commit 'c2d256b41587ff44efb6373885affe02e5df80b5':
Improve TextDirection resolution
2011-08-22 17:06:35 -07:00
Michael Jurka
25ceca4ad5
am 04963769: Merge "Track motion events before we decide to start scrolling"
...
* commit '04963769e36a389f96a25712dd0bd0de570b4df8':
Track motion events before we decide to start scrolling
2011-08-22 17:06:29 -07:00
Dianne Hackborn
749945720c
am bcdb3e73: Merge "Debugging for issue #5180240 : Wallpaper continues to consume CPU when screen off"
...
* commit 'bcdb3e73787f88fe8e45413e1c898dab54212518':
Debugging for issue #5180240 : Wallpaper continues to consume CPU when screen off
2011-08-22 17:06:22 -07:00
Adam Powell
960668669f
am 77eb57fc: Merge "Fix bug 5142716 - Dialog content font size/padding is inconsistent across different applications."
...
* commit '77eb57fc7717ba286cda3ce460166b7f51001d6e':
Fix bug 5142716 - Dialog content font size/padding is inconsistent across different applications.
2011-08-22 17:06:15 -07:00
Jaikumar Ganesh
b0fa2608b7
am cbf3e595: Merge "Add Api to get profile connection state."
...
* commit 'cbf3e59590dc80101af3d73b09b9a5afc87243c3':
Add Api to get profile connection state.
2011-08-22 17:06:03 -07:00
Chet Haase
f2f55aad91
am 9af1d280: Merge "Fix invalidation bug with INVISIBLE views."
...
* commit '9af1d280829da4330755b72b539f4f863e5ff3ff':
Fix invalidation bug with INVISIBLE views.
2011-08-22 17:04:38 -07:00
Andreas Huber
71d0227800
am 5b3f07da: Merge "The MatroskaExtractor will now publish a different mime-type "video/webm" if"
...
* commit '5b3f07da20aff18a862c0a80326d640f0e872bb9':
The MatroskaExtractor will now publish a different mime-type "video/webm" if
2011-08-22 17:03:32 -07:00
Romain Guy
54d14d7bb4
am 91bd59db: Merge "Move constants to the correct header"
...
* commit '91bd59dbda75d176a79d5c42cccce0a9b0391bde':
Move constants to the correct header
2011-08-22 17:02:59 -07:00
Adam Powell
dce2ff8681
Merge "Fix bug 5185375 - ICS Fit+Finish: Full-screen IME"
2011-08-22 17:02:24 -07:00
Adam Powell
53376cb179
Fix bug 5185375 - ICS Fit+Finish: Full-screen IME
...
Have extract mode use a light theme to better match the previous behavior.
Change-Id: I7d8f78a6465fee078de03b0a77040296d130a78d
2011-08-22 16:56:08 -07:00
Jason Simmons
4fbb071fe8
resolved conflicts for merge of 661cd52e to ics-aah
...
Change-Id: I5eb4154ab969a5367e9f597595c09b5e499174d0
2011-08-22 16:39:16 -07:00
Adam Powell
0ddc899dc5
Merge "Fix bug 5189070 - Don't try to show overflow popups for nonexistant menus"
2011-08-22 16:35:44 -07:00
Adam Powell
70e9f4bd2c
Fix bug 5189070 - Don't try to show overflow popups for nonexistant menus
...
Change-Id: I9db43211cdece81063fc1d3c3324f1e166f27b0c
2011-08-22 16:31:24 -07:00
Fabrice Di Meglio
c2d256b415
Merge "Improve TextDirection resolution"
2011-08-22 16:24:43 -07:00