Konstantin Lopyrev
0dc407f9a6
Merge "Fix 2673731: Added password history"
2010-05-12 18:01:41 -07:00
Konstantin Lopyrev
863f22d045
Fix 2673731: Added password history
...
Change-Id: I88919357abea31062caf96b214823b03cbaa15a4
2010-05-12 17:17:53 -07:00
Romain Guy
d4a2fffefd
Merge "Fix dump of the persistent drawing cache attribute."
2010-05-12 15:42:15 -07:00
Romain Guy
203688c657
Fix dump of the persistent drawing cache attribute.
...
Change-Id: I351028f6e0858c9ebf7f59bd6cc964925bc3e2b9
2010-05-12 15:41:32 -07:00
Grace Kloba
f0cec93f69
am d4ef2973: am 2fb3b394: am bfc63c7b: am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog
2010-05-12 15:39:26 -07:00
Grace Kloba
2fb3b394fb
am bfc63c7b: am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly.
...
Merge commit 'bfc63c7b83160fd3e771e5187d317348e72d6c27' into kraken
* commit 'bfc63c7b83160fd3e771e5187d317348e72d6c27':
The default AlertDialog allows cancel. But the default
2010-05-12 15:35:37 -07:00
Grace Kloba
bfc63c7b83
am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly.
...
Merge commit '336d7dcb105a43ee4de51fd0f26f277c63662f02' into froyo-plus-aosp
* commit '336d7dcb105a43ee4de51fd0f26f277c63662f02':
The default AlertDialog allows cancel. But the default
2010-05-12 15:33:30 -07:00
The Android Open Source Project
381b55863e
am 7cd6ca9b: am d6e24ca2: am 4adacd23: merge from open-source master
2010-05-12 15:25:07 -07:00
The Android Open Source Project
d6e24ca28b
am 4adacd23: merge from open-source master
...
Merge commit '4adacd23d4c91569b16fe50419f1a91f68d805bd' into kraken
* commit '4adacd23d4c91569b16fe50419f1a91f68d805bd':
Add support for EVDO Rev B
2010-05-12 14:56:00 -07:00
The Android Open Source Project
4adacd23d4
merge from open-source master
...
Change-Id: If6730b50627b2231bd345e594d8d30a37557849e
2010-05-12 14:53:25 -07:00
Grace Kloba
336d7dcb10
The default AlertDialog allows cancel. But the default
...
JSConfim doesn't have a cancel listener. So when
user cancel the dialog, we do not wake up the WebCoreThread.
The same code is already done for JSPrompt dialog correctly.
Fix http://b/issue?id=2679139
2010-05-12 14:28:07 -07:00
Brett Chabot
00f88a950b
Merge "Skip ActivityWaiter synchronization on Instrumentation.callActivityOnDestroy"
2010-05-12 14:26:10 -07:00
Brett Chabot
18f9ce0dc1
Skip ActivityWaiter synchronization on Instrumentation.callActivityOnDestroy
...
Temporary workaround for bug 2630683
Change-Id: Ie9ee922dd1f515fc273cb602cb649174e3b8ae6f
2010-05-12 14:24:47 -07:00
Leon Scroggins
2c8e051508
Remove text options when longpressing off a textfield.
...
Bug 2676172
Change-Id: Ib1eff9a6e7a8ff3e83897a89b6bb4fab9bb7b0c4
2010-05-12 14:45:49 -04:00
Costin Manolache
3a17fbb757
am b20842c7: am 8579a4d7: am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
2010-05-12 09:24:20 -07:00
Costin Manolache
8579a4d726
am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
...
Merge commit '625de488973f262e56d3ee6825a8cf1ebaee089b' into kraken
* commit '625de488973f262e56d3ee6825a8cf1ebaee089b':
Bug 2673557 : rename datamessaging
2010-05-12 07:55:32 -07:00
Costin Manolache
625de48897
am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
...
Merge commit 'e2055fe4258f8085a88328579c852ec26d77bb10' into froyo-plus-aosp
* commit 'e2055fe4258f8085a88328579c852ec26d77bb10':
Bug 2673557 : rename datamessaging
2010-05-12 07:49:16 -07:00
Jeff Hamilton
e890bec743
Merge "Add Activity.isChangingConfiguration()."
2010-05-11 21:45:19 -07:00
Leon Scroggins
810f5ccb99
Remove unnecessary calls to rebuildWebTextView.
...
Bug 2674635
Change-Id: Ib33a5486b880868de7182c36a22f204383c58149
2010-05-11 15:20:13 -04:00
Costin Manolache
e2055fe425
Merge "Bug 2673557: rename datamessaging" into froyo
2010-05-11 11:42:58 -07:00
Keith Ito
6b385b6637
am a52c85da: am 8528fcb1: am a8d8cb12: am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
2010-05-11 10:44:16 -07:00
Nicolas Roard
9863ba94f0
resolved conflicts for merge of bfd6805a to master
...
Change-Id: Ie975e4cd7391d62949c563453358aa999c8a4b45
2010-05-11 10:40:11 -07:00
Dianne Hackborn
834910f51f
am 217f2686: am 7d5cea98: am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
2010-05-11 10:28:20 -07:00
Keith Ito
8528fcb199
am a8d8cb12: am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
...
Merge commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4' into kraken
* commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4':
Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
2010-05-11 10:24:03 -07:00
Nicolas Roard
2f68be5417
am 373b4913: am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart ( https://android-git.corp.google.com/g/#change,51149 )
...
Merge commit '373b4913ab5398736551ab718eb8c39d6f76e5d0' into kraken
* commit '373b4913ab5398736551ab718eb8c39d6f76e5d0':
Fix the 'wobbling fixed elements' bug.
2010-05-11 10:24:00 -07:00
Dianne Hackborn
7d5cea988b
am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
...
Merge commit '7e76b6d191e1173bd85337a2861d9914922f5a0d' into kraken
* commit '7e76b6d191e1173bd85337a2861d9914922f5a0d':
Hopefully fix issue #2662536 : Why is launcher being killed?
2010-05-11 10:23:56 -07:00
Keith Ito
a8d8cb12b3
am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
...
Merge commit 'be65399baf23855094596e27c25763ff92e9e027' into froyo-plus-aosp
* commit 'be65399baf23855094596e27c25763ff92e9e027':
Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
2010-05-11 10:19:06 -07:00
Nicolas Roard
373b4913ab
am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart ( https://android-git.corp.google.com/g/#change,51149 )
...
Merge commit 'f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776' into froyo-plus-aosp
* commit 'f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776':
Fix the 'wobbling fixed elements' bug.
2010-05-11 10:18:59 -07:00
Dianne Hackborn
7e76b6d191
am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
...
Merge commit '6d00151c519d5c131cc1480978fe4417cc7bcc79' into froyo-plus-aosp
* commit '6d00151c519d5c131cc1480978fe4417cc7bcc79':
Hopefully fix issue #2662536 : Why is launcher being killed?
2010-05-11 10:18:55 -07:00
Naveen Kalla
0a5174a6e9
Add support for EVDO Rev B
...
Change-Id: I8588e8b342c51f4b79bced8ef8fe60d57f07aefa
2010-05-11 10:12:07 -07:00
Jeff Hamilton
3d32f6e522
Add Activity.isChangingConfiguration().
...
This allows activities to know if they're being
torn down due to a configuration change.
Bug: 2557550
Change-Id: Ibd9bf5a06c92dbe3789049b84133cf4754381873
2010-05-11 11:48:10 -05:00
Keith Ito
be65399baf
Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
2010-05-10 20:41:47 -07:00
Wu-cheng Li
f0b8679b5d
am 0c3bba3e: am e1b2b3b0: Merge "Add continuous focus mode constant." into kraken
2010-05-10 20:07:54 -07:00
Nicolas Roard
f78acacb0d
Fix the 'wobbling fixed elements' bug.
...
Cherry-picked from master.
This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149 )
Bug:2665696
Change-Id: I0a044661ff21ef601ba34782db8acdc9531f98e7
2010-05-10 19:31:54 -07:00
Costin Manolache
161c75a0f3
Bug 2673557: rename datamessaging
...
Change-Id: I583ac61c7b8fce69d60801dc76aeca9f13d250b2
2010-05-10 19:12:49 -07:00
Keith Ito
9114a8bb8b
Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
...
Change-Id: I10b02306478d9c595dbcae0767b44c403d50e24a
2010-05-10 18:27:23 -07:00
Dianne Hackborn
6d00151c51
Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
2010-05-10 17:27:14 -07:00
Dianne Hackborn
906497c574
Hopefully fix issue #2662536 : Why is launcher being killed?
...
It looks like there was a subtle bug where Process.setOomAdj() could
return false just because the given process doesn't exist, even though
it is documented to only return false if OOM killing is not supported
at all. This would cause the activity manager to fall into its code
path of trying to clean up processes itself, which it does a much
poorer problem at. I am thinking we may be seeing this problem more
now that the activity manager is killing background processes itself
when there are too many of them.
In addition, this change cleans up and reduces some of the logging
around killing processes.
Finally, try to improve process LRU management a bit by taking
into account process dependencies. Any dependent processes are
pulled up in the LRU list with the processes that is actually
moving. Also, we bring a process up if someone accesses its content
provider.
Change-Id: I34ea161f839679345578ffe681e8d9c5d26ab948
2010-05-10 17:19:58 -07:00
Nicolas Roard
46318cf9bf
Fix the 'wobbling fixed elements' bug.
...
This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149 )
Bug:2665696
Change-Id: I28516005d03afa866efed2677197120ac6e2d579
2010-05-10 16:35:52 -07:00
Seth Pensack-Rinehart
b7332c714c
Fix Javadoc typo for Spanned.SPAN_EXCLUSIVE_INCLUSIVE
...
Change-Id: I82d15bde9444beca83eb78349212125cae525a6e
2010-05-10 17:44:12 +09:00
Wu-cheng Li
ca09961484
Add continuous focus mode constant.
...
bug:2612447
Change-Id: I9bc3f5a47ad50722a265d50b1d28fb82a2253dc9
2010-05-10 15:14:56 +08:00
Chih-Chung Chang
fdaa7790e8
am c2ed1817: am e25cc656: Support multiple cameras in framework.
2010-05-09 20:43:47 -07:00
Chih-Chung Chang
e25cc65639
Support multiple cameras in framework.
...
Change-Id: I081f0fbdca4b633715ea7c3b3d42f8662d27598a
2010-05-10 11:21:14 +08:00
Shimeng (Simon) Wang
db990751ef
Updated URL pattern based on http://data.iana.org/TLD/tlds-alpha-by-domain.txt
...
Note: this change doesn't solve the Arabic country code top level domains, which
was turned on today. For that, more changes need to be done; probably we need a way
to convert the BiDi url to punycode first; then apply this URL pattern.
issue: 2663885
Change-Id: I0597fe620c4d44259bff88ecfcbcca1565928c6f
2010-05-07 14:59:04 -07:00
Nicolas Roard
e1acf11199
Merge "Add the HTML5Audio class, to support the audio tag. The corresponding webkit C++ CL is https://android-git.corp.google.com/g/#change,41405 "
2010-05-07 12:45:05 -07:00
Nicolas Roard
4b71913ea7
Add the HTML5Audio class, to support the audio tag.
...
The corresponding webkit C++ CL is https://android-git.corp.google.com/g/#change,41405
Change-Id: Ia4169c353cde8cd8ee5786b874ff466897e3553e
2010-05-07 12:01:43 -07:00
Dianne Hackborn
f121be737c
Improvements to fragment API:
...
- Remove names associated with fragments (we'll use ids). They may
come back for other uses.
- Add method to replace a fragment, to help in doing back stacks.
- Add names to back stack states, to allow for jumping back to
known states.
- Add ability to set animations associated with fragments being
added or removed.
Change-Id: Ic2799f06947b1511fb1df5965ca32568b860b3c3
2010-05-07 11:31:03 -07:00
Leon Scroggins
7550a9580a
Merge "Fix selection off-by-one bug."
2010-05-07 06:14:19 -07:00
Leon Scroggins
6a367f5cb0
Provide a getter to tell the index of the current found match.
...
Part of fix for bug 2663680
Requires a change to external/webkit.
Change-Id: I1279963cf219eb365dd72262710f87c83acd8c4d
2010-05-07 09:11:09 -04:00
Bjorn Bringert
78531d1b34
am c688d336: am 74612539: am c8170ee2: am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
2010-05-07 03:47:35 -07:00