46334 Commits

Author SHA1 Message Date
Stephen Hines
e5841d7538 am 3080b85c: Merge "DO NOT MERGE: Fix typos in RenderScript docs." into honeycomb-mr1
* commit '3080b85c2ef8846099ae86cd8fea65592a6a591d':
  DO NOT MERGE: Fix typos in RenderScript docs.
2011-03-04 00:15:59 -08:00
Eric Fischer
f4c0a050c7 am 6c935e63: Merge "Remove unneeded large-screen-specific translations." into honeycomb-mr1
* commit '6c935e634844055b3e6a4deed64d6e3dc816d1c5':
  Remove unneeded large-screen-specific translations.
2011-03-04 00:15:54 -08:00
Shimeng (Simon) Wang
cb7f5187d3 am 6cc2bbe5: Merge "Shorten the animation length to make it snappier." into honeycomb-mr1
* commit '6cc2bbe5cf8c959239d35972c0acac494e5c1559':
  Shorten the animation length to make it snappier.
2011-03-04 00:15:48 -08:00
Adam Powell
89b1c37127 am 580cde18: Merge "Fix bug 3506261 - Theme attributes and placeholder assets to support selection action modes" into honeycomb-mr1
* commit '580cde18619be70d3fe296c83360bf52772af636':
  Fix bug 3506261 - Theme attributes and placeholder assets to support selection action modes
2011-03-04 00:15:41 -08:00
Adam Powell
1a510ea1fd am 789ff0a1: Merge "Fix bug 3505901 - SeekBar should account for thumb width in layout" into honeycomb-mr1
* commit '789ff0a13b9bbb69ead32d0084ec9e058061f419':
  Fix bug 3505901 - SeekBar should account for thumb width in layout
2011-03-04 00:15:35 -08:00
Irfan Sheriff
f5949e0ed1 am 9c8de733: Merge "DO NOT MERGE update current config with dhcp settings" into honeycomb-mr1
* commit '9c8de7331475ef6f55449d95d0dfc6dcb425d116':
  DO NOT MERGE update current config with dhcp settings
2011-03-04 00:15:28 -08:00
Ed Heyl
40c337f1ea Merge branch 'master' into honeycomb-plus-aosp 2011-03-03 21:49:11 -08:00
Jeff Brown
503c460056 am 9503e8bc: (-s ours) am e23c235c: Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread
* commit '9503e8bc17d72d16631e8d79e8d1c29702fc1e42':
  Only set KeyEvent long press flag when repeat count equals 1.
2011-03-03 18:45:18 -08:00
Svetoslav Ganov
5a2c6fbf84 am e70c6607: Merge "NPE in in AppGlobals#getIntCoreSetting" into honeycomb-mr1
* commit 'e70c6607e0316fe390d52a544f6832c60223881f':
  NPE in in AppGlobals#getIntCoreSetting
2011-03-03 17:37:20 -08:00
Stephen Hines
3080b85c2e Merge "DO NOT MERGE: Fix typos in RenderScript docs." into honeycomb-mr1 2011-03-03 16:12:08 -08:00
Stephen Hines
8cecbb5293 DO NOT MERGE: Fix typos in RenderScript docs.
Change-Id: Ie5f326c5c682ca7b604328ab25d7402cf01f7890
2011-03-03 16:10:52 -08:00
Eric Fischer
6c935e6348 Merge "Remove unneeded large-screen-specific translations." into honeycomb-mr1 2011-03-03 16:03:20 -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
Eric Fischer
24be6f9b06 Remove unneeded large-screen-specific translations.
Change-Id: Ifb55c466fbd6450504c2111193ce3049ccd99425
2011-03-03 15:47: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
Shimeng (Simon) Wang
6cc2bbe5cf Merge "Shorten the animation length to make it snappier." into honeycomb-mr1 2011-03-03 15:39:18 -08:00
Shimeng (Simon) Wang
47e57fd18f Shorten the animation length to make it snappier.
This is double tap zoom animation.

issue: 3509451
Change-Id: Ibc09eb95f3e1aa6874e8182f811829ce3da7179d
2011-03-03 15:29:27 -08:00
Adam Powell
580cde1861 Merge "Fix bug 3506261 - Theme attributes and placeholder assets to support selection action modes" into honeycomb-mr1 2011-03-03 15:13:04 -08:00
Adam Powell
789ff0a13b Merge "Fix bug 3505901 - SeekBar should account for thumb width in layout" into honeycomb-mr1 2011-03-03 15:12:02 -08:00
Adam Powell
0e37f21ca3 Fix bug 3505901 - SeekBar should account for thumb width in layout
Change-Id: Id69ba32c9d79adbb54c85192926659bc5142fdbd
2011-03-03 15:08:45 -08:00
Jeff Brown
9503e8bc17 am e23c235c: Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread
* commit 'e23c235c662c3028cfb080c6ed60d7defcdd0b69':
  Only set KeyEvent long press flag when repeat count equals 1.
2011-03-03 15:03:26 -08:00
Irfan Sheriff
9c8de73314 Merge "DO NOT MERGE update current config with dhcp settings" into honeycomb-mr1 2011-03-03 15:01:53 -08:00
Irfan Sheriff
84cffa4526 DO NOT MERGE update current config with dhcp settings
After DHCP completes, update the current configured
networks list with the IP setting details

Change-Id: I1ece1eda20224c69a4635bd38fdc5bef15818bb2
2011-03-03 15:00:51 -08:00
Jeff Brown
e23c235c66 Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread 2011-03-03 14:42:14 -08:00
Adam Powell
c39a659fd7 Fix bug 3506261 - Theme attributes and placeholder assets to support
selection action modes

The assets involved in this CL are placeholders to be replaced later.

Change-Id: Id4358adcf2777ecbebf0e61c286a8c2a1e897a75
2011-03-03 14:27:50 -08:00
Svetoslav Ganov
e70c6607e0 Merge "NPE in in AppGlobals#getIntCoreSetting" into honeycomb-mr1 2011-03-03 14:25:13 -08:00
Eric Fischer
8264781eb0 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-03 14:21:32 -08:00
Eric Fischer
0472beb907 Import revised translations. DO NOT MERGE
Change-Id: Ifc18c6e4f53be86b699f3485d94fb6312cf0d909
2011-03-03 14:05:57 -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
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
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
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