46421 Commits

Author SHA1 Message Date
Leon Scroggins
13492c848f Add ifdef to prevent header being added multiple times.
Change-Id: I92bb0667bea98e43fca20dceb4fff20e446c03cf
2011-03-04 13:54:35 -05:00
Leon Scroggins
cdaff15bda Create a RenderSkinButton in UI side.
Part of bug:3009375

Create a RenderSkinButton on the UI side, so that we can
use it to draw buttons and free memory, rather than depend
on globals.

Change-Id: If234ec50c42b5c9d63421ab570ea829ba56db048
2011-03-04 12:58:55 -05:00
Dianne Hackborn
fdcdd418e9 am 54b3cb17: am f8b8a3fa: Refector preferred activity code out of package manager.
* commit '54b3cb170cc8c80b196079131c3a04410cfff035':
  Refector preferred activity code out of package manager.
2011-03-04 01:10:58 -08:00
Dianne Hackborn
79f473e9ff am a6d2c62b: am 48f91e35: Merge "Fix Fragment.onInflate() to actually work correctly." into honeycomb-mr1
* commit 'a6d2c62b58075e338bb08f419ca1567d87d82dd2':
  Fix Fragment.onInflate() to actually work correctly.
2011-03-04 01:01:47 -08:00
Svetoslav Ganov
0dc4f79ba4 am 5f96962c: am 1e158e9c: Merge "Propagating core settings to the system process." into honeycomb-mr1
* commit '5f96962caa23eec25d449e47a2f677d1ff8e53c9':
  Propagating core settings to the system process.
2011-03-04 01:01:44 -08:00
Rebecca Schultz Zavin
7a76e222d7 am 0b20a705: am 327e94da: Merge "set max_events_per_sec to 55" into honeycomb-mr1
* commit '0b20a705babac184754e41919ddbc3b9a3937933':
  set max_events_per_sec to 55
2011-03-04 01:01:39 -08:00
Rebecca Schultz Zavin
7ad1b5e7d5 am bfc385b8: am 72b3524e: Merge "Set last event time to previous event batch delivery time to apps" into honeycomb-mr1
* commit 'bfc385b8c8af76dd42dd851b818574fb1e9347ee':
  Set last event time to previous event batch delivery time to apps
2011-03-04 01:01:35 -08:00
satok
10ea7a464b am 60047431: am 73016396: Merge "Add a test for persist properties settings" into honeycomb-mr1
* commit '6004743184b8b4425f7af46481612b300d72673a':
  Add a test for persist properties settings
2011-03-04 01:01:31 -08:00
Christopher Tate
380be914ff am 0474407e: am 87ed42d0: Merge "Don\'t spuriously time out restore sessions" into honeycomb-mr1
* commit '0474407e5d99d6e78451c66703d2934adca0cec4':
  Don't spuriously time out restore sessions
2011-03-04 01:01:26 -08:00
Michael Kolb
4d94ab40b1 am d8b243fe: am d7e80b9d: Merge "fix NPE in getSearchBox" into honeycomb-mr1
* commit 'd8b243fea28abda8b0a35b4698a7fe72c39fcace':
  fix NPE in getSearchBox
2011-03-04 01:01:21 -08:00
Ken Wakasa
eb375847b2 am 1b3f178f: am a7001ee8: Merge "Append IME\'s name to the subtype name in the "Select input method" dialog" into honeycomb-mr1
* commit '1b3f178f85284c8b87a57596b50366522dea4766':
  Append IME's name to the subtype name in the "Select input method" dialog
2011-03-04 01:01:16 -08:00
Stephen Hines
918cc2c8a2 am 47ffa461: (-s ours) am 6e71c954: Merge "DO NOT MERGE: Almost all warnings are now errors in RS build." into honeycomb-mr1
* commit '47ffa461676cae538fbe10da52f309f6cd24fed9':
  DO NOT MERGE: Almost all warnings are now errors in RS build.
2011-03-04 01:01:10 -08:00
Wink Saville
29ba5c73ca am 5cf1dbec: (-s ours) am 389bf4f7: Merge "DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-mr1
* commit '5cf1dbec1b1d534863f03fc166c7289c4a9d399c':
  DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
2011-03-04 01:01:04 -08:00
Stephen Hines
07617fea01 am e5841d75: (-s ours) am 3080b85c: Merge "DO NOT MERGE: Fix typos in RenderScript docs." into honeycomb-mr1
* commit 'e5841d7538583420d3bad1c77ad428243f7b7054':
  DO NOT MERGE: Fix typos in RenderScript docs.
2011-03-04 01:00:59 -08:00
Eric Fischer
5ef7449d28 am f4c0a050: am 6c935e63: Merge "Remove unneeded large-screen-specific translations." into honeycomb-mr1
* commit 'f4c0a050c7f474529269f94418a4c4d2960c6752':
  Remove unneeded large-screen-specific translations.
2011-03-04 01:00:52 -08:00
Shimeng (Simon) Wang
d60cb66551 am cb7f5187: am 6cc2bbe5: Merge "Shorten the animation length to make it snappier." into honeycomb-mr1
* commit 'cb7f5187d37d70786c03d5531b36f7fc3bf7c129':
  Shorten the animation length to make it snappier.
2011-03-04 01:00:46 -08:00
Adam Powell
548b890a33 am 89b1c371: am 580cde18: Merge "Fix bug 3506261 - Theme attributes and placeholder assets to support selection action modes" into honeycomb-mr1
* commit '89b1c37127f1c60f80e52887cccd0bf72edf5e0c':
  Fix bug 3506261 - Theme attributes and placeholder assets to support selection action modes
2011-03-04 01:00:39 -08:00
Adam Powell
f22f924eb7 am 1a510ea1: am 789ff0a1: Merge "Fix bug 3505901 - SeekBar should account for thumb width in layout" into honeycomb-mr1
* commit '1a510ea1fdbf23931ea6fa7d97c5b435454c574d':
  Fix bug 3505901 - SeekBar should account for thumb width in layout
2011-03-04 01:00:32 -08:00
Irfan Sheriff
adea5d8c7a am f5949e0e: (-s ours) am 9c8de733: Merge "DO NOT MERGE update current config with dhcp settings" into honeycomb-mr1
* commit 'f5949e0ed1cd15c9535a07181fe58dc3f240767e':
  DO NOT MERGE update current config with dhcp settings
2011-03-04 01:00:21 -08:00
Dianne Hackborn
54b3cb170c 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
a6d2c62b58 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
5f96962caa 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
0b20a705ba 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
bfc385b8c8 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
6004743184 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
0474407e5d 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
d8b243fea2 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
1b3f178f85 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
47ffa46167 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
5cf1dbec1b 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
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
Dianne Hackborn
f8b8a3fa95 Refector preferred activity code out of package manager.
This may be useful for others...  such as USB preferred devices, maybe?

Change-Id: I204081e2c84ccff6982a500baaf3540a80839a4b
2011-03-04 00:08:04 -08:00
Ed Heyl
a854544e8d Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-03-03 22:26:06 -08:00
Dianne Hackborn
48f91e35c5 Merge "Fix Fragment.onInflate() to actually work correctly." into honeycomb-mr1 2011-03-03 22:23:07 -08:00
Dianne Hackborn
e3a7f628c6 Fix Fragment.onInflate() to actually work correctly.
Like, um, it needs to be given the Activity since this is called before
the activity is attached.

And it was called after the entire fragment and its *view* was created
when being restored from saved state.

And the documentation was whacked.

Also fix the IME selector to dismiss when you tap outside of it.

Change-Id: Icbcafe7558965a570bdef9cda3441b1f0f7a317c
2011-03-03 22:17:16 -08:00
Ed Heyl
40c337f1ea Merge branch 'master' into honeycomb-plus-aosp 2011-03-03 21:49:11 -08:00
Svetoslav Ganov
1e158e9ce7 Merge "Propagating core settings to the system process." into honeycomb-mr1 2011-03-03 20:28:59 -08:00
Jeff Brown
3724a24502 am 503c4600: am 9503e8bc: (-s ours) am e23c235c: Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread
* commit '503c4600568dba7d120e8890a78a492211c2ad12':
  Only set KeyEvent long press flag when repeat count equals 1.
2011-03-03 18:49:24 -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
Rebecca Schultz Zavin
327e94daff Merge "set max_events_per_sec to 55" into honeycomb-mr1 2011-03-03 18:43:04 -08:00
Rebecca Schultz Zavin
72b3524eef Merge "Set last event time to previous event batch delivery time to apps" into honeycomb-mr1 2011-03-03 18:42:55 -08:00
Svetoslav Ganov
e5f823ccf1 am 5a2c6fbf: am e70c6607: Merge "NPE in in AppGlobals#getIntCoreSetting" into honeycomb-mr1
* commit '5a2c6fbf847af971457f014ce7073812c9dd31e7':
  NPE in in AppGlobals#getIntCoreSetting
2011-03-03 18:22:29 -08:00
Svetoslav Ganov
9aa597e68b Propagating core settings to the system process.
bug:3511123

Now the core settins are stored in the ActivityThread
instad in the AppBindData of the currently bound app.
Also the settings are pushed to the system process on
init.

Change-Id: I100bb7dc80d0d4548def22c328427bbef1694eb7
2011-03-03 18:20:43 -08:00
satok
7301639699 Merge "Add a test for persist properties settings" into honeycomb-mr1 2011-03-03 17:45:33 -08:00
satok
656f7a729f Add a test for persist properties settings
Change-Id: I7bf70104a8cadc739a79d3d855d276628655883c
2011-03-03 17:42:40 -08:00