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

53604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Irfan Sheriff
dde052f4ba Merge "WifiWatchdogService - disable bad connections" 2011-06-25 11:20:54 -07:00
Jeff Sharkey
f670be372b Merge "Finish any enter animation when jumping to state." 2011-06-24 23:12:38 -07:00
Adam Powell
681873fcc9 Merge "Fix bug 4903822 - vertical gravity bugs in action bar custom views" 2011-06-24 19:17:38 -07:00
Fabrice Di Meglio
8ed2acd838 Merge "Introduce MarginLayoutParams marginStart and margingEnd" 2011-06-24 19:00:30 -07:00
Fabrice Di Meglio
b76023afd1 Introduce MarginLayoutParams marginStart and margingEnd 
- update BiDiTest app for adding more unit tests concerning margin

Change-Id: Ia6a7e0a1948a2c375e8f3cc87d120a85351a8c27
 2011-06-24 18:55:24 -07:00
Romain Guy
f7afae5cc8 Merge "Update GLTextureView sample to do something real." 2011-06-24 18:52:47 -07:00
Romain Guy
d0d0705994 Update GLTextureView sample to do something real. 
Change-Id: I55a62434ae0b602522221689626f6b4155bd0d91
 2011-06-24 18:51:28 -07:00
Jim Miller
f782ded942 Merge "LockScreen layout, button style, and owner info fixes - enable OwnerInfo to appear in status1 if dedicated view not present. - force all status lines to be singleline and marquee. - fix justification in landscape layouts. - use buttonBarStyle for buttons on all LockScreens. - reduce the size of the clock to fit in landscape. - no longer show "Draw a pattern to unlock" help message in LockPatternView." 2011-06-24 18:44:08 -07:00
Romain Guy
44f8d6bd15 Merge "Don't set texture parameters on every frame." 2011-06-24 17:54:25 -07:00
Romain Guy
4a5a71518a Don't set texture parameters on every frame. 
Change-Id: Iec368405ad6a4ccfd569a0b3b4d681871a770396
 2011-06-24 17:53:53 -07:00
Jim Miller
7377cd0ab4 LockScreen layout, button style, and owner info fixes 
- enable OwnerInfo to appear in status1 if dedicated view not present.
- force all status lines to be singleline and marquee.
- fix justification in landscape layouts.
- use buttonBarStyle for buttons on all LockScreens.
- reduce the size of the clock to fit in landscape.
- no longer show "Draw a pattern to unlock" help message in LockPatternView.

Change-Id: I1ff51550e2180f9d912c8f710ad5e2fd2424d373
 2011-06-24 17:45:34 -07:00
Romain Guy
4c60c541de Merge "Properly tear down TextureView" 2011-06-24 17:21:26 -07:00
Romain Guy
80429c4585 Properly tear down TextureView 
Change-Id: Ic23cd9257889d0abe8cc3fc1d04a66d0505e383e
 2011-06-24 17:20:32 -07:00
Adam Powell
6556c074ee Fix bug 4903822 - vertical gravity bugs in action bar custom views 
Change-Id: I20a319bf8fd5b5acf823a2651639f94d6efac5e4
 2011-06-24 17:17:58 -07:00
Scott Main
01ecdcc756 am b9d7873c: am a602972c: am 1acd2a7f: Merge "docs: add Lenevo driver info" into honeycomb-mr2 
* commit 'b9d7873cecdc6052ed4004293ead2071db7fb24c':
  docs: add Lenevo driver info
 2011-06-24 17:15:53 -07:00
Jeff Sharkey
a0ac98bd5c Finish any enter animation when jumping to state. 
When jumpDrawablesToCurrentState(), finish any alpha animation in
progress.  Fixes bug where drawable with enter fade would remain
transparent until next state change.

Change-Id: Ia087f935566a8d78e0efdcb0a1a2f791db05c70e
 2011-06-24 17:08:12 -07:00
Tsu Chiang Chuang
b40ec927bb Merge "adding notification stress tests." 2011-06-24 16:55:36 -07:00
Robert Greenwalt
554475f09c Merge "resolved conflicts for merge of 40717996 to master" 2011-06-24 16:39:08 -07:00
Tsu Chiang Chuang
a760e55783 adding notification stress tests. 
Change-Id: Ideaae33843685fcbec4c4f38bf9c2ced97c9bf86
 2011-06-24 16:19:37 -07:00
Robert Greenwalt
86994c1fc1 resolved conflicts for merge of 40717996 to master 
Change-Id: Ie5c0f1f20c313d6c568b3b06f778f75223914ada
 2011-06-24 16:10:06 -07:00
Isaac Levy
bc7dfb58bf WifiWatchdogService - disable bad connections 
Complete rewrite of WifiWatchdogService.java.  Checking for connectivity and managing wifi upon failure detection.

Change-Id: Ifcb8b5d7e0112cbc2f2282d76fdc93ea15527a44
 2011-06-24 15:48:10 -07:00
Dianne Hackborn
7cec14235d Merge "Small cleanup of am/pm commands." 2011-06-24 15:22:22 -07:00
Christopher Tate
78a7f12043 Merge "Fix settings restore" 2011-06-24 15:15:51 -07:00
Christopher Tate
28cdb9e104 Fix settings restore 
Also correct the debug-mode logging of error locations in backup data.
Bug 4914182

Change-Id: Ie7dda0192afa819e42490b7ffd2d3db6f11968f6
 2011-06-24 15:06:48 -07:00
Romain Guy
c1ba416af5 Merge "Reduce the number of UI events required to update a SurfaceTexture." 2011-06-24 14:56:20 -07:00
Romain Guy
58f4edb770 Reduce the number of UI events required to update a SurfaceTexture. 
Change-Id: I9330c9646654fff57dcd6817c86e587a6490a9ad
 2011-06-24 14:55:55 -07:00
Jesse Wilson
9bc0521e2b Merge "Test that algorithm name is case-insensitive for digest auth." 2011-06-24 14:33:46 -07:00
Jesse Wilson
df867f8f80 Test that algorithm name is case-insensitive for digest auth. 
Change-Id: I891a533ae3b16b838925fa488093c19dfeb32efa
http://code.google.com/p/android/issues/detail?id=16051
 2011-06-24 13:50:37 -07:00
Dianne Hackborn
46d110329e Small cleanup of am/pm commands. 
Change-Id: I5af730bc177635821a82d4dd3ec9130a5dcd525a
 2011-06-24 13:22:45 -07:00
Romain Guy
c897fbfaf9 Merge "Code cleanup" 2011-06-24 13:21:30 -07:00
Romain Guy
02ccac69fd Code cleanup 
Change-Id: I64c346004e0adf9a776d0315534d4fe445f0c0ca
 2011-06-24 13:20:23 -07:00
Daisuke Miyakawa
b81b1c91d8 Merge "Uppercase region code so that AsYouTypeFormatter works correctly." 2011-06-24 12:32:04 -07:00
Fabrice Di Meglio
a54a600bc4 Merge "Fix bug #4813026 resolved direction of view doesn't change after layout direction changes" 2011-06-24 12:21:28 -07:00
Fabrice Di Meglio
d3d4b4b86a Merge "Fix potential advances overrun in TextLayoutCache." 2011-06-24 12:02:58 -07:00
Doug Felt
b092f55c37 Fix potential advances overrun in TextLayoutCache. 
Change-Id: Ibec544f249833a28fe8ef9a15fc8ab48fddfc51c
 2011-06-24 11:54:00 -07:00
John Reck
f4db8d566c Merge "Don't resend WEBKIT_DRAW if paused" 2011-06-24 11:36:10 -07:00
Jaikumar Ganesh
c9286ebbf4 Merge "Implement APIs for Bluetooth Health profile." 2011-06-24 11:34:35 -07:00
Jaikumar Ganesh
2ea1e85dcb Implement APIs for Bluetooth Health profile. 
This first patch implements all the APIs.
The APIs wil be made public soon. The data specification
API will be submited in another patchset.
Change-Id: I2462683b7e07380e2c42474b0036b34d03b4bed1
 2011-06-24 11:31:43 -07:00
John Reck
1c1e6df04a Don't resend WEBKIT_DRAW if paused 
Bug: 4606210
 If a WEBKIT_DRAW message came in after the WebView was paused,
 it would fail to draw causing it to re-send the WEBKIT_DRAW message
 which would lead to an infinite loop until the WebView is resumed.
 Fix this by not re-sending the WEBKIT_DRAW message if webview is paused.

Change-Id: I3dd946e4e948cf3fd6af07ba6f7fdac2f967a631
 2011-06-24 11:07:09 -07:00
Amith Yamasani
b0b1b11b96 Merge "SearchView improvements per design." 2011-06-24 10:58:38 -07:00
Jaikumar Ganesh
e0ac113b47 Merge "Fix excessive locking synchronization leading to deadlocks." 2011-06-24 09:28:02 -07:00
The Android Open Source Project
a6bdb4c771 Reconcile with gingerbread-release 
Change-Id: Ic4aca5ef26cbfb97281582ddb6bfe290f60c29fc
 2011-06-24 08:08:41 -07:00
Shaopeng Jia
5b0b167f7f Uppercase region code so that AsYouTypeFormatter works correctly. 
Change-Id: Iaf46ec5241a1a8984753bd6d8f9f842884efaa15
 2011-06-24 13:50:43 +02:00
Hung-ying Tyan
808be0d064 Merge "Restart NAT port timeout measurement when keepalive fails and other fixes" 2011-06-24 01:37:53 -07:00
Hung-ying Tyan
2c13dd7755 Merge "Execute all the due wakeup events in SipWakeupTimer." 2011-06-24 01:37:33 -07:00
Hung-ying Tyan
e65f3a896f Restart NAT port timeout measurement when keepalive fails and other fixes 
Misc keepalive fixes including:
+ Restart NAT port timeout measurement when keepalive fails. The max interval
  is set to the current keepalive interval.
+ When exception occurs during sending a keepalive, restarts registration.
+ When exception occurs during measurement, retry for a limited times before
  giving up.

Change-Id: I7aa787a5ec7c4c9b4334aa1017371d9049b3520c
 2011-06-24 15:28:15 +08:00
Grace Kloba
5c5050d902 Make TextureView to use async SurfaceTexture. 
With this, there is no synchronous destroy SurfaceTexture requirement any more.

Revert the previous change which only applies to the sync SurfaceTexture.

Change-Id: Id4790d38a27f2982d0c8ad471bc1107683d27ffc
 2011-06-23 22:32:04 -07:00
Mathias Agopian
138f33bcef Merge "Add allowSynchronousMode to SurfaceTexture constructor." 2011-06-23 21:31:33 -07:00
Grace Kloba
0904d0af81 Add allowSynchronousMode to SurfaceTexture constructor. 
Change-Id: I54f30a3c16bbe6b813f3bcd1d389da5627531304
 2011-06-23 21:21:47 -07:00
Svetoslav Ganov
f95d7f5467 Merge "Case insensitive for real" 2011-06-23 19:21:49 -07:00