8245 Commits

Author SHA1 Message Date
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
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
Bjorn Bringert
74612539d2 am c8170ee2: am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
Merge commit 'c8170ee2055dcaf993391aacef0e54d87561bfdb' into kraken

* commit 'c8170ee2055dcaf993391aacef0e54d87561bfdb':
  Fixing: RecognitionService logcat spam "cancel called..."
2010-05-07 03:43:48 -07:00
Bjorn Bringert
c8170ee205 am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
Merge commit '75370e74629b4938c4472d6001eebf5e305dbc55' into froyo-plus-aosp

* commit '75370e74629b4938c4472d6001eebf5e305dbc55':
  Fixing: RecognitionService logcat spam "cancel called..."
2010-05-07 03:40:31 -07:00
Bjorn Bringert
75370e7462 Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo 2010-05-07 03:37:48 -07:00
Shimeng (Simon) Wang
d3b562ad87 Merge "Revert "Updated URL pattern based on http://data.iana.org/TLD/tlds-alpha-by-domain.txt"" 2010-05-06 20:49:12 -07:00
Shimeng (Simon) Wang
cbeaf2d0ae Revert "Updated URL pattern based on http://data.iana.org/TLD/tlds-alpha-by-domain.txt"
This reverts commit 63b849ef8d6a47422b0f2779f1d9320f6a65d16b.
2010-05-06 20:45:55 -07:00
Doug Felt
0b9d2ca6b6 Fix selection off-by-one bug.
The wrong value was used to measure the width of unidirectional text.

Change-Id: I57752c111641ca1cc951e0647b60c79f5a9493ad
2010-05-06 17:16:31 -07:00
Christopher Tate
10c40078d0 am 5cfec530: am fa9e7c05: Sketch of Native input for MessageQueue / Looper / ViewRoot 2010-05-06 17:10:40 -07:00
Christopher Tate
fa9e7c05c7 Sketch of Native input for MessageQueue / Looper / ViewRoot
MessageQueue now uses a socket for internal signalling, and is prepared
to also handle any number of event input pipes, once the plumbing is
set up with ViewRoot / Looper to tell it about them as appropriate.

Change-Id: If9eda174a6c26887dc51b12b14b390e724e73ab3
2010-05-06 17:00:54 -07:00
Shimeng (Simon) Wang
b0d278fcaa Merge "Updated URL pattern based on http://data.iana.org/TLD/tlds-alpha-by-domain.txt" 2010-05-06 16:17:06 -07:00
Shimeng (Simon) Wang
9b1872e619 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: Iac5d16bf9e091a072a59f8244ab6e87940badd4f
2010-05-06 15:38:15 -07:00
Dianne Hackborn
8cc3672095 Merge "New fragment stuff: back stack, and layout integration." 2010-05-06 13:23:10 -07:00
Dianne Hackborn
ba51c3d02d New fragment stuff: back stack, and layout integration.
You can now have fragment transactions pushed on to a local back
stack, which will automatically be popped when the user pressed
back in the activity.

Fragments can also now be inserted into layouts.

Change-Id: Id1c9ae3fbc54f696cd8bb5ca5957bec4d3eabf18
2010-05-06 13:19:35 -07:00
Leon Scroggins III
26723fc89d Adjustments to accommodate changes in Find dialog.
Remove mFindHeight, and the associated adjustements. It
is no longer needed because the FindDialog is no longer
on top of the WebView; instead, the WebView is resized to
accommodate it.
Do not take focus if the user touches the WebView while
Find is up.
Add a (hidden) getter to check to see if Find is showing.

Requires a change to packages/apps/Browser

Change-Id: I08cedb02d29eeeaac6860aa0933ccab43ed5c39f
2010-05-06 11:42:28 -04:00
The Android Open Source Project
108817f3d8 am 8b270a7a: am 579e08e6: am f7896449: merge from open-source master 2010-05-05 18:16:31 -07:00
Dianne Hackborn
7304381ca9 am 110a031a: am f41f444d: Merge "First pass at NativeActivity." into kraken 2010-05-05 17:51:05 -07:00