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

46341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
07ca17040a am 5ea551e6: (-s ours) am 8264781e: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '5ea551e637835fd607a4953d7db140ddaa793227':
  Import revised translations.  DO NOT MERGE
 2011-03-03 17:25:18 -08:00
satok
65ecb44363 am d145249b: (-s ours) am c91437d3: do not merge: Cherry pick change I878192090 from master. 
* commit 'd145249b4f7b32cd7f78899fd64ebb91e42389ef':
  do not merge: Cherry pick change I878192090 from master.
 2011-03-03 17:25:12 -08:00
Carl Shapiro
332abc3055 Merge "Fix a compare of JNI references to use IsSameObject." 2011-03-03 17:17:43 -08:00
Lorenzo Colitti
5c1c298054 Merge "Fix IPv6->IPv4 fallback for HTTPS." 2011-03-03 17:04:21 -08:00
Carl Shapiro
375aa0b09b Fix a compare of JNI references to use IsSameObject. 
Change-Id: I9932761271034ff5031730874daf7c147b6b008a
 2011-03-03 17:00:38 -08:00
Wink Saville
761c3e67da Merge "ApnSettings: Removal of Enabled, Class and Inactivity Timer." 2011-03-03 16:02:10 -08:00
Eric Fischer
5ea551e637 am 8264781e: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '8264781eb070b980664aa3994b162886b4a74678':
  Import revised translations.  DO NOT MERGE
 2011-03-03 15:48:55 -08:00
satok
d145249b4f am c91437d3: do not merge: Cherry pick change I878192090 from master. 
* commit 'c91437d38ae14a20046de47831eb0f9bfd329af7':
  do not merge: Cherry pick change I878192090 from master.
 2011-03-03 15:47:43 -08:00
Carl Shapiro
d54952b451 Merge "Establish a global reference before saving a class into a global." 2011-03-03 14:44:50 -08:00
Irfan Sheriff
c0bf067f1c Merge "update current config with dhcp settings" 2011-03-03 14:39:59 -08:00
Andreas Huber
f109c6b5b8 Merge "Reject streaming .mp4 files over http that are not muxed reasonably." 2011-03-03 14:33:25 -08:00
Ramesh Sudini
8c6dc01701 ApnSettings: Removal of Enabled, Class and Inactivity Timer. 
Bug: 3479209
Change-Id: I30e9d2683f3484d70bd3be21f8369788f34ec106
 2011-03-03 14:32:58 -08:00
Andreas Huber
f80e45a60a Reject streaming .mp4 files over http that are not muxed reasonably. 
Audio and video samples must be reasonably close by at any given timestamp,
for now we define "reasonably" as "their offsets must not be more than 1MB apart".

related-to-bug: 3509977
Change-Id: I4c3a2a239bf911306833f3b17b73c9e2f76ab901
 2011-03-03 14:32:05 -08:00
Carl Shapiro
c1318babb4 Establish a global reference before saving a class into a global. 
A local reference is obtained to the string class for the purpose of
using it later in another routine to create string object arrays.
However, the local reference is invalid by the time it is next used.
Making the string class reference a global reference eliminates the
problem.

Change-Id: I8a04642e0ed3060f2fff2cb63996559f004aacff
 2011-03-03 14:22:28 -08:00
Eric Fischer
8264781eb0 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-03 14:21:32 -08:00
Carl Shapiro
6c3fd82107 Merge "Eliminate an assignment of a local reference to a global variable." 2011-03-03 14:13:09 -08:00
Eric Fischer
0472beb907 Import revised translations. DO NOT MERGE 
Change-Id: Ifc18c6e4f53be86b699f3485d94fb6312cf0d909
 2011-03-03 14:05:57 -08:00
Carl Shapiro
b16f769277 Eliminate an assignment of a local reference to a global variable. 
Change-Id: I8850685698d228658387afe6145e42ade0458e74
 2011-03-03 14:04:59 -08:00
satok
c91437d38a do not merge: Cherry pick change I878192090 from master. 
A test for system properties

Change-Id: Id28da70b8e333ca83129c2b7b7aed2ddf9adf51c
 2011-03-03 13:54:38 -08:00
Leon Scroggins
2c219c1d32 Merge "Assets for WebView buttons." 2011-03-03 12:33:34 -08:00
Fabrice Di Meglio
1eb1293732 Merge "Add TextLayout Cache" 2011-03-03 12:21:15 -08:00
Irfan Sheriff
52b37f0070 update current config with dhcp settings 
After DHCP completes, update the current configured
networks list with the IP setting details

Change-Id: Ied0215ba397efb1182800f1c9a8320fef1c6b319
 2011-03-03 12:14:28 -08:00
Mike Lockwood
84af86c4dd am 43f0640f: (-s ours) am d948b85d: (-s ours) am 611af238: DO NOT MERGE: UsbManager: Don\'t display activity picker if there are no apps available for an accessory 
* commit '43f0640fbf476404139eb8a196465000933da4ef':
  DO NOT MERGE: UsbManager: Don't display activity picker if there are no apps available for an accessory
 2011-03-03 11:46:51 -08:00
Mike Lockwood
774d6ca196 am 86f1c4d3: (-s ours) am e91e5f6e: (-s ours) am c9ac3f51: Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect" into gingerbread 
* commit '86f1c4d3ba53ea11484628081e8e49ca86e897b9':
  DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect
 2011-03-03 11:46:48 -08:00
Scott Main
72614ea2c0 am 6c8d7652: am f1d8e049: docs: fix error in themes doc 
* commit '6c8d76527c938eb49182a6fd0677ccbc1618e7a8':
  docs: fix error in themes doc
 2011-03-03 11:46:37 -08:00
Mike Lockwood
43f0640fbf am d948b85d: (-s ours) am 611af238: DO NOT MERGE: UsbManager: Don\'t display activity picker if there are no apps available for an accessory 
* commit 'd948b85dc9d0362a2ba0f7a3b905be0107a948f4':
  DO NOT MERGE: UsbManager: Don't display activity picker if there are no apps available for an accessory
 2011-03-03 11:42:13 -08:00
Mike Lockwood
86f1c4d3ba am e91e5f6e: (-s ours) am c9ac3f51: Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect" into gingerbread 
* commit 'e91e5f6e9db4db5cd53836c901a7f80c11abb55c':
  DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect
 2011-03-03 11:42:05 -08:00
Leon Scroggins
96d2d3cd75 Assets for WebView buttons. 
Bug:3009375
Change-Id: I1481f0c67520ffc2959957c2d39d0d7df6ce884e
 2011-03-03 14:38:04 -05:00
Stephen Hines
30cabcc18f Merge "Almost all warnings are now errors in RS build." 2011-03-03 10:34:25 -08:00
Stephen Hines
f7d75b34d4 Merge "Fix typos in RenderScript docs." 2011-03-03 10:34:03 -08:00
Scott Main
6c8d76527c am f1d8e049: docs: fix error in themes doc 
* commit 'f1d8e04912b6a4031e0d1f129c231de869852a04':
  docs: fix error in themes doc
 2011-03-03 10:06:20 -08:00
Scott Main
f1d8e04912 docs: fix error in themes doc 
Change-Id: If11f609fe544700273bc206b2710aa14164b70b1
 2011-03-03 09:28:21 -08:00
Leon Scroggins
b80cb0c5d4 Merge "Move NinePatchPeeker into its own file." 2011-03-03 09:13:22 -08:00
Leon Scroggins
a06d86ab81 Move NinePatchPeeker into its own file. 
This way it can be used by other clients that want to draw
ninepatches.  Ultimately the goal is to allow ninepatch
drawing from native code for WebView.  Bug:3009375

Change-Id: Id13cef17ed7655a07e9f055586b686cf1e4af392
 2011-03-03 11:40:39 -05:00
Robert Greenwalt
6812b2d84f Merge "Clean up LTE code change" 2011-03-03 08:33:54 -08:00
Robert Greenwalt
b9aa8e50e1 Merge "Add some input checking to prevent problems" 2011-03-03 08:32:53 -08:00
Jeff Brown
4b03bb50f9 Merge "Recognize 3D joysticks." 2011-03-03 03:40:34 -08:00
Jeff Brown
e7b2029a0b Recognize 3D joysticks. 
Change-Id: Ie4eae09c0334f69c2ccfcf7eaede075f9ba02eab
 2011-03-03 03:39:29 -08:00
satok
77459184cc Merge "Add tests for SystemProperties.java" 2011-03-03 02:56:00 -08:00
Jeff Brown
1bc593efeb Merge "Fix off by one errors in touch motion ranges." 2011-03-03 02:41:36 -08:00
satok
edd767d777 Add tests for SystemProperties.java 
Change-Id: I878192090848d2c811444a135ec9d8ae6c578ec3
 2011-03-03 02:37:36 -08:00
Jeff Brown
d41cff2d3a Fix off by one errors in touch motion ranges. 
Report inclusive minimum and maximum ranges for all
axes including X and Y.

Set mouse pointer bounds to 0..width-1, 0..height-1.

Rotate touch and mouse positions more carefully, paying attention
to the maximum bounds when calculating the complement of an axis.

Simplified the InputReader somewhat and removed support for a
couple of poorly defined input device configuration parameters.
We now assume that the touch device provides useful absolute axis
ranges for the X and Y axes since the alternative does not actually
make sense.

Bug: 3413541
Change-Id: I682ce3729e4473de7f1bcf8addb49a3f4484126f
 2011-03-03 02:28:51 -08:00
Bjorn Bringert
268c7111f6 Merge "Pass AppData to the app from SearchDialog queries." 2011-03-03 00:18:23 -08:00
Bjorn Bringert
4a85a7dc84 Merge "A Java implementation of the SearchBox API." 2011-03-03 00:11:25 -08:00
Bjorn Bringert
1dda71ae36 Merge "Fixed NPE in ActivityManager's launch count service." 2011-03-03 00:10:03 -08:00
Ray Chen
a2c322f599 3406494 Gallery photos in nonsensical order 
Change-Id: Ic992465a6683179bff280753dcaf9aa6372424e6
 2011-03-03 15:04:57 +08:00
Jeff Brown
ee57adc238 Merge "Add new ViewConfiguration accessors for key repeat parameters." 2011-03-02 22:51:50 -08:00
Jeff Brown
9225b00a3d Add new ViewConfiguration accessors for key repeat parameters. 
Change-Id: I18ea2c510dc85c8f9b68727657ba74298342dd43
 2011-03-02 22:50:35 -08:00
Dianne Hackborn
63e1cea248 Merge "Fix issue #3485923: Gmail crash" 2011-03-02 22:44:55 -08:00
Dianne Hackborn
6482517101 Fix issue #3485923: Gmail crash 
Allow application to try to recover if a surface OOM error
happens on the client side.

Change-Id: I0308bd99647a35e4bcac448340b7fc6330a828f6
 2011-03-02 22:38:58 -08:00