Commit Graph

31125 Commits

Author SHA1 Message Date
Dianne Hackborn
661f883880 am f8b8a3fa: Refector preferred activity code out of package manager.
* commit 'f8b8a3fa955b545843ca264428c620b67c2a5359':
  Refector preferred activity code out of package manager.
2011-03-04 00:22:40 -08:00
Dianne Hackborn
17bd93939a am 48f91e35: Merge "Fix Fragment.onInflate() to actually work correctly." into honeycomb-mr1
* commit '48f91e35c5188f3dc78c12b8e8638a248221691b':
  Fix Fragment.onInflate() to actually work correctly.
2011-03-04 00:16:57 -08:00
Svetoslav Ganov
3c154c56df am 1e158e9c: Merge "Propagating core settings to the system process." into honeycomb-mr1
* commit '1e158e9ce78c25dc5de402f14654a8955de7fddc':
  Propagating core settings to the system process.
2011-03-04 00:16:53 -08:00
Rebecca Schultz Zavin
0da6dab937 am 327e94da: Merge "set max_events_per_sec to 55" into honeycomb-mr1
* commit '327e94daff12ab4ac4da61a3ea802f3f225d1b3a':
  set max_events_per_sec to 55
2011-03-04 00:16:49 -08:00
Rebecca Schultz Zavin
a1e348793d am 72b3524e: Merge "Set last event time to previous event batch delivery time to apps" into honeycomb-mr1
* commit '72b3524eef79abc6680aae713b270cbf3d88be6c':
  Set last event time to previous event batch delivery time to apps
2011-03-04 00:16:45 -08:00
satok
781e9d4afc am 73016396: Merge "Add a test for persist properties settings" into honeycomb-mr1
* commit '73016396993efaa7b4bc23b5e8bf198deb230a2a':
  Add a test for persist properties settings
2011-03-04 00:16:32 -08:00
Christopher Tate
e26442d949 am 87ed42d0: Merge "Don\'t spuriously time out restore sessions" into honeycomb-mr1
* commit '87ed42d065653aa30b2d1b8b220b75375cf9af30':
  Don't spuriously time out restore sessions
2011-03-04 00:16:27 -08:00
Michael Kolb
ffd51f5638 am d7e80b9d: Merge "fix NPE in getSearchBox" into honeycomb-mr1
* commit 'd7e80b9d5046603ac4a36ea74e204a2ad70a4dca':
  fix NPE in getSearchBox
2011-03-04 00:16:22 -08:00
Ken Wakasa
ae19cefe3e am a7001ee8: Merge "Append IME\'s name to the subtype name in the "Select input method" dialog" into honeycomb-mr1
* commit 'a7001ee8b60d66c25de69c8496108c40a0f2df88':
  Append IME's name to the subtype name in the "Select input method" dialog
2011-03-04 00:16:16 -08:00
Stephen Hines
96b197ace2 am 6e71c954: Merge "DO NOT MERGE: Almost all warnings are now errors in RS build." into honeycomb-mr1
* commit '6e71c954faff34b78a2952436b4f48d84a8c20cd':
  DO NOT MERGE: Almost all warnings are now errors in RS build.
2011-03-04 00:16:11 -08:00
Wink Saville
41b12cc6e5 am 389bf4f7: Merge "DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-mr1
* commit '389bf4f734f1820e31f8807d117b6b15ded9ff8b':
  DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
2011-03-04 00:16:05 -08:00
Stephen Hines
e23573e745 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
bc3d746f9e 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
7074b1b624 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
ba5f27fab4 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
8562ecd84f 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
a9e7cd1efe 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
Dianne Hackborn
eb612b3e62 Merge "Fix Fragment.onInflate() to actually work correctly." into honeycomb-mr1 2011-03-03 22:23:07 -08:00
Ed Heyl
59156b7a91 Merge branch 'master' into honeycomb-plus-aosp 2011-03-03 21:49:11 -08:00
Svetoslav Ganov
b257d9463e Merge "Propagating core settings to the system process." into honeycomb-mr1 2011-03-03 20:28:59 -08:00
Jeff Brown
d5f74f4fa0 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
Rebecca Schultz Zavin
eae813675e Merge "set max_events_per_sec to 55" into honeycomb-mr1 2011-03-03 18:43:04 -08:00
Rebecca Schultz Zavin
a6966d33da Merge "Set last event time to previous event batch delivery time to apps" into honeycomb-mr1 2011-03-03 18:42:55 -08:00
satok
a27bd9a6a9 Merge "Add a test for persist properties settings" into honeycomb-mr1 2011-03-03 17:45:33 -08:00
Svetoslav Ganov
40da09601c 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
Christopher Tate
b32d45f9e1 Merge "Don't spuriously time out restore sessions" into honeycomb-mr1 2011-03-03 17:33:13 -08:00
Michael Kolb
07966c62f1 Merge "fix NPE in getSearchBox" into honeycomb-mr1 2011-03-03 17:16:10 -08:00
Ken Wakasa
a37acda645 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
Stephen Hines
ddd5680e8f 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
cc8b7841d6 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
ca0aad4a3b Merge "DO NOT MERGE: Fix typos in RenderScript docs." into honeycomb-mr1 2011-03-03 16:12:08 -08:00
Eric Fischer
2a6ed6981b Merge "Remove unneeded large-screen-specific translations." into honeycomb-mr1 2011-03-03 16:03:20 -08:00
Eric Fischer
d4fbc14ecb 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
668e2e9847 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
01de8bf052 Merge "Shorten the animation length to make it snappier." into honeycomb-mr1 2011-03-03 15:39:18 -08:00
Adam Powell
43c8a026ad 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
f1ebc42169 Merge "Fix bug 3505901 - SeekBar should account for thumb width in layout" into honeycomb-mr1 2011-03-03 15:12:02 -08:00
Jeff Brown
e572319eaf 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
332f4c5204 Merge "DO NOT MERGE update current config with dhcp settings" into honeycomb-mr1 2011-03-03 15:01:53 -08:00
Jeff Brown
7a1626f037 Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread 2011-03-03 14:42:14 -08:00
Svetoslav Ganov
92b0e11d6a Merge "NPE in in AppGlobals#getIntCoreSetting" into honeycomb-mr1 2011-03-03 14:25:13 -08:00
Eric Fischer
e5bae6fbac Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-03 14:21:32 -08:00
Mike Lockwood
8a993b481f 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
a4c4fbe3b0 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
f039adc726 am f1d8e049: docs: fix error in themes doc
* commit 'f1d8e04912b6a4031e0d1f129c231de869852a04':
  docs: fix error in themes doc
2011-03-03 10:06:20 -08:00
Jeff Brown
b0345f60ba Merge "Recognize 3D joysticks." 2011-03-03 03:40:34 -08:00
satok
4de1ccb8c7 Merge "Add tests for SystemProperties.java" 2011-03-03 02:56:00 -08:00
Jeff Brown
8097fb47cd Merge "Fix off by one errors in touch motion ranges." 2011-03-03 02:41:36 -08:00
Bjorn Bringert
b263d690ff Merge "Pass AppData to the app from SearchDialog queries." 2011-03-03 00:18:23 -08:00
Bjorn Bringert
411dce405e Merge "A Java implementation of the SearchBox API." 2011-03-03 00:11:25 -08:00