10204 Commits

Author SHA1 Message Date
Jesse Wilson
1ba4171405 Adding JsonReader.setLenient() to handle malformed JSON strings.
Also replacing setIndentSpaces() with a more general purpose method,
setIndent().

Change-Id: I64fbe4901aec23de5392362c1d40b77bc2b5566b
2010-08-06 19:24:54 -07:00
Dan Egnor
1ddf340bfc am 6f50a956: am 799f2bb0: am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
Merge commit '6f50a956803c6ccedaec71f11ecd72f8fa7efe52'

* commit '6f50a956803c6ccedaec71f11ecd72f8fa7efe52':
  COMMENT ONLY change to fix some formatting glitches and
2010-08-06 19:07:24 -07:00
Steve Howard
4938d79160 am d49d4031: am 9fbf00cb: Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread
Merge commit 'd49d4031d654398904d5af30c488a3b32b176122'

* commit 'd49d4031d654398904d5af30c488a3b32b176122':
  Slight improvement (hopefully) to orientation sensing.
2010-08-06 19:06:48 -07:00
Steve Howard
bd576042a5 am 974c993f: am 8e15afe7: Make downloads visible by default.
Merge commit '974c993fc3771169efa73e40981d18ac0969fac8'

* commit '974c993fc3771169efa73e40981d18ac0969fac8':
  Make downloads visible by default.
2010-08-06 19:06:31 -07:00
Dan Egnor
6f50a95680 am 799f2bb0: am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
Merge commit '799f2bb04102b4b692b52eed5c36aea9a8cde471' into gingerbread-plus-aosp

* commit '799f2bb04102b4b692b52eed5c36aea9a8cde471':
  COMMENT ONLY change to fix some formatting glitches and
2010-08-06 18:59:49 -07:00
Dan Egnor
799f2bb041 am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
Merge commit 'b37bca9e79489a1abd848ce762bb7d87203b3414' into gingerbread

* commit 'b37bca9e79489a1abd848ce762bb7d87203b3414':
  COMMENT ONLY change to fix some formatting glitches and
2010-08-06 18:55:05 -07:00
Steve Howard
d49d4031d6 am 9fbf00cb: Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread
Merge commit '9fbf00cb041eeb22acad93deace9712c57b4c594' into gingerbread-plus-aosp

* commit '9fbf00cb041eeb22acad93deace9712c57b4c594':
  Slight improvement (hopefully) to orientation sensing.
2010-08-06 18:54:22 -07:00
Steve Howard
974c993fc3 am 8e15afe7: Make downloads visible by default.
Merge commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625' into gingerbread-plus-aosp

* commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625':
  Make downloads visible by default.
2010-08-06 18:54:03 -07:00
Dan Egnor
b37bca9e79 Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo 2010-08-06 16:39:02 -07:00
Steve Howard
9fbf00cb04 Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread 2010-08-06 14:28:37 -07:00
Adam Powell
6dd73b45a4 Fix some lifecycle issues with populating the action bar's menu
Change-Id: I5f63df3260392b09fbb7120986702d01dac5906c
2010-08-06 11:30:35 -07:00
Steve Howard
8e15afe799 Make downloads visible by default.
Change-Id: I8f8b325658d8afc964bddd3f1c03ed20e6bd10aa
2010-08-06 11:06:49 -07:00
Derek Sollenberger
ff0f973442 Support complex characters in plugins.
Complex characters like chinese are sent via the onKeyMultiple()
callback. The WebView passes these characters to Webkit so that
non-text inputs (e.g. plugins) can process them.

Change-Id: I159c4a404c195b60cc7f63ef4bff0aa80db96c3f
http://b/2900114
2010-08-06 14:05:15 -04:00
Jesse Wilson
76d7e20a75 A new streaming JSON API.
Change-Id: Iefa7ee44ddacbe22ea9ebca3165ac59030659bf2
2010-08-06 10:34:44 -07:00
Michael Kolb
fdde0003e6 Merge "added scroll control support to WebView" 2010-08-06 10:18:41 -07:00
Mike Lockwood
b83f9c3027 Merge "Set umask of system server to 0077" 2010-08-06 09:40:54 -07:00
Mike Lockwood
90960e87ec Set umask of system server to 0077
This matches the previous behavior of java.io.File file and directory creation.

BUG: 2898660

Change-Id: Ie8978a3fc44abfd22f8046e66742e715354220a8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-06 09:19:58 -04:00
Chung-yih Wang
024d59601e resolved conflicts for merge of a06ad953 to master
Change-Id: I282525787d7475cc72b2dec10fbc2cf8c5727b82
2010-08-06 12:06:04 +08:00
Chung-yih Wang
a06ad953a2 am 7324489f: Merge "Add SIP service into system server." into gingerbread
Merge commit '7324489f18ee01586931f577f00567092cbf52df' into gingerbread-plus-aosp

* commit '7324489f18ee01586931f577f00567092cbf52df':
  Add SIP service into system server.
2010-08-05 19:37:59 -07:00
Chung-yih Wang
7324489f18 Merge "Add SIP service into system server." into gingerbread 2010-08-05 19:35:45 -07:00
Adam Powell
9093717985 Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo 2010-08-05 18:33:31 -07:00
Steve Howard
5f531ae6b3 Slight improvement (hopefully) to orientation sensing.
Since orientation sensing has been an issue for numerous users, I
decided a spend a little time experimenting with some possible
improvements.  I've settled on a couple major changes:

* Perform all lowpass filtering in spherical coordinates, not
  cartesian.  Since the rotations are what we're really concerned
  with, this makes more sense and gives more consistent results.

* Introduce a system of tracking "distrust" in the current data, based
  on external acceleration and on tilt.  The basic idea is after a
  signal of unreliable data -- repeated acceleration or
  nearly-horizontal tilt -- we wait for things to "stabilize" for some
  number of ticks before we start trusting the data again.  This is an
  extension of the basic lowpass filtering.  One simple example is
  after the phone is picked up off a table, we ignore the first few
  readings.  Another example is while the phone is under external
  acceleration for a while (i.e. in a car mount on a rough road), if a
  single "good" reading comes in, we distrust it, under the assumption
  that it was probably just a lucky reading (i.e. the magnitude
  happened to be close to that of gravity by chance).

These changes have allowed me to relax other constraints, such as the
filtering time constants, the maximum deviation from gravity, and the
max tilt before we start distrusting data.

The net effect is that orientation changes happen more quickly and can
happen under a wider variety of conditions, but false changes due to
tilt and acceleration are still avoided well.  I think the improvement
is subtle, but it's the best I've come up with in my limited time.

I've also included some refactoring and additonal comments to try and
further clarify the (somewhat twisted) logic.

Change-Id: I34c7297bd2061fae8317ffefd32a85c7538a3efb
2010-08-05 18:26:03 -07:00
Dianne Hackborn
5e0d59547c Fix some Loader bugs.
- Weren't re-attaching to the current loader manager after retaining
  instance state.
- Ensure loaders are being destroyed.
- Fix a bug if you call restartLoader() inside of onLoadFinished().

Change-Id: I89df53db49d8e09047bf55216ebeb0f133c059e7
2010-08-05 18:25:32 -07:00
Fred Quintana
c6e7d7658c am c2a836a5: am 5005a6c0: am cdf16787: Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo
Merge commit 'c2a836a5f41897267aa92e5fdeecdf94203d640c'

* commit 'c2a836a5f41897267aa92e5fdeecdf94203d640c':
  Changed SyncOperation.toKey() to not rely on the implementation of
2010-08-05 17:57:11 -07:00
Fred Quintana
c2a836a5f4 am 5005a6c0: am cdf16787: Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo
Merge commit '5005a6c031b5d66c1b47cad6f0dbaacebcbb6803' into gingerbread-plus-aosp

* commit '5005a6c031b5d66c1b47cad6f0dbaacebcbb6803':
  Changed SyncOperation.toKey() to not rely on the implementation of
2010-08-05 17:51:28 -07:00
Fred Quintana
5005a6c031 am cdf16787: Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo
Merge commit 'cdf16787fc1234b7f21a9cddc6f8a27b4056bc39' into gingerbread

* commit 'cdf16787fc1234b7f21a9cddc6f8a27b4056bc39':
  Changed SyncOperation.toKey() to not rely on the implementation of
2010-08-05 17:42:05 -07:00
Chung-yih Wang
2d94231ef9 Add SIP service into system server.
Change-Id: Icc39e4e54768cfdcc1b20a3efe6206009b9a8d10
2010-08-06 08:40:50 +08:00
Fred Quintana
cdf16787fc Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo 2010-08-05 17:36:27 -07:00
Fred Quintana
b4b7b4837b Changed SyncOperation.toKey() to not rely on the implementation of
Account.toString()

bug: 2898033
Change-Id: I6bfac976127190d2d667312df7aa9c7d57b21555
2010-08-05 17:26:58 -07:00
Romain Guy
8cc44cb669 Merge "Add support for paths." 2010-08-05 17:25:48 -07:00
Romain Guy
7fbcc0492f Add support for paths.
Rendering is implementing by rasterizing the paths into A8 textures.
This cna be extremely inefficient if the path changes often.

Change-Id: I609343f304ae38e0d319359403ee73b9b5b3c93a
2010-08-05 17:23:49 -07:00
Michael Kolb
73980a949d added scroll control support to WebView
Change-Id: Ie0ddaa6b532e31fb0e2904e6bab9d67c06599b66
2010-08-05 16:50:02 -07:00
Elliott Slaughter
f21d2e3059 Initial work on browser incognito mode history feature.
Change-Id: I050edf263d5c4ee0c0373692e267d7e19f47ba1b
2010-08-05 16:22:33 -07:00
Eric Fischer
625c2f8d6b Merge "Fix a bug where paragraph styles could leak onto an adjacent empty line." 2010-08-05 15:51:54 -07:00
Adam Powell
a55191fe8f DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller
Change-Id: Ia176cdb029201dbad193d2d213d3cf6e16fbee63
2010-08-05 15:50:31 -07:00
Scott Main
307351a22d fix xml sample error
Change-Id: Ifd188a5866382a79c2c9de94c0682b707baffdcf
2010-08-05 15:44:26 -07:00
Eric Fischer
74d31ef2b2 Fix a bug where paragraph styles could leak onto an adjacent empty line.
When the text ends with an empty line, the getSpans() call to retrieve
styles for it would also retrieve the styles of the preceding line.
Add a special case to detect and prevent this.

Change-Id: I888131cacce6bf45e68c53c931ebe8d58db0b7a9
2010-08-05 15:29:36 -07:00
Oscar Montemayor
7a1778afcd Merge "Fix for bug 2890320 Browser crashes, after adding bookmark. Simplified locking scheme in Proxy's getProxy(..) method. Also modified ContentObserver creation to be done from any thread." 2010-08-05 15:07:03 -07:00
Oscar Montemayor
6f71b42bc4 Fix for bug 2890320 Browser crashes, after adding bookmark.
Simplified locking scheme in Proxy's getProxy(..) method.
Also modified ContentObserver creation to be done from any thread.

Change-Id: I54edb56a86796f08a1310cf1ae1d1f0c42a0cbc8
2010-08-05 14:49:28 -07:00
Dianne Hackborn
90d5e8c08b Fix build.
Change-Id: I18c0af97c7e204f023cea77e3e5d08eb37596222
2010-08-05 14:28:57 -07:00
Dianne Hackborn
9f53119b72 First pass at a new clipboard API.
ClipboardManager was in android.text(!!) so it needed to be moved
up to android.content to have access to the richer data types we
now need.

ClippedData is the data representation.  Still needs a lot of
fleshing out to allow holding more than one data type at a time
and perhaps conversions between them.  (MIME-oriented interrogation
and conversion will be done through ContentProvider, which needs
to grow an ability to report multiple MIME types and accept a
desired MIME type when a stream is being opened.)

Change-Id: Ifa51bedcd084a677813b255d171804e8496b0cb5
2010-08-05 12:28:20 -07:00
Daniel Sandler
b5c22f7236 am 811d66f1: am 9b87770f: Merge "Fix crash when startForeground posts a broken Notification." into gingerbread
Merge commit '811d66f1496b64b02c117e8d992db99e9e6cdc8d'

* commit '811d66f1496b64b02c117e8d992db99e9e6cdc8d':
  Fix crash when startForeground posts a broken Notification.
2010-08-05 12:08:25 -07:00
Scott Main
ab847c44d0 am c9de8c34: am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class
Merge commit 'c9de8c34a32af1b305b49096ee96da4c35acd2e8'

* commit 'c9de8c34a32af1b305b49096ee96da4c35acd2e8':
  fix some doc errors in the resources;
2010-08-05 12:08:02 -07:00
Chet Haase
bc9151bcad Merge "Add new API to Animator to allow seeking of animations" 2010-08-05 11:53:34 -07:00
Chet Haase
5d7b50b800 Add new API to Animator to allow seeking of animations
Change-Id: I3960030f54814ed0ef6fb6853061c64ab3b4dd1c
2010-08-05 11:45:04 -07:00
Dmitri Plotnikov
2ef9d2538f Changing the protocol for Directory registration.
Change-Id: I1ba51d4198617121a9a5f86d22e91dfa9917c94b
2010-08-05 11:27:44 -07:00
Kenny Root
ce845d7301 am c5183aca: am c68bcc32: Merge "Only allow one movePackage operation in-flight" into gingerbread
Merge commit 'c5183acae55e08f4bfcb58aa122a200863748a63'

* commit 'c5183acae55e08f4bfcb58aa122a200863748a63':
  Only allow one movePackage operation in-flight
2010-08-05 10:47:15 -07:00
Brian Carlstrom
1b7e4d5adc am 4ae1e382: Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread
Merge commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af' into gingerbread-plus-aosp

* commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af':
  Tracking merge of dalvik-dev to gingerbread
2010-08-05 10:40:45 -07:00
Daniel Sandler
0f0b11c871 Basic support for notification payloads in the panel.
Line-item veto is there, but allows you to cancel some
notifications you probably shouldn't be canceling. (Should
hide the "X" in those cases.)

No preference given to "sticky" notifications, because
there's no such thing yet.

Notifications are now limited to 4 visible icons, per spec.
The implementation is a total hack for now.

Change-Id: Ibdf433ae94189117f983c510fe5e0cff0bf5c44c
2010-08-05 09:34:50 -04:00
Brian Carlstrom
3c7c351a62 Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit f77cf7f0
git cherry-pick --no-commit c8f503b5285e30c1a881d0ba860ba9021f57d113
git cherry-pick --no-commit 570bb561
git cherry-pick --no-commit e2417541
git cherry-pick --no-commit e4d81f25bd4dc1a5c909b56ab56a56406290da30
git cherry-pick --no-commit 5e8a587d

Change-Id: I101a385d43f3e0f4ce5352217f92ef67a3908c88
2010-08-04 23:47:38 -07:00