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
Jean-Michel Trivi
708b47d1ec
Fix bug 3511256 invalid TTS parameter cache size
...
The NB_CACHED_PARAMS is the number of cached parameters, not
the size of the array for cached parameters.
Change-Id: I3d3053bbf247f3f89ae1ea07a931d33df7857a7c
2011-03-03 18:55:19 -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
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
Christopher Tate
87ed42d065
Merge "Don't spuriously time out restore sessions" into honeycomb-mr1
2011-03-03 17:33:13 -08:00
Christopher Tate
2a935096db
Don't spuriously time out restore sessions
...
If a restore set lookup took a long time, the client's restore
session could be declared timed out even though the client was
not at fault. Handle this properly by resetting the timeout clock
when control of the session is returned to the client.
Bug 3477324
Change-Id: I43afaf1063e8e706ef16b70be77f9eeeea6a321f
2011-03-03 17:30:32 -08:00
Eric Fischer
07ca17040a
am 5ea551e6: (-s ours) am 8264781e: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '5ea551e637835fd607a4953d7db140ddaa793227':
Import revised translations. DO NOT MERGE
2011-03-03 17:25:18 -08:00
satok
65ecb44363
am d145249b: (-s ours) am c91437d3: do not merge: Cherry pick change I878192090 from master.
...
* commit 'd145249b4f7b32cd7f78899fd64ebb91e42389ef':
do not merge: Cherry pick change I878192090 from master.
2011-03-03 17:25:12 -08:00
Carl Shapiro
332abc3055
Merge "Fix a compare of JNI references to use IsSameObject."
2011-03-03 17:17:43 -08:00
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
makarand.karvekar
88dd6e665a
set max_events_per_sec to 55
...
reduce touch lag.
no Dispatcher fix w/throttle at 60: 75.9ms (range is 71.4ms - 80.1ms)
InputDispatcher fix w/throttle at 60: 49.0ms (range is 38.1ms - 66.7ms)
InputDispatcher fix w/throttle at 55: 41.2ms (range is 28.6ms - 66.7ms)
Change-Id: I76c0ba83abcd6a3d408a29ec76997a2e07e48a70
Signed-off-by: makarand.karvekar <makarand.karvekar@motorola.com>
2011-03-03 17:04:21 -08:00
Lorenzo Colitti
5c1c298054
Merge "Fix IPv6->IPv4 fallback for HTTPS."
2011-03-03 17:04:21 -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
makarand.karvekar
f634ded277
Set last event time to previous event batch delivery time to apps
...
Determination of the last event time. Currently, uses
the time that the first event in the previous batch that
was sent from hardware. This produces inconsistent timing
intervals for event delivery to apps. Now, use the time that the
previous batch was delivered to the application.
Original Author: Stephen Moore <steve.moore@motorola.com>
Signed-off-by: makarand.karvekar <makarand.karvekar@motorola.com>
Change-Id: I2a3701915702d622dc04fbf4bbd4918a9ebe8856
2011-03-03 17:01:43 -08:00
Carl Shapiro
375aa0b09b
Fix a compare of JNI references to use IsSameObject.
...
Change-Id: I9932761271034ff5031730874daf7c147b6b008a
2011-03-03 17:00:38 -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
Scott Main
c44f3907c4
docs: add redirects for preview docs
...
Change-Id: Iafdaa10ea305aad3faa24e3a07ea8c2be06442f1
2011-03-03 16:50:53 -08: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
Wink Saville
761c3e67da
Merge "ApnSettings: Removal of Enabled, Class and Inactivity Timer."
2011-03-03 16:02:10 -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
Carl Shapiro
d54952b451
Merge "Establish a global reference before saving a class into a global."
2011-03-03 14:44:50 -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
Leon Scroggins
e11ce83a96
Use the same width as the TextView created layout.
...
Bug:3509684
Change-Id: I5fd1e3e73a07a6049eb8336339a1100e2a5f7018
2011-03-03 17:41:54 -05:00