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
Svetoslav Ganov
11e515cbef
NPE in in AppGlobals#getIntCoreSetting
...
bug:3508658
It ActivityThread#currentActivityThread() is called when
the ActivityThread is not attached it returns null and
AppGlobals#getIntCoreSetting was not checking for that.
Change-Id: I5e00d1947a161ad1e52ecfaa12cbbac3b534a0db
2011-03-03 12:55:59 -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
Wink Saville
eca208fae6
DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
...
This reverts commit 2b8bcfe5b74e1a34d136f4ff46e3c94397f38f82.
Change-Id: Ifc4e9aaccb54e065a36380710694cd6e4d347636
2011-03-03 09:53:52 -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
Eric Fischer
ef83a3d591
am 6498f2fe: (-s ours) am 190586b7: Import revised translations. DO NOT MERGE
...
* commit '6498f2fed29042cce29faadcf0cc6b74180e1ba0':
Import revised translations. DO NOT MERGE
Initialize mRetyMgr when constructing GsmDataConnectionTracker.
2011-03-02 22:26:51 -08:00
Patrick Dubroy
89d576d63d
Merge "Make sure we send a cancel event on system bar keys."
2011-03-02 22:19:31 -08:00
Patrick Dubroy
5ee1a3daf0
Make sure we send a cancel event on system bar keys.
...
Change-Id: Ia444a7cb1ff56ab5d063995bd467fc4b4169985f
2011-03-02 22:13:51 -08:00
Simon Wilson
d984ba1320
am df58a1bb: am 3d79f1ce: am edc68a00: Merge "Attempt to reduce problems from issue #3183612 " into gingerbread
...
* commit 'df58a1bbf8d7f6608848eae4d5d48dcff137dc8c':
Attempt to reduce problems from issue #3183612
2011-03-02 22:11:19 -08:00
Mike Lockwood
c00e9bffc8
am 093430fd: (-s ours) am b13581a9: (-s ours) am 1110748b: DO NOT MERGE: USB accessory support library
...
* commit '093430fd5dbbdc6f5e0de6f25f6f9bb381cdd239':
DO NOT MERGE: USB accessory support library
2011-03-02 22:11:14 -08:00
Mike Lockwood
e0cbec59f3
am 17fc2ce4: (-s ours) am 7866be2b: (-s ours) am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread
...
* commit '17fc2ce479b70a539cf3aaf0e89829ad6eedc2b6':
DO NOT MERGE: Backport USB accessory support to gingerbread
2011-03-02 22:11:07 -08:00
Mike Lockwood
d948b85dc9
am 611af238: DO NOT MERGE: UsbManager: Don\'t display activity picker if there are no apps available for an accessory
...
* commit '611af238185cf924a425a1a2154b8439b8f8d7a5':
DO NOT MERGE: UsbManager: Don't display activity picker if there are no apps available for an accessory
2011-03-02 22:07:59 -08:00
Mike Lockwood
611af23818
DO NOT MERGE: UsbManager: Don't display activity picker if there are no apps available for an accessory
...
Change-Id: I1aa578887e42aef375211eadece4c1fddaf234f8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-02 22:00:59 -08:00
Mike Lockwood
4c384fdd9f
Merge " UsbManager: Don't display activity picker if there are no apps available for an accessory"
2011-03-02 22:00:02 -08:00
Mike Lockwood
805b6bbea9
UsbManager: Don't display activity picker if there are no apps available for an accessory
...
Change-Id: I3ef569121e8d7d45584dbca9761451cbdf99a3e9
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-02 21:53:39 -08:00
Jeff Brown
570d2dfbbc
Merge "Get key repeat timeout and delay from ViewConfiguration."
2011-03-02 21:43:40 -08:00
Mike Lockwood
fe87916f04
Merge "UsbManager: Don't display activity picker if there are no apps available for a device"
2011-03-02 21:41:53 -08:00
Jeff Brown
a454767b09
Get key repeat timeout and delay from ViewConfiguration.
...
Replaces previously hardcoded values. This ensures that key repeat
takes the accessibility long press timeout setting into account.
Unfortunately the system must be rebooted for the change to take
effect. We will fix that later.
Change-Id: I3ab70bb037331620b7e532170c1727287b5c6f91
2011-03-02 21:38:11 -08:00