19588 Commits

Author SHA1 Message Date
Eric Laurent
2e96f15d8c Merge "Fix issues 3425035 and 3423785." into honeycomb 2011-02-04 14:06:40 -08:00
Gilles Debunne
63308bd092 am a324a581: Merge "Fix for StaticLayout bug with ellipsized text" into honeycomb
* commit 'a324a5810c84596d3a4f67f81a725a0c98dfc30f':
  Fix for StaticLayout bug with ellipsized text
2011-02-04 14:02:05 -08:00
Gilles Debunne
a324a5810c Merge "Fix for StaticLayout bug with ellipsized text" into honeycomb 2011-02-04 13:59:29 -08:00
Chet Haase
5a7e828842 Fix crash when Paths are GCd in hw accelerated apps
A recent change to optimize path rendering didn't account for
the destruction of native objects by the VM finalizer. We may be
done with the Java level version before we're done with the native
structure that's used by the display list. For example, a drawing
method on a View that creates a temporary path to render into the
canvas will implicitly create a native structure that is put onto
the GL display list. That temporary path may go away, but the native
version should stick around as long as the display list does.

The fix is to refcount the original native version of the path
and only delete it when the refcoutn reaches zero (which means that
it is no longer needed by any display list). This is a similar mechanism
used for bitmaps and shaders.

Change-Id: I4de1047415066d425d1c689aa60827f97729b470
2011-02-04 12:50:55 -08:00
Eric Laurent
402f7f2963 Fix issues 3425035 and 3423785.
- Make sure that STREAM_MUSIC is affected by ringer mode on non voice capable
devices whatever the saved settings say.

- Added a hidden method to AudioManager for VolumePanel to override
the stream selection logic while the panel is showing.

Change-Id: Ib2ff2a7af63decb4e29c45700c41e5058f79d877
2011-02-04 12:39:14 -08:00
Mike Cleron
c146790893 am b8578741: Merge "Fix issue #3424823: 4-corner trick causes runtime restart" into honeycomb
* commit 'b85787411085bbea0ac725135cae02a4167b7aa7':
  Fix issue #3424823: 4-corner trick causes runtime restart
2011-02-04 11:56:23 -08:00
Mike Cleron
b857874110 Merge "Fix issue #3424823: 4-corner trick causes runtime restart" into honeycomb 2011-02-04 11:53:58 -08:00
Patrick Scott
01b7a98c31 am 160c18a4: Merge "Need a public way to wait for cookie operations." into honeycomb
* commit '160c18a4d209f56766fdd90e4711c8e29fd407e6':
  Need a public way to wait for cookie operations.
2011-02-04 11:22:41 -08:00
Shimeng (Simon) Wang
48fc9097cc Send actual view height to webkit for window.innerHeight.
Currently only fixed height is sent over to webkit, which is to
avoid relayout when url bar is being scrolled.
And this fixed height is used also as the visible height and shown up
as window.innerheight, which is not correct.

This change sends the actual view height as the screen height to
webkit, so window.innerheight is correct.  This may potentially
help fixed elments in a page's bottom.  The relayout is still avoided
as before.

issue: 3396895
Change-Id: I0426a7d6dc76a823d8d26943a92689f49026fba8
2011-02-04 10:57:54 -08:00
Dianne Hackborn
912d9d1369 Fix issue #3424823: 4-corner trick causes runtime restart
Change-Id: Ibd3fc63d0ab975a2b74765a00023c7f783b24216
2011-02-04 10:35:36 -08:00
Robert Greenwalt
6d1f9d031d Merge "Place the DHCP server address in the "next server IP address" field of the bootp header. A certain Apple client likes this, and it is more consistent with other DHCP servers." 2011-02-04 10:16:22 -08:00
Patrick Scott
b88e52c760 Need a public way to wait for cookie operations.
Hidden for now as we are past the public api deadline.

Bug: 3421214
Change-Id: I8a65ae479d0b8b020af2600d7d29d5d358414add
2011-02-04 12:52:46 -05:00
Leon Scroggins
2f7fa83507 Save form data when submitted.
Bug:3280725

Save form data when submitted, rather than when a page
loads.

Requires a change in external/webkit.

Change-Id: I3ff9515ef9e9ab28992cdc8a7beb537752ed1e8c
2011-02-04 11:43:19 -05:00
Romain Guy
9732d9e6ea am 43703325: Merge "New default wallpaper" into honeycomb
* commit '43703325d8a8b755b9891708006abe8700884538':
  New default wallpaper
2011-02-03 23:08:26 -08:00
Romain Guy
43703325d8 Merge "New default wallpaper" into honeycomb 2011-02-03 23:04:50 -08:00
Romain Guy
43a1da0807 New default wallpaper
Change-Id: Iddb593e0b1775725b1bfaa2c74fb2f53fb7a4561
2011-02-03 22:36:03 -08:00
Mike Cleron
9cfa9c7a3f am f6141980: Merge changes I46acd27a,I70b322e1 into honeycomb
* commit 'f6141980c84f64618f083297bc37cfae7e0fca84':
  aa is better than cc
  Prevent ProgressBar from slowing down everything. bug #3422568
2011-02-03 21:19:33 -08:00
Mike Cleron
f6141980c8 Merge changes I46acd27a,I70b322e1 into honeycomb
* changes:
  aa is better than cc
  Prevent ProgressBar from slowing down everything. bug #3422568
2011-02-03 21:17:09 -08:00
Daniel Sandler
31796297d4 am 4ad2547f: Merge "Ongoing notification for GPS use." into honeycomb
* commit '4ad2547fe08bab430d7d9f9cc4b789410856c9c3':
  Ongoing notification for GPS use.
2011-02-03 20:51:00 -08:00
Daniel Sandler
4ad2547fe0 Merge "Ongoing notification for GPS use." into honeycomb 2011-02-03 20:49:10 -08:00
Eric Laurent
a37a81d705 am e6955f8e: Merge "Issue 3371080: fix VolumePanel in mute state" into honeycomb
* commit 'e6955f8e38dfe7c0d748c3b55bbcfc5640c968c5':
  Issue 3371080: fix VolumePanel in mute state
2011-02-03 19:38:27 -08:00
Eric Laurent
e6955f8e38 Merge "Issue 3371080: fix VolumePanel in mute state" into honeycomb 2011-02-03 19:35:57 -08:00
Eric Laurent
d72d51c77a Issue 3371080: fix VolumePanel in mute state
VolumePanel must take stream mute state into account before displaying
the update stream volume.

Change-Id: I03a1697c25fca3fa56f892e3d426d00906abeb79
2011-02-03 18:47:47 -08:00
Jim Miller
6b590c8fd3 am 0d47ac11: Merge "Fix 3419077: Allow subclasses to change SeekBarPreference action buttons." into honeycomb
* commit '0d47ac11764b89431777c3a84efd5fa9c17130dc':
  Fix 3419077: Allow subclasses to change SeekBarPreference action buttons.
2011-02-03 18:42:08 -08:00
Jim Miller
0d47ac1176 Merge "Fix 3419077: Allow subclasses to change SeekBarPreference action buttons." into honeycomb 2011-02-03 18:39:39 -08:00
Jim Miller
da983f734c am 4ce0cad1: Merge "Issue 3371080: fix volume update in mute state." into honeycomb
* commit '4ce0cad1b31016970f65bae0151dccb2234ee202':
  Issue 3371080: fix volume update in mute state.
2011-02-03 18:32:32 -08:00
Jim Miller
4ce0cad1b3 Merge "Issue 3371080: fix volume update in mute state." into honeycomb 2011-02-03 18:29:36 -08:00
Daniel Sandler
e40451a89d Ongoing notification for GPS use.
This change improves upon the notification priority API
introduced in change I9e738cc4, allowing privileged clients
to set the priority of a notification when posting it
directly to INotificationManager. StatusBarTest is updated
to test this new feature.

The new LocationController in SystemUI uses this facility to
post a high-priority ongoing notification whenever GPS is in
use (replacing the functionality of the legacy GPS status
bar icon).

Also happens to fix http://b/3325472 (adding a log message
when notifications are dropped because of a missing icon).

Bug: 3412807

Change-Id: I523016ffa53bf979be98ddc4a2deb55a6270c68a
2011-02-03 21:11:46 -05:00
Jean-Baptiste Queru
1372f0449b am 5086c457: am baaaca1c: Merge ee4c17ee from gingerbread
* commit '5086c45718a8344fb36adf5b15e98953612cac37':
  Fix delivery report error with PENDING status in SMS
2011-02-03 18:09:26 -08:00
Vasu Nori
1b67231483 am 9ec496b4: am e1cbd0a8: Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
* commit '9ec496b484305defa6cbb691b85836ace8b73a02':
  Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
2011-02-03 18:08:44 -08:00
Michael Jurka
bb01f8a2d0 am d51e0820: am 8275c608: Merge "adding fast setters for translationx/y" into honeycomb
* commit 'd51e0820b3b7a71f2b3e0447bdf05188588c6003':
  adding fast setters for translationx/y
2011-02-03 18:08:17 -08:00
Romain Guy
8b113cf6d7 am cb2c84fd: am 3b66e43e: Merge "Refresh display lists when turning off layers rendering. Bug #3420565" into honeycomb
* commit 'cb2c84fd81a0891071e8ed0237927ad785751850':
  Refresh display lists when turning off layers rendering. Bug #3420565
2011-02-03 18:08:03 -08:00
Romain Guy
2f57ba56b3 Prevent ProgressBar from slowing down everything.
bug #3422568

Change-Id: I70b322e140a8fdbe504c6984c54a22bcb7b753e7
2011-02-03 18:03:29 -08:00
Dianne Hackborn
94baff4797 am 1b1962f3: Merge "Fix issue #3420898: More wallpaper issues" into honeycomb
* commit '1b1962f38304d2cbf12ac008791d93d3f1bdf0a6':
  Fix issue #3420898: More wallpaper issues
2011-02-03 17:50:51 -08:00
Dianne Hackborn
1b1962f383 Merge "Fix issue #3420898: More wallpaper issues" into honeycomb 2011-02-03 17:48:51 -08:00
Gilles Debunne
bbc910f229 Fix for StaticLayout bug with ellipsized text
This fixes the test, but I believe this class still needs a lot of fixing.

Change-Id: Ib6386196908ea8432b175d6994f9299778a322d2
2011-02-03 17:42:18 -08:00
Eric Laurent
0f31fe0968 Issue 3371080: fix volume update in mute state.
VolumePreference should take the stream mute state into account
when updating the progress bar if a change is received by
the content observer

Change-Id: Ia1a8af9d4cc349d2d57753d865e8d2e58daf04f1
2011-02-03 17:34:39 -08:00
Stan Chesnutt
eafccc0859 Place the DHCP server address in the "next server IP address"
field of the bootp header.  A certain Apple client likes this,
and it is more consistent with other DHCP servers.

Change-Id: I59e73fbf3dccfbadd1325d3ad5e2997952a28fde
2011-02-03 17:32:39 -08:00
Jaikumar Ganesh
b3c4efc22d Merge "Wait till SDP records are registered before sending intent." 2011-02-03 17:27:10 -08:00
Eric Laurent
2e8fbebff4 am 6f1bd261: am 9c0a1003: Merge "Fix issue 3371080" into honeycomb
* commit '6f1bd261b7fd86ac7817ca061dfb55b95150b836':
  Fix issue 3371080
2011-02-03 17:18:46 -08:00
Cary Clark
39530f8fc7 am 859563eb: am aa7dc928: Merge "stop GL drawing thread before killing WebCore" into honeycomb
* commit '859563ebf7edbb6d556ef10bac7315fdc564e73a':
  stop GL drawing thread before killing WebCore
2011-02-03 17:17:45 -08:00
Justin Ho
9b50aebc60 am 7d75cd65: am b732e6d2: Merge "Changing Honeycomb default wallpaper" into honeycomb
* commit '7d75cd65fa08e9457f6dacb5eb89664a09789dd9':
  Changing Honeycomb default wallpaper
2011-02-03 17:17:35 -08:00
Romain Guy
b0905c998d am 20bf23e5: am ac14db72: Merge "Fast transform properties setters. Bug #3413510" into honeycomb
* commit '20bf23e5e4172f5f80ce6c4cc16168355b107f0d':
  Fast transform properties setters. Bug #3413510
2011-02-03 17:17:21 -08:00
Daniel Sandler
4dce4fc8ea am a2e82d4c: am 6f922cbe: Merge "Implement priority ordering in notifications." into honeycomb
* commit 'a2e82d4c69bc25eb9f262be0efb4bd38695c4f86':
  Implement priority ordering in notifications.
2011-02-03 17:16:54 -08:00
Romain Guy
9bd32c235d am 109da7df: am 5bfd1aff: Merge "Allocate layers from the layers pool. Bug #3413433" into honeycomb
* commit '109da7dfd4c0766274b17467880ee673c731735c':
  Allocate layers from the layers pool. Bug #3413433
2011-02-03 17:16:19 -08:00
Justin Ho
8e0bf64c6f am 8e2c67ea: am be36f9a3: Merge "Adding new volume control dialog icons" into honeycomb
* commit '8e2c67ea26d38677802f3029472aa2393f47173d':
  Adding new volume control dialog icons
2011-02-03 17:15:21 -08:00
Jaikumar Ganesh
50b40cec9c Wait till SDP records are registered before sending intent.
Wait till all SDP records are registered, before sending STATE_ON intent.
This would fix crashes in Settings app when the profile manager
is not registered.
Problem:
  We were sending Bluetooth State on intent before we got the uuid state
  change intent from Bluez, which is asynchronous.
  Hence when the Settings app queries for the profiles
  to decide if headset profile was registered it would get false and
  the profile manager would be null causing crashes.
  This was not 100 % reproducible, well because it was a race condition.

Change-Id: I791eb63dfbc78aba4c06fd8db933069cb5fde00d
2011-02-03 17:02:06 -08:00
Adam Powell
86ce68668c am c1be7ac9: Merge "Asset updates for dialog frames and seek bar thumbs" into honeycomb
* commit 'c1be7ac9121ac8b7b7cfd2205ff928fb0d11fef8':
  Asset updates for dialog frames and seek bar thumbs
2011-02-03 17:00:10 -08:00
Adam Powell
c1be7ac912 Merge "Asset updates for dialog frames and seek bar thumbs" into honeycomb 2011-02-03 16:57:21 -08:00
Justin Ho
6d1fbba686 am 40523b1b: Merge "Updating default wallpaper" into honeycomb
* commit '40523b1b27826ee58a101b0450eff74ab14cb0b5':
  Updating default wallpaper
2011-02-03 16:55:07 -08:00