Michael Kolb
d7e80b9d50
Merge "fix NPE in getSearchBox" into honeycomb-mr1
2011-03-03 17:16:10 -08:00
Michael Kolb
b748186c70
fix NPE in getSearchBox
...
Bug: 3510741
added null check
Change-Id: I256375b2168942f0b4b700912f2f2ae40ce90492
2011-03-03 17:09:27 -08:00
Ken Wakasa
a7001ee8b6
Merge "Append IME's name to the subtype name in the "Select input method" dialog" into honeycomb-mr1
2011-03-03 17:02:47 -08:00
Ken Wakasa
81f6e3d8d2
Append IME's name to the subtype name in the "Select input method" dialog
...
bug: 3364167
Change-Id: I79b5435ec457e9e71ae69dbfaad8e719db6ff6d3
2011-03-04 09:59:52 +09:00
Stephen Hines
6e71c954fa
Merge "DO NOT MERGE: Almost all warnings are now errors in RS build." into honeycomb-mr1
2011-03-03 16:14:00 -08:00
Wink Saville
389bf4f734
Merge "DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-mr1
2011-03-03 16:13:07 -08:00
Stephen Hines
1bf1f8df17
DO NOT MERGE: Almost all warnings are now errors in RS build.
...
Change-Id: Ie4952cdf5c75bf1b7a7899a32b3b1f8747686356
2011-03-03 16:12:43 -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
24be6f9b06
Remove unneeded large-screen-specific translations.
...
Change-Id: Ifb55c466fbd6450504c2111193ce3049ccd99425
2011-03-03 15:47:55 -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
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
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
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
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
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
Jeff Brown
82c67db3a2
Merge "Only set KeyEvent long press flag when repeat count equals 1."
2011-03-02 21:30:25 -08:00
Daniel Sandler
134fa4489e
Merge "Pressed states for the notification panel's title area."
2011-03-02 21:20:08 -08:00
Daniel Sandler
8f491b5fbc
Pressed states for the notification panel's title area.
...
Finally, some feedback that you can tap on the thing.
Also tweak the veto press state PNG so you can see that it
has a pressed state.
Bug: 3328753
Change-Id: I5c3b826fae66e480784477f844c6585bef1a0b60
2011-03-03 00:18:44 -05:00
Mike Lockwood
cb067ef52a
UsbManager: Don't display activity picker if there are no apps available for a device
...
BUG: 3506988
Change-Id: Iaf3c50b9ba422e6bcd687338db996a4193441c97
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-02 21:10:07 -08:00