64731 Commits

Author SHA1 Message Date
Gilles Debunne
b52c6a1aaf am b2aa672f: Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1
* commit 'b2aa672f24ea0d746f3b96c24e376d5e2c041dc3':
  Revert "IME action (done, next...) correctly handled"
2011-12-01 10:23:58 -08:00
Gilles Debunne
0433c15714 Merge "TextViews keep focus after Done" into ics-mr1 2011-12-01 10:22:15 -08:00
Gilles Debunne
b2aa672f24 Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1 2011-12-01 10:21:59 -08:00
Andreas Huber
a1b97a8a4e am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1
* commit '2c2ed7bef931f43dc0701ab723beb0cbed2cb630':
  Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
2011-12-01 10:19:52 -08:00
Andreas Huber
2c2ed7bef9 Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1 2011-12-01 10:18:19 -08:00
Andreas Huber
1fc2e60d59 Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
Change-Id: I587a5ce259b04c973ed2d7614e874cb74c521aab
related-to-bug: 5696324
2011-12-01 10:02:37 -08:00
Robert Greenwalt
854191d513 am 22d5d7b6: Merge "Fix state synchronization problem." into ics-mr1
* commit '22d5d7b6e865e36eb3e057bc27d339d56c292d20':
  Fix state synchronization problem.
2011-12-01 09:43:58 -08:00
Hong Teng
63149c81ad Fixd for 5490443 Native crash while exporting a video
- Add new onError callback to PreviewProgressListener, which is
used to indicate video editor application for the error that has occurred during
priviewing.
With this modification, the application must implement the onError method,
and then VideoEditorPreviewTest.java is changed accordingly.

Change-Id: I15610b8907fcf8bd35a3c69ad7c07b5175a6e309
2011-12-01 09:43:42 -08:00
Robert Greenwalt
22d5d7b6e8 Merge "Fix state synchronization problem." into ics-mr1 2011-12-01 09:42:13 -08:00
Gilles Debunne
64901d4eb0 Better handles' visibility test
Checking if the hotspot position is visible instead
of checking if it is part of the clipped visible rectangle.

Bug 5638710

Patch set 2: synchronize static variables you will.
Patch set 3: renaming and refactored the while loop.
Patch set 4: synchronize you will (again)
Patch set 5: parent

Change-Id: I330510f491c85f910fc61598936113ad07d304e4
2011-12-01 09:09:09 -08:00
Kenny Root
ad757e9b36 Fix free_cache to actually work
This broke with some other path-related changes, so it was scanning for
/data/*/cache instead of /data/data/*/cache

Also remove redundant call to restat

Bug: 5686310
Change-Id: Id1661f0f1337858fc9ead53c56ab7557f421c591
2011-12-01 09:07:55 -08:00
Ben Murdoch
7743717f3e am 90ea4c4d: Merge "Fix crash with HTML5 video." into ics-mr1
* commit '90ea4c4d30ccafb51e024ab3c34a4655d06eec4c':
  Fix crash with HTML5 video.
2011-12-01 09:06:34 -08:00
Ben Murdoch
90ea4c4d30 Merge "Fix crash with HTML5 video." into ics-mr1 2011-12-01 09:03:22 -08:00
Daniel Sandler
c0fc5d81b8 am 2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1
* commit '2a40d0d92b208021b492e9af3d944720cbf269fc':
  Put screensavers back in the icebox for now. DO NOT MERGE.
2011-12-01 06:31:12 -08:00
Daniel Sandler
2a40d0d92b Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1 2011-12-01 06:29:53 -08:00
Ben Murdoch
d3f18b805e Fix crash with HTML5 video.
Add missing check for native HTTP stack inside
CookieManager.getCookie(WebAddress) and
CookieManager.setCookie(WebAddress) - private APIs that now
will throw an exception as the legacy cookie table no longer
exists with WebViewDatabase version 11.

Bug: 5690908
Change-Id: I51ae848d03b04d6021d314dda4a199675e38ab02
2011-12-01 13:43:41 +00:00
Bart Sears
514e4e2158 am 41a5774a: Merge "fix position of WebTextView on scrolling layers" into ics-mr1
* commit '41a5774a99215025628b83db54c45f84b876678e':
  fix position of WebTextView on scrolling layers
2011-11-30 22:30:35 -08:00
Bart Sears
41a5774a99 Merge "fix position of WebTextView on scrolling layers" into ics-mr1 2011-11-30 22:29:16 -08:00
Adam Cohen
585ef19a4d am 557a1772: Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357)" into ics-mr1
* commit '557a1772f676480da75fff81ff38d6e896fce0a2':
  Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357)
2011-11-30 21:13:55 -08:00
Adam Cohen
557a1772f6 Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357)" into ics-mr1 2011-11-30 21:10:27 -08:00
Dianne Hackborn
aaddc3b359 am a1240184: Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1
* commit 'a1240184efd1d4391540a6e3e9cae50d56d05cb2':
  Fix issue #5433192 and maybe #5433192
2011-11-30 20:51:00 -08:00
Dianne Hackborn
a1240184ef Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1 2011-11-30 20:49:21 -08:00
Dianne Hackborn
e0f085d4b8 Fix issue #5433192 and maybe #5433192
5433192: Factory reset device: compatibility screen is the first...
...screen before setup wizard

Don't show compat mode dialog if compat mode is unknown (which happens
early in boot before an activity is shown for example).  Also make sure
to update status any time the current focus app token changes, so we
correctly update every time switching apps.

5651152 [Stingray] change zoom/strech setting icon won't go away

This is probably also fixed by updating when the app token changes.

Change-Id: Ibe9bd6277166230d5d96689741b78325ea099d57
2011-11-30 18:41:15 -08:00
satok
eaf9507271 am b94a7fb3: Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1
* commit 'b94a7fb3d7483e8b47e4f0229fc7abff10a6572d':
  Fix ConcurrentModificationException in TextServicesManagerService
2011-11-30 17:39:26 -08:00
satok
b94a7fb3d7 Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1 2011-11-30 17:37:52 -08:00
Winson Chung
7cef80fd39 Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357)
Change-Id: Ide1822e19045f093c0c1c088839caa5cc8aea287
2011-11-30 17:34:25 -08:00
Eric Laurent
6bc7f2cd30 AudioService: strengthen A2DP device detection
If the intent BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED is broadcast
before AudioService is started, The A2DP device connection is never detected
by the audio framework resulting in audio not being routed to A2DP unless the device
is rebooted or the A2DP headset reconnected.

Make sure that A2DP device connection state is sampled when
boot completed event is received.

Issue 5665159

Change-Id: I04d82020afc00af28c5ea0bb9879ed55bcc9b6f3
2011-11-30 17:08:44 -08:00
Svetoslav Ganov
1c45ac8a1c am d8ec8db5: Merge "Fixing memory leaks in the accessiiblity layer." into ics-mr1
* commit 'd8ec8db5e0f227e4f63e948acb78d829f5ad30c8':
  Fixing memory leaks in the accessiiblity layer.
2011-11-30 16:59:11 -08:00
Svetoslav Ganov
d8ec8db5e0 Merge "Fixing memory leaks in the accessiiblity layer." into ics-mr1 2011-11-30 16:56:41 -08:00
Michael Kolb
5da91bd674 fix position of WebTextView on scrolling layers
Bug: 5677828

    depends on CL: 152845

Change-Id: Ia6fce3ef64954d99fe044e801d7f083055c8b880
2011-11-30 16:15:18 -08:00
Gilles Debunne
647944897f TextViews keep focus after Done
Otherwise the ViewRoot tries to focus something else and as a result
it will scroll back to the top of a form with many fields, which is
annoying.

Change-Id: I1de10f76fe4b82bc4097fc13c629450d6f999fd0
2011-11-30 15:45:30 -08:00
Gilles Debunne
8bfcd133a2 Revert "IME action (done, next...) correctly handled"
This reverts commit efbad5fb90fe990d42bf30c63e42558bd9bdb5d8.
2011-11-30 15:40:28 -08:00
Amith Yamasani
2b0acc90ae No clicking on volume icon in volume dialog.
Don't disable volume slider when it hits zero.
Show correct icon for Silent mode in Power menu.

Bug: 5586083
Change-Id: Iaa957fc08e314e0de1c007dfc967a1d960080aab
2011-11-30 15:28:43 -08:00
Robert Greenwalt
645c80654f Fix state synchronization problem.
Don't report that we're disconnected immediately if we're disconnecting when another
disconnect comes in.  Remove this behavior from the default handler and add a catch
all "yeah, we're disconnected already" to the inactive state.

bug:5568633
Change-Id: Iff7ccde2069b47f8ad8255f3bca0292b80041388
2011-11-30 15:07:30 -08:00
Dianne Hackborn
bf30ac71a9 am 88f10c6c: Merge "Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1
* commit '88f10c6ce5a97b1990934148deb8ed6aa6ef7a48':
  Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?
2011-11-30 14:15:55 -08:00
Dianne Hackborn
3d11e09ef4 am f8d20bd6: Merge "Turn off debug log." into ics-mr1
* commit 'f8d20bd6495883e98e23827a2e5ed03766fe483b':
  Turn off debug log.
2011-11-30 14:13:28 -08:00
Dianne Hackborn
88f10c6ce5 Merge "Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1 2011-11-30 14:12:44 -08:00
Dianne Hackborn
f8d20bd649 Merge "Turn off debug log." into ics-mr1 2011-11-30 14:11:17 -08:00
Romain Guy
469c79b0bb am 7797cae2: Merge "Cache drawable constant states instead of drawables Bug #5678369" into ics-mr1
* commit '7797cae2564eccf6d817b06d8116bd9cdc8e9ed4':
  Cache drawable constant states instead of drawables Bug #5678369
2011-11-30 14:09:47 -08:00
Romain Guy
7797cae256 Merge "Cache drawable constant states instead of drawables Bug #5678369" into ics-mr1 2011-11-30 14:07:34 -08:00
Mathias Agopian
9440f3ee3c am e8ba2aba: Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1
* commit 'e8ba2aba934e3767d2081007bba93bad68566d22':
  add a way to access the version string of the h/w implementation of EGL
2011-11-30 13:54:16 -08:00
Mathias Agopian
e8ba2aba93 Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1 2011-11-30 13:52:21 -08:00
Daniel Sandler
d2b22a885a Put screensavers back in the icebox for now. DO NOT MERGE.
Bug: 5689684
Change-Id: I3a5291c3520bb43e35d55714f1522e4ae7f6e63c
2011-11-30 15:47:36 -05:00
Daniel Sandler
7e6f42945b am 865b9802: Merge "Expanding NotificationManager\'s event logging." into ics-mr1
* commit '865b98024fb5fa21854feb578b8816bbb72120ba':
  Expanding NotificationManager's event logging.
2011-11-30 11:55:53 -08:00
Daniel Sandler
865b98024f Merge "Expanding NotificationManager's event logging." into ics-mr1 2011-11-30 11:54:17 -08:00
Jeff Sharkey
6d8edf0c10 am 47e4015b: Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1
* commit '47e4015ba23c507196980dcb4a311afc7e2358b1':
  Avoid airplane mode labels when Wi-Fi enabled.
2011-11-30 11:46:31 -08:00
Jeff Sharkey
47e4015ba2 Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1 2011-11-30 11:44:54 -08:00
Dianne Hackborn
bbb09aceb6 Turn off debug log.
Change-Id: I1d4612133580d493d81d0b15752e009202e95ce0
2011-11-30 11:40:40 -08:00
Dianne Hackborn
1fbee79eb3 Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?
Calls to get the display size no longer need to acquire the global
window lock.

Change-Id: I751ea6ed0e20f1f521783f4bd5a8f9c31cd43573
2011-11-30 11:29:58 -08:00
Jeff Sharkey
ec9cc1bcc8 Avoid airplane mode labels when Wi-Fi enabled.
When refreshing network views, avoid setting airplane mode icon and
labels when connected to Wi-Fi network.

Bug: 5262367
Change-Id: Ib831ce06bab67fffcc14a8c3b1ba9e437a74761d
2011-11-30 11:20:40 -08:00