63896 Commits

Author SHA1 Message Date
Romain Guy
85ab135b2b am 50a66f0e: Merge "Terminate EGL when an app goes in the background" into ics-mr1
* commit '50a66f0e9c5a85a6af4a99eb66656a69eba24572':
  Terminate EGL when an app goes in the background
2011-11-11 11:49:42 -08:00
Mathias Agopian
c153fc5bb0 am de62d9cb: Merge "boot animation is dithered and scaled" into ics-mr1
* commit 'de62d9cbe00d0fcac24af9a3d89ba7a125e56eaa':
  boot animation is dithered and scaled
2011-11-11 11:49:38 -08:00
Romain Guy
50a66f0e9c Merge "Terminate EGL when an app goes in the background" into ics-mr1 2011-11-10 17:10:41 -08:00
Romain Guy
8ff6b9ebee Terminate EGL when an app goes in the background
This does not happen on high end gfx devices. This happens
only if only one EGL context is initialized in the current
process.

Change-Id: Ibd1737efdf84eef8a84108b05795440d1ae9964e
2011-11-10 16:44:49 -08:00
Mathias Agopian
de62d9cbe0 Merge "boot animation is dithered and scaled" into ics-mr1 2011-11-10 16:38:42 -08:00
Mathias Agopian
2b99e55ee3 boot animation is dithered and scaled
disable dithering which shouldn't have been enabled
in the first place because the frames are typically scaled.
we still use a 16-bits texture format to preserve memory.

Bug: 5600948
Change-Id: Ib4d6e133df4375d0d735cd4325b6e589bbc5dafe
2011-11-10 15:59:07 -08:00
Romain Guy
ed68299b99 am a3cc20ff: Merge "Initialize egl_cache with an app writeable file" into ics-mr1
* commit 'a3cc20fff073bd3ca588f1e61f0f7034aecf3ebb':
  Initialize egl_cache with an app writeable file
2011-11-10 23:04:19 +00:00
Romain Guy
a3cc20fff0 Merge "Initialize egl_cache with an app writeable file" into ics-mr1 2011-11-10 15:02:07 -08:00
Jeff Brown
71cb2044f4 am 88089ccc: Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1
* commit '88089ccc79ee7ba5f48ade9bb73a99cf05f6ec62':
  Wake on volume key when in dock. Bug: 5580373
2011-11-10 22:49:11 +00:00
Peter Ng
2a1e56867c am 15843aa5: Merge "lock pattern width spec set to max" into ics-mr1
* commit '15843aa5f66fee8eee5e634508dbf83a4e5ab55d':
  lock pattern width spec set to max
2011-11-10 22:49:10 +00:00
Peter Ng
31d8c12869 am bce7812b: Merge "Cleaning up tablet assets by deleting drawable-xlarge and large folders" into ics-mr1
* commit 'bce7812baba05e969406f8644595ef6237e16a41':
  Cleaning up tablet assets by deleting drawable-xlarge and large folders
2011-11-10 22:49:08 +00:00
Katie McCormick
5153a3c1b0 am 49654c72: am 921afe39: Doc change: new Calendar content provider doc
* commit '49654c72344610032bbff4405024fad2b30e1100':
  Doc change: new Calendar content provider doc
2011-11-10 22:49:05 +00:00
Adam Powell
6a5d96af5a am 71282a47: Merge "Fix access modifiers on ImageView overrides" into ics-mr1
* commit '71282a476ad57ec398f0a8d33cf67bfd469c8c55':
  Fix access modifiers on ImageView overrides
2011-11-10 22:49:03 +00:00
Dianne Hackborn
e5249ecbf4 am 0f70e482: Merge "Fix issue #5470311: Activity with android:configChanges defined..." into ics-mr1
* commit '0f70e482c8aa7ce9c5676b1226ff98b63fb991e7':
  Fix issue #5470311: Activity with android:configChanges defined...
2011-11-10 22:49:02 +00:00
Adam Powell
558f4f6bd4 am 67121fd7: Merge "Fix bug 5581874 - Animated drawables don\'t start as expected" into ics-mr1
* commit '67121fd7b241ceafe7339f5f154781572819f87b':
  Fix bug 5581874 - Animated drawables don't start as expected
2011-11-10 22:49:00 +00:00
Martijn Coenen
236a62302c am c5f3fd6e: Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API\'s." (DO NOT MERGE)." into ics-mr1
* commit 'c5f3fd6ef160c0f6072b14b97aa5c1d9759c682e':
  Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE).
2011-11-10 22:48:56 +00:00
Chet Haase
42d4fea25c am 41ffab86: Merge "increase the rate at which we dispatch events." into ics-mr1
* commit '41ffab86d92622679d4d2ad8307806e8099f8170':
  increase the rate at which we dispatch events.
2011-11-10 22:48:54 +00:00
Kenny Root
a6a3a6f949 am bc853c03: Merge "Close file on exception as well" into ics-mr1
* commit 'bc853c0344b2bbe6f94f425cd0fb1d2642c0fa2f':
  Close file on exception as well
2011-11-10 22:48:50 +00:00
Jeff Brown
88089ccc79 Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1 2011-11-10 14:40:48 -08:00
Jeff Brown
43150bfa93 Wake on volume key when in dock.
Bug: 5580373

Change-Id: I847fb10b48c2e5e26cabefea1d630793efc32131
2011-11-10 14:33:59 -08:00
Peter Ng
15843aa5f6 Merge "lock pattern width spec set to max" into ics-mr1 2011-11-10 14:31:09 -08:00
Jason Simmons
f0b82d61f5 resolved conflicts for merge of faa81c82 to ics-aah
Change-Id: I7464f16940058cc9b5a3dba5cb839bc67129009e
2011-11-10 14:29:46 -08:00
Peter Ng
bce7812bab Merge "Cleaning up tablet assets by deleting drawable-xlarge and large folders" into ics-mr1 2011-11-10 14:26:57 -08:00
Peter Ng
37ae1fe005 Cleaning up tablet assets by deleting drawable-xlarge and large folders
-keeping default wallpaper in xlarge-nodpi

Bug:5596158

Change-Id: I18ec8b0aa648fa95a1f6ebb4380c630f05e24ecb
2011-11-10 14:22:05 -08:00
Katie McCormick
49654c7234 am 921afe39: Doc change: new Calendar content provider doc
* commit '921afe39d6041b06c6a002b08f9dcd1561a9ae99':
  Doc change: new Calendar content provider doc
2011-11-10 22:20:37 +00:00
Romain Guy
a958265827 Initialize egl_cache with an app writeable file
Change-Id: I5dda234feab0fedd6e4179a80715ae20dee1c833
2011-11-10 14:20:10 -08:00
Adam Powell
71282a476a Merge "Fix access modifiers on ImageView overrides" into ics-mr1 2011-11-10 14:16:45 -08:00
Dianne Hackborn
0f70e482c8 Merge "Fix issue #5470311: Activity with android:configChanges defined..." into ics-mr1 2011-11-10 14:12:25 -08:00
Adam Powell
6a939ae6fd Fix access modifiers on ImageView overrides
Change-Id: I64cc10c877ac4adc4b79abcd7c7617480bd82906
2011-11-10 14:11:51 -08:00
Adam Powell
67121fd7b2 Merge "Fix bug 5581874 - Animated drawables don't start as expected" into ics-mr1 2011-11-10 13:57:24 -08:00
Martijn Coenen
c5f3fd6ef1 Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE)." into ics-mr1 2011-11-10 13:48:02 -08:00
Chet Haase
41ffab86d9 Merge "increase the rate at which we dispatch events." into ics-mr1 2011-11-10 13:44:34 -08:00
Martijn Coenen
0946fe5be3 Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE).
This reverts commit 562dfff65ac79590c0b7c50019cd3d107e8b4e0e. These API's are still used
by GMM in the version that ships with MR1, so we need them to keep Beam working for
GMM. Note that these APIs are hidden.

From version 5.13 onwards GMM will use the new API's.

Change-Id: I316a9c9b7d0052a14f6c1df70f2ed463bca61800
2011-11-10 13:22:27 -08:00
Kenny Root
bc853c0344 Merge "Close file on exception as well" into ics-mr1 2011-11-10 13:18:24 -08:00
Tom Taylor
faa81c8210 Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1 2011-11-10 13:11:16 -08:00
Eino-Ville Talvala
8d9c011eeb am c1c5d4fa: Merge "Add a sound-playing method to Camera API." into ics-mr1
* commit 'c1c5d4faa22a7d22b8225b2bbf83206698b83763':
  Add a sound-playing method to Camera API.
2011-11-10 20:08:32 +00:00
Eino-Ville Talvala
c1c5d4faa2 Merge "Add a sound-playing method to Camera API." into ics-mr1 2011-11-10 12:07:05 -08:00
Adam Powell
37419d7321 Fix bug 5581874 - Animated drawables don't start as expected
Fix a bug that caused animated drawables to not schedule properly when
a view has not yet been attached. Also make ImageViews update their
drawable visibility state properly, which will handle scheduling
concerns as ImageViews are attached and detached from their windows.

This should also fix the bug where animated notification icons in the
status bar do not animate until the posting app posts an update to the
notification.

Change-Id: I24c403182831258d1f251736e920c9efe1d38299
2011-11-10 11:35:12 -08:00
Dianne Hackborn
56b53b597f Fix issue #5470311: Activity with android:configChanges defined...
...should not be restarted when rotating screen on xoom

This was a side-effect of a previous fix to compute the screen layout
config class based on the actual space available to the application, not
the raw display size.  On a device like Xoom, the system bar causes us
to switch between LONG and NOTLONG depending on whether the system bar
is on the short or long side of the screen.

To fix this, we now compute the screen layout class the same way
"smallest width" is computed: looking at all of the possible rotations
and using the smallest of them all.  In addition to preventing the device
from toggling between long and notlong on a Xoom-like screen, this will
also avoid other possible undersireable behavior like changing screen
layout size when rotating.

This does mean that Xoom is no longer considered a long screen even when
in landscape, because it is not a long screen in portrait.

Change-Id: I85f90a16294ef5a7de94d5b9231abbc6f914fe90
2011-11-10 11:19:57 -08:00
Tom Taylor
994da2ad32 Revert "Add new secure setting for controlling Messaging notifications"
This reverts commit 03da2f00aac04e6565a02cf5a9bf6bb1ec926930.

 Committer: Tom Taylor <tomtaylor@google.com>

 On branch revertsetting
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   api/current.txt
	modified:   core/java/android/provider/Settings.java
	modified:   core/java/android/provider/Telephony.java
	modified:   packages/SettingsProvider/res/values/defaults.xml
	modified:   packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

We've decided not to disable messaging notifications with a secure setting.
Instead, all the work will be done within the messaging app itself.

Change-Id: Icde6894e76da1007b6026c8ec7dc56e488453c06
2011-11-10 11:17:38 -08:00
Katie McCormick
921afe39d6 Doc change: new Calendar content provider doc
Change-Id: I9493b6b0cd17ddf8fda07c32aed9b4fa2b8c1489
2011-11-10 10:56:34 -08:00
Mathias Agopian
39da861f9c am 785fd368: Merge "handle EINTR when calling sensor HAL\'s poll function" into ics-mr1
* commit '785fd3685a69e5b3ef9c0958dcf4ae85f818e78d':
  handle EINTR when calling sensor HAL's poll function
2011-11-10 18:35:47 +00:00
Mathias Agopian
785fd3685a Merge "handle EINTR when calling sensor HAL's poll function" into ics-mr1 2011-11-10 10:33:55 -08:00
Eino-Ville Talvala
e0cc55ac72 Add a sound-playing method to Camera API.
To allow applications with non-standard Camera use cases to use the
platform sound files and routing, add a method to play any of the
standard Camera sounds (shutter, autofocus, record start/stop) using a
background thread.

Bug: 5447107
Change-Id: I2524853a626e3ce334a7aad2f7de061d5c04abd0
2011-11-10 10:23:49 -08:00
Kenny Root
62539e9efa Close file on exception as well
Bug: 5458045
Change-Id: I4c79b9c273ff69dda292e5cc7b2b60f8db2edbd9
2011-11-10 09:40:53 -08:00
John Reck
f0d1965134 am 843e04d9: Merge "Pause drawing when not visible" into ics-mr1
* commit '843e04d977fd348ed474da1d3c6a62e7dc837444':
  Pause drawing when not visible
2011-11-10 17:22:03 +00:00
John Reck
843e04d977 Merge "Pause drawing when not visible" into ics-mr1 2011-11-10 09:19:55 -08:00
Andreas Huber
4af012a790 am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1
* commit '2375d16378e6f8b7694c5a2cd9e0622e382e6049':
  Send RTSP control connection keep-alive requests
2011-11-10 16:52:19 +00:00
Andreas Huber
ed894a5860 am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1
* commit 'b42aea5b4c7cc7b2766f80f5ceda94b324d776e5':
  Don't believe the PV decoder's lies...
2011-11-10 16:52:17 +00:00
Andreas Huber
bb2194c898 am 7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1
* commit '7c063cf9679a2ecdda5e1639cfdca3e1084019f9':
  There's no point in trying to continue to decode after an error was signalled.
2011-11-10 16:49:12 +00:00