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

56046 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
9a4eacfeb4 Merge "Add a h/w composer API to allow the HAL to trigger a redraw" 2011-08-02 17:07:53 -07:00
Kenny Root
f5348d8211 Merge "Parent's canonical path; not parent of canonical" 2011-08-02 17:05:06 -07:00
Romain Guy
04ee7956ea Merge "Add the ability to enable/disable marquee fading per device" 2011-08-02 17:03:22 -07:00
Jean-Baptiste Queru
9b0c6beed2 Merge "Fix a compiling error when trying to use setBufferCount" 2011-08-02 17:02:48 -07:00
Eric Laurent
4eb5a57138 AudioService: ignore NOTIFICATIONS_USE_RING_VOLUME. 
Do not take NOTIFICATIONS_USE_RING_VOLUME setting into account now
that it has been deprecated. STREAM_NOTIFICATION and STREAM_RING
always use the same volume setting.

Change-Id: Ibf6e5f86133d3781fd9e66455be64582318d93e6
 2011-08-02 16:58:10 -07:00
Dianne Hackborn
5857bceaea Merge "Clear the bitmap from the canvas in a lot of places." 2011-08-02 16:57:50 -07:00
Teng-Hui Zhu
c6ca43176d Fix a compiling error when trying to use setBufferCount 
Change-Id: I1aefaf7ec111340a584e0beeeea60b845e16bb1f
 2011-08-02 16:57:20 -07:00
The Android Automerger
4186c31d18 Merge remote branch 'goog/gingerbread-release' into gingerbread-mr4-release 2011-08-02 16:47:53 -07:00
Chris Craik
555c55ed65 Added automated performance test to TileBenchmark 
bug:5062896

Depends on external/webkit change:
https://android-git.corp.google.com/g/#change,125566

Loads pages from SD card, and scrolls through them reporting results. Added
contentInvalidateAll hidden WebView method, and made pageSwapCallback
extensible.

Change-Id: I9f7377aad6fd7c101177dde552a72357c8b4e400
 2011-08-02 16:47:21 -07:00
Dianne Hackborn
6311d0a079 Clear the bitmap from the canvas in a lot of places. 
Change-Id: I6b2071ac7b348c473b9bdd1b972d095aebbb4fb3
 2011-08-02 16:37:58 -07:00
Romain Guy
6805545649 Add the ability to enable/disable marquee fading per device 
Change-Id: I4211553455e87f0af598a2fac1d4f65f15c294fc
 2011-08-02 16:33:02 -07:00
Philip Milne
e10bcdb37c Merge "Fix for http://b/issue?id=5081478" 2011-08-02 16:22:26 -07:00
Jaikumar Ganesh
365522a828 DO NOT MERGE Incoming Bluetooth Connection requests - dialog. 
This sends the intents to the Settings app to show
the dialogs for the incoming connection requests.

Change-Id: Ibe267f7cda28ce2a46c25800df2e8ac685b0b9e6
 2011-08-02 16:07:46 -07:00
Philip Milne
899d592287 Fix for http://b/issue?id=5081478 
GridLayout needs to call measure on children after it knows how large children should be

Also:

. Remove deprecated methods and XML attributes.
. Stop Spaces having margins by default.
. Remove getSpacers() and findUsed()
. Change default for row/columnOrderPreserved() from false to true.
. Improve automatic index allocation mechanism to use individual maxima.

Change-Id: Id79fbb2e70a0bf2002191ec2a9746547d896de72
 2011-08-02 16:01:28 -07:00
Mathias Agopian
0fb1a9458c update HWC data structures even when a layer is marked for SKIP 
Change-Id: I16bcf44cd617814a14a795429bde2f39f411077d
 2011-08-02 15:51:37 -07:00
Kenny Root
5832ead89a Parent's canonical path; not parent of canonical 
When moving from SD card to internal, the PackageManager should check if
the native library directory parent's canonical path matches the
canonical data directory.

However, it was checking the canonical native library directory's
parent matches the data directory which makes tests concerning moving
from SD card to internal storage fail.

Change-Id: I16420efbb6f52fd6877a8f62ad060f8a1b8b0033
 2011-08-02 15:49:39 -07:00
Robert Greenwalt
666742c7cf Merge "Stop creating threads for each MDST." 2011-08-02 15:47:50 -07:00
Matthew Xie
4376b7f2d7 Merge "Move mBluetoothService.runBluetooth after broadcasting the STATE_ON intent." 2011-08-02 15:44:28 -07:00
Mike Lockwood
8a32c6333a Merge "USB: Fix NPE that occurred when restoring default function in UsbManager.setEnabledFunctions" 2011-08-02 15:31:34 -07:00
Eric Fischer
147200b2c4 Merge "Import revised translations." 2011-08-02 15:24:05 -07:00
Matthew Xie
8594394aad Move mBluetoothService.runBluetooth after broadcasting the STATE_ON intent. 
This is because broadcastState method move the Bluetooth adapter state
to ON. The mBluetoothService.runBluetooth should be called only in the ON state.
Remove mIsDiscovering variable in BluetoothService.
Fix a bug in BluetoothA2dpService that caused 2 times of state change
from DISCONNECTED to CONNECTING that messed up BluetoothService's
connection state count.
Change-Id: Ifb782a845ae70f007d2e036d930bb55f445d68b5
 2011-08-02 15:22:09 -07:00
Mike Lockwood
8b4d36e866 USB: Fix NPE that occurred when restoring default function in UsbManager.setEnabledFunctions 
Bug: 5110020

Change-Id: I5e4b5c27e4675fa6830823832ae51411dc448191
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-08-02 18:18:09 -04:00
repo sync
7374d9728b Merge "Fix networktype on per process DNS setting" 2011-08-02 14:48:43 -07:00
repo sync
8935696a19 Fix networktype on per process DNS setting 
This potentially has no impact on mobile due to DNS settings being the same. Seperate this change out of the p2p change

Change-Id: I70fff9b1e13015956793b19732785037adb0af24
 2011-08-02 13:40:58 -07:00
Jeff Hamilton
c8909501b1 Merge "Remove the binder interface for LLCP." 2011-08-02 13:33:02 -07:00
Conley Owens
53ad2c7fe2 am 0793586b: am f8c1f129: am e1d27154: am f87743e7: Merge "Prevent NullPointerException cases while using SipService." 
* commit '0793586bf8f4dce71d0b4d7ff2f212129b3f76fe':
  Prevent NullPointerException cases while using SipService.
 2011-08-02 13:32:26 -07:00
Conley Owens
0793586bf8 am f8c1f129: am e1d27154: am f87743e7: Merge "Prevent NullPointerException cases while using SipService." 
* commit 'f8c1f1298ac3ede518c8d29eeb6719746c6afaf0':
  Prevent NullPointerException cases while using SipService.
 2011-08-02 13:30:51 -07:00
Jeff Hamilton
c3afd39c67 Remove the binder interface for LLCP. 
Change-Id: Idc9631cdbcac1435e285c656948a37315e32515d
 2011-08-02 15:30:26 -05:00
Conley Owens
f8c1f1298a am e1d27154: am f87743e7: Merge "Prevent NullPointerException cases while using SipService." 
* commit 'e1d271546767a8e2213aabba92506af9e97020b4':
  Prevent NullPointerException cases while using SipService.
 2011-08-02 13:24:00 -07:00
Conley Owens
e1d2715467 am f87743e7: Merge "Prevent NullPointerException cases while using SipService." 
* commit 'f87743e7bdfd10b9a1719036a6320a32df078879':
  Prevent NullPointerException cases while using SipService.
 2011-08-02 13:21:12 -07:00
Romain Guy
6dd7431710 Merge "Properly cancel pending buffers on window size change" 2011-08-02 13:18:51 -07:00
Conley Owens
f87743e7bd Merge "Prevent NullPointerException cases while using SipService." 2011-08-02 13:08:14 -07:00
Romain Guy
cf15efba07 Properly cancel pending buffers on window size change 
Change-Id: Id6108ce61a971673f3ebc8270e9dd00849c91ae5
 2011-08-02 12:59:32 -07:00
Robert Greenwalt
5a8921fdda Stop creating threads for each MDST. 
Response to email from the framework team.

Change-Id: I8fec9cfbc3364c2c2a16156afc2414d06c675de7
 2011-08-02 12:55:48 -07:00
Romain Guy
ff7fffab23 Merge "Copy constructors should actually copy stuff. Bug #5027094" 2011-08-02 12:38:42 -07:00
Romain Guy
b1216dd916 Copy constructors should actually copy stuff. 
Bug #5027094

Change-Id: Iab6bf652e0b9bdd1bbc794e7c4218f46bafdd1a4
 2011-08-02 12:37:16 -07:00
Christopher Tate
94761d396d Merge "Reduce backup manager logspew" 2011-08-02 12:18:40 -07:00
Amith Yamasani
b0a20e47dd Merge "Volume panel changes." 2011-08-02 11:51:57 -07:00
Xavier Ducrohet
efe8e3460a Merge "Layoutlib: simple comment fix." 2011-08-02 11:48:23 -07:00
Martijn Coenen
ad35add5a3 Merge "Removed unused import from AnimatorSet." 2011-08-02 11:44:23 -07:00
Romain Guy
33e6ad6eed Merge "Prevent crash with NPE in HardwareRenderer Bug #5109839" 2011-08-02 11:33:57 -07:00
Martijn Coenen
ecc2fd94fa Removed unused import from AnimatorSet. 
Change-Id: I7d5b3327290845d44cbe0abd48bf45c6f43bf677
 2011-08-02 11:33:49 -07:00
Romain Guy
357c942462 Prevent crash with NPE in HardwareRenderer 
Bug #5109839

Change-Id: I402fc70ff4b25d273cf3150759d6f2d4d971975d
 2011-08-02 11:33:16 -07:00
Jaikumar Ganesh
64d617078e Merge "Fix tethering using BT." 2011-08-02 11:25:13 -07:00
Eric Fischer
5a4e75e2e2 Import revised translations. 
Change-Id: If420bd92ac6f84a7ecfa57b48477815ac392cb3f
 2011-08-02 11:06:38 -07:00
Gilles Debunne
f34060adce Merge "Bug 4280211: permission green checkboxes removed" 2011-08-02 10:58:42 -07:00
Xavier Ducrohet
569ed05404 Layoutlib: simple comment fix. 
Change-Id: I402f6b465706e8edd14e512a973d087a14abbfe3
 2011-08-02 10:55:18 -07:00
Hugo Hudson
e2048cc73f Merge "Add OpenableColumns to the Voicemail table." 2011-08-02 10:55:13 -07:00
Xavier Ducrohet
78a29c9fde Merge "Misc layoutlib fix in preparation of the access change in framework code." 2011-08-02 10:43:45 -07:00
Derek Sollenberger
4f7c380d51 Merge "Reverting until we can find a better way to address this issue without affecting nine-patches with large stretchable areas." 2011-08-02 10:39:43 -07:00