drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,496 Commits 1 Branch 0 Tags
Commit Graph

14661 Commits

Author SHA1 Message Date
Gilles Debunne
de1285e7ea am 63308bd0: am a324a581: Merge "Fix for StaticLayout bug with ellipsized text" into honeycomb 
* commit '63308bd092a0edcea685d9f81b3d6d6d345c663b':
  Fix for StaticLayout bug with ellipsized text
 2011-02-07 13:46:21 -08:00
Patrick Scott
f01e3b5b8f am 01b7a98c: am 160c18a4: Merge "Need a public way to wait for cookie operations." into honeycomb 
* commit '01b7a98c31f3d4587fb6739c8c6b35530177c20c':
  Need a public way to wait for cookie operations.
 2011-02-07 13:44:41 -08:00
Mike Cleron
85cabc2eb3 am 9cfa9c7a: am f6141980: Merge changes I46acd27a,I70b322e1 into honeycomb 
* commit '9cfa9c7a3f5f23dec6ef4575407c1076d1b3c479':
  aa is better than cc
  Prevent ProgressBar from slowing down everything. bug #3422568
 2011-02-07 13:41:21 -08:00
Daniel Sandler
32cd1d5053 resolved conflicts for merge of 31796297 to master 
Change-Id: Ice632b3378f8f67c186245fdb63b022ade864ba1
 2011-02-07 16:12:16 -05:00
Alon Albert
f313e95821 Merge "Move handing of a "cancel" inside try-finally block" 2011-02-07 12:20:36 -08:00
Dianne Hackborn
40e7a989e7 Merge "Fix COMPONENT_ENABLED_STATE check (copy from HC)" 2011-02-07 12:11:12 -08:00
Eric Laurent
ced2c59678 am a37a81d7: am e6955f8e: Merge "Issue 3371080: fix VolumePanel in mute state" into honeycomb 
* commit 'a37a81d705bd9abaf1110fecd176a74d32ac2016':
  Issue 3371080: fix VolumePanel in mute state
 2011-02-07 11:40:51 -08:00
Jim Miller
f44ca4664f am 6b590c8f: am 0d47ac11: Merge "Fix 3419077: Allow subclasses to change SeekBarPreference action buttons." into honeycomb 
* commit '6b590c8fd36c20961e9f4ab36bfc03e82f5abf24':
  Fix 3419077: Allow subclasses to change SeekBarPreference action buttons.
 2011-02-07 11:40:38 -08:00
Jim Miller
6572cfe8dc am da983f73: am 4ce0cad1: Merge "Issue 3371080: fix volume update in mute state." into honeycomb 
* commit 'da983f734c608fde57ea4f213d8640490a2f3a84':
  Issue 3371080: fix volume update in mute state.
 2011-02-07 11:40:21 -08:00
Nick Pelly
996d493967 am 7c95a2c2: am 062443f2: am 40684946: Merge "Fix docs type that broke build." into gingerbread 
* commit '7c95a2c2471e1ae2308f8a00927e08f321bf8059':
  Fix docs type that broke build.
 2011-02-07 11:37:28 -08:00
Amith Yamasani
9edc5c056f am 9589ac6c: am 823fbbba: Merge "Expanded volume panel with sliders and mute buttons." into honeycomb 
* commit '9589ac6c3f63a632e078adcc8ef742412af2014c':
  Expanded volume panel with sliders and mute buttons.
 2011-02-07 11:36:32 -08:00
Nick Pelly
ca3a704acc am 3bb7b0c2: am 5394ef06: am 630ac8df: Merge "NFC documentation overhaul." into gingerbread 
* commit '3bb7b0c2b3d448a60b64eba37c998d1f7c7424e2':
  NFC documentation overhaul.
 2011-02-07 11:35:47 -08:00
Alon Albert
9257ec0563 Move handing of a "cancel" inside try-finally block 
Bug: 3417906
Change-Id: I87e41c0cdad74e2ba72a7b4d1f059e72d106e105
 2011-02-07 10:53:26 -08:00
Lorenzo Colitti
24401c7966 Merge "Add a protocol property to the APNs and use it." 2011-02-04 17:41:11 -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
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
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
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
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
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
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
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
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
Nick Pelly
7c95a2c247 am 062443f2: am 40684946: Merge "Fix docs type that broke build." into gingerbread 
* commit '062443f2956bb85ef84485a62e9b0496fded68ae':
  Fix docs type that broke build.
 2011-02-03 16:35:12 -08:00
Nick Pelly
062443f295 am 40684946: Merge "Fix docs type that broke build." into gingerbread 
* commit '40684946cb00080c1c7424885f49a809816dd26e':
  Fix docs type that broke build.
 2011-02-03 16:32:29 -08:00
Nick Pelly
40684946cb Merge "Fix docs type that broke build." into gingerbread 2011-02-03 16:27:51 -08:00
Nick Pelly
46797ac098 Fix docs type that broke build. 
Change-Id: I5b5a2fc5baf95ace74bf90ff2c750ba890054d64
 2011-02-03 16:23:58 -08:00
Jim Miller
4c8aafe300 Fix 3419077: Allow subclasses to change SeekBarPreference action buttons. 
Change-Id: I2c624c3693fe06d9d3db3c203c7d4fc7a80b79d9
 2011-02-03 16:17:41 -08:00