61158 Commits

Author SHA1 Message Date
James Dong
08e42967b9 Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1 2011-11-11 01:44:06 -08:00
Svetoslav Ganov
d00e75e94d am 7b8bec28: Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0
* commit '7b8bec280f20e8a5863d8214bbc195497335eba6':
  PopupWindow dismiss() can get into a recursive loop.
2011-11-11 08:02:27 +00:00
Chet Haase
ab51626f22 am 30f03ac6: (-s ours) DO NOT MERGE. Fix leak in LayoutTransition
* commit '30f03ac650f2ffaafe9cc49942a4a8a7858dbd88':
  DO NOT MERGE. Fix leak in LayoutTransition
2011-11-11 08:02:27 +00:00
Jamie Gennis
787e2c276a am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0
* commit 'ca5c881374d051361eb5f9a191d51b5716ef2366':
  SystemUI: Disable HW acceleration for status bar
2011-11-11 08:02:26 +00:00
Svetoslav Ganov
7b8bec280f Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0 2011-11-11 00:00:02 -08:00
Jeff Sharkey
51c00a57f4 Merge "Clamp non-monotonic stats instead of dropping." into ics-mr1 2011-11-10 20:31:03 -08:00
Daniel Sandler
992e77af11 Merge "Fold WiMAX state into the mobile RSSI." into ics-mr1 2011-11-10 20:16:47 -08:00
Daniel Sandler
8b50bd8c9b Merge "Remove dedicated wimax icon to fix RSSI layout." into ics-mr1 2011-11-10 20:16:38 -08:00
Adam Powell
0ddcad0b4e Merge "Make the overridden ImageView#setVisibility remotable" into ics-mr1 2011-11-10 19:56:03 -08:00
Adam Powell
b241b4c6ab Make the overridden ImageView#setVisibility remotable
Change-Id: Idaf061ea8c2a06ec8abaf74cf865446d9092afa2
2011-11-10 19:48:23 -08:00
Adam Cohen
d562d300cd Merge "Deferring wallpaper update to improve workspace scrolling (issue 5506959)" into ics-mr1 2011-11-10 19:27:58 -08:00
John Reck
9490fe4095 Merge "Fix lastVisible/global rects" into ics-mr1 2011-11-10 17:58:27 -08:00
Jeff Sharkey
d4ef8c8fc9 Clamp non-monotonic stats instead of dropping.
When encountering non-monotonic stats rows, recover remaining data by
clamping to 0.  In particular, this avoids edge-case where persisting
threshold checks would never trigger.  Also recover when tethering
snapshots are missing.

Bug: 5600785, 5433871, 5600678
Change-Id: I1871954ce3955cc4ac8846f9841bae0066176ffe
2011-11-10 17:54:23 -08:00
Chet Haase
30f03ac650 DO NOT MERGE. Fix leak in LayoutTransition
LayoutTransition was making an incorrect assumption that there could
only be one transition animation on a child of a transitioning container.
But if multiple children are added/removed to/from that container, there would
be multiple calls to set up changing animations for each existing child
of that container. This meant that the child would have multiple, new
OnLayoutChangeListeners added to it as part of the setup process.

Meanwhile, we would cache only the latest listener in a hashmap that used
the child as a key for the listener. Then when we cleaned up the hashmap later,
we would remove only the latest listener from the child, leaving the rest there
for eternity.

The fix is to skip the setup entirely for children that already have listeners
set on them; they must, if that's the case, already have been set up and are
already listening for layout changes. Setting up the animation is redundant,
and adding another listener is a leak.

issue #5588509: memory leak in systemui

Change-Id: Ie2192593d84702be7243c18760dfdb3a027b761c
2011-11-10 17:53:31 -08:00
Martijn Coenen
99898de902 Merge "Fix NdefRecord byte-stream constructor." into ics-mr1 2011-11-10 17:40:20 -08:00
Chet Haase
692fda9da3 Merge "Fix leak in LayoutTransition" into ics-mr1 2011-11-10 17:33:31 -08:00
John Reck
9f9fac0ad2 Fix lastVisible/global rects
Bug: 5601629
 References tend to always be equal to the things they are referencing,
 use copies instead.

Change-Id: I0827878e91ef1fa6e0abe2d6499d55f4a211d890
2011-11-10 17:33:24 -08:00
Robert Greenwalt
7c9f8005e2 Merge "Fix Wimax-less build." into ics-mr1 2011-11-10 17:22:14 -08:00
Robert Greenwalt
6537b02875 Fix Wimax-less build.
A build with the wimax network type defined but wimax disabled
causes an NPE in ConnectivityService's constructor.

bug:5237167
Change-Id: I929eac217e1afa0e61346fdbc3e96a7d3ad09a54
2011-11-10 17:14:05 -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
Chet Haase
8a22e59311 Fix leak in LayoutTransition
LayoutTransition was making an incorrect assumption that there could
only be one transition animation on a child of a transitioning container.
But if multiple children are added/removed to/from that container, there would
be multiple calls to set up changing animations for each existing child
of that container. This meant that the child would have multiple, new
OnLayoutChangeListeners added to it as part of the setup process.

Meanwhile, we would cache only the latest listener in a hashmap that used
the child as a key for the listener. Then when we cleaned up the hashmap later,
we would remove only the latest listener from the child, leaving the rest there
for eternity.

The fix is to skip the setup entirely for children that already have listeners
set on them; they must, if that's the case, already have been set up and are
already listening for layout changes. Setting up the animation is redundant,
and adding another listener is a leak.

issue #5588509: memory leak in systemui

Change-Id: I2c9f312cc2bcf4f2d08ac6b5d8f8e495aa4f3597
2011-11-10 17:03:12 -08:00
Adam Cohen
041a0baba7 Deferring wallpaper update to improve workspace scrolling (issue 5506959)
-> On the Xoom, this change gets us back up to 60 fps. The
   change is really more of a workaround for the fact that we don't
   have vsync, and we ought to be able to change it back once we do.

Change-Id: I80888f18887bf5f2fed72c19641ed430ef6dbfcf
2011-11-10 16:53:26 -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
Jamie Gennis
ca5c881374 Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0 2011-11-10 16:06:12 -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
Martijn Coenen
ef565c4393 Fix NdefRecord byte-stream constructor.
Bug: 5601404
Change-Id: I30fada97487829a8b2ccc1a1e7a32837c29ddd70
2011-11-10 15:20:14 -08: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
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
Svetoslav Ganov
06f938e8aa PopupWindow dismiss() can get into a recursive loop.
1. The dismiss method in a PopupWindow is first removing the
   popup View from the WindowManager and then if the content
   View differs from the popup View the former is removed from
   the latter. Then dismiss() clears the dismissed flag so a
   subsequent call to dismiss() is a NOP. However, removing
   a View both from the WindowManager and from its parent
   ViewGroup triggers stuff wich may lead to a subsequent call
   to dismiss(). This leads to a stack overflow exception.

bug:5598944

Change-Id: I2aeeda591be3e9aa98fec1ee17ea8f0e746e6992
2011-11-10 14:31:41 -08:00
Peter Ng
15843aa5f6 Merge "lock pattern width spec set to max" into ics-mr1 2011-11-10 14:31:09 -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
c1c5d4faa2 Merge "Add a sound-playing method to Camera API." into ics-mr1 2011-11-10 12:07:05 -08:00
James Dong
77c500c9a1 Add support for retrieving location information in mp4/3gpp files
Change-Id: Ib8427704ef9ee5a4fa8fe1818c8a62d77b4ea687
related-to-bug: 5560253
2011-11-10 11:40:11 -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