Commit Graph

7092 Commits

Author SHA1 Message Date
Cary Clark
a3811e1b16 am 6d45accc: don\'t layout when setting size from zoom if only height changed
Merge commit '6d45accc7166c84f94fdb5ca35602463ec4a32a4' into eclair-plus-aosp

* commit '6d45accc7166c84f94fdb5ca35602463ec4a32a4':
  don't layout when setting size from zoom if only height changed
2009-08-28 09:50:19 -07:00
Cary Clark
6d45accc71 don't layout when setting size from zoom if only height changed
(companion change in external/webkit)
Add a boolean parameter to WebViewCore.java nativeSizeSize().
If set, only layout if the width has also changed.
If clear, layout if the height alone has changed.
Layout is clear when called from zoom setup, and set otherwise.
2009-08-28 12:46:10 -04:00
Grace Kloba
a297a266bd am feb2b311: Merge change 22988 into eclair
Merge commit 'feb2b311c6d895d9cdab1de5bb7016eb75c41496' into eclair-plus-aosp

* commit 'feb2b311c6d895d9cdab1de5bb7016eb75c41496':
  Only add model in the UA for the release build
2009-08-28 09:14:27 -07:00
Android (Google) Code Review
feb2b311c6 Merge change 22988 into eclair
* changes:
  Only add model in the UA for the release build
2009-08-28 09:12:28 -07:00
Andreas Huber
6f2f6382aa am 01248f0f: Merge change 23103 into eclair
Merge commit '01248f0f18b681b69745ad716deff78a7c9e9adc' into eclair-plus-aosp

* commit '01248f0f18b681b69745ad716deff78a7c9e9adc':
  Fixing the build.
2009-08-28 08:44:39 -07:00
Android (Google) Code Review
01248f0f18 Merge change 23103 into eclair
* changes:
  Fixing the build.
2009-08-28 08:42:33 -07:00
Andreas Huber
a84b0e0c59 Fixing the build. 2009-08-28 08:40:00 -07:00
Daniel Sandler
45c67626dc am c035f7c7: Final high-density frameworks artwork drop from designers (dated 25-Aug-2009).
Merge commit 'c035f7c79fda9474002d265175fc52692dbd78fe' into eclair-plus-aosp

* commit 'c035f7c79fda9474002d265175fc52692dbd78fe':
  Final high-density frameworks artwork drop from designers (dated 25-Aug-2009).
2009-08-28 07:47:40 -07:00
Daniel Sandler
c035f7c79f Final high-density frameworks artwork drop from designers (dated 25-Aug-2009). 2009-08-28 09:04:53 -04:00
Tammo Spalink
77bd7a8475 am 27d67a15: Merge change 23077 into eclair
Merge commit '27d67a1509f9c19308dd7a9ac594526cf6ba51b3' into eclair-plus-aosp

* commit '27d67a1509f9c19308dd7a9ac594526cf6ba51b3':
  optimize MCC table
2009-08-28 00:48:34 -07:00
Android (Google) Code Review
27d67a1509 Merge change 23077 into eclair
* changes:
  optimize MCC table
2009-08-28 00:45:56 -07:00
Mike LeBeau
8c0fa1a2e5 am e9df3cf7: resolved conflicts for merge of 1e348378 to eclair
Merge commit 'e9df3cf79c2084391d5af140680cb4a18feca2e2' into eclair-plus-aosp

* commit 'e9df3cf79c2084391d5af140680cb4a18feca2e2':
  Revert "Remove third party support for Quick Search Box (aka global search)."
2009-08-27 23:59:32 -07:00
Mike LeBeau
e9df3cf79c resolved conflicts for merge of 1e348378 to eclair 2009-08-27 23:54:12 -07:00
Tammo Spalink
c18776d5bc optimize MCC table
Replace a table of objects that was created at boot
in a costly manner, with a pre-generated table of
more densely formatted numerical data.

Based on data from runhat on the phone process,
this looks to shrink the memory footprint from about
16kB to less then 2kB.

Addresses http://buganizer/issue?id=874072

Change-Id: I5a7b9d7de4c9b9a0360e8370252582969fbd8d4f
2009-08-28 14:05:04 +08:00
Dianne Hackborn
554f6cb1c7 am 49237345: Add platform infrastructure for features.
Merge commit '49237345d83e62fdb9eb8d50b13ad086636a04fa' into eclair-plus-aosp

* commit '49237345d83e62fdb9eb8d50b13ad086636a04fa':
  Add platform infrastructure for features.
2009-08-27 22:13:35 -07:00
Dianne Hackborn
49237345d8 Add platform infrastructure for features.
This introduces a new mechanism to define features associated with
a platform, query the current device for the available features,
and enforce that apps requiring features that aren't available can't
be installed.

Also now allows uses-library to specify that a library is optional,
so the lack of such a library will not prevent the app from being
installed (but if it does exist it will be correctly linked into
the app).

Change-Id: I5b369b46cfa0b3d37c9e08fd14ef1098a978e67b
2009-08-27 21:51:00 -07:00
Fred Quintana
820232af1b am 5511c669: Merge change 23067 into eclair
Merge commit '5511c66955d96019ee62ac334d73e4d2bcda178b' into eclair-plus-aosp

* commit '5511c66955d96019ee62ac334d73e4d2bcda178b':
  allow delaying after yielding
2009-08-27 21:50:56 -07:00
Android (Google) Code Review
5511c66955 Merge change 23067 into eclair
* changes:
  allow delaying after yielding
2009-08-27 21:49:05 -07:00
Fred Quintana
5c7aede8d6 allow delaying after yielding 2009-08-27 21:43:35 -07:00
Hung-ying Tyan
78fa1c5023 am 81085841: Merge change 22893 into eclair
Merge commit '81085841aca60875522181356d5a47382ea5fbca' into eclair-plus-aosp

* commit '81085841aca60875522181356d5a47382ea5fbca':
  Simplifies err code propagation.
2009-08-27 20:19:25 -07:00
Android (Google) Code Review
81085841ac Merge change 22893 into eclair
* changes:
  Simplifies err code propagation.
2009-08-27 20:17:12 -07:00
Fred Quintana
7ff4ef6a46 am c298a851: add an accessor for Context for use by subclasses
Merge commit 'c298a8518a8fd73a303132c7db241f10eb46c5b6' into eclair-plus-aosp

* commit 'c298a8518a8fd73a303132c7db241f10eb46c5b6':
  add an accessor for Context for use by subclasses
2009-08-27 20:05:32 -07:00
Fred Quintana
c298a8518a add an accessor for Context for use by subclasses 2009-08-27 20:02:10 -07:00
Hung-ying Tyan
cef28e74af Simplifies err code propagation.
* Other changes
  + Re-assign err codes in VpnManager.
  + Add new err codes: REMOTE_PPP_HUNG_UP, PPP_NEGOTIATION_FAILED.
  + Delete the state file only if it exists (to prevent logging an
    unable-to-unlink error).
  + Extend timeout to 40 seconds.
2009-08-28 09:59:39 +08:00
Android (Google) Code Review
1e3483780c Merge change 23043 into donut
* changes:
  Revert "Remove third party support for Quick Search Box (aka global search)."
2009-08-27 18:32:27 -07:00
Karl Rosaen
590f63433c Revert "Remove third party support for Quick Search Box (aka global search)."
This reverts commit a647b7f29d65a7792cede74284e714b591337992.
2009-08-27 17:42:48 -07:00
Dianne Hackborn
fef09e8f98 am 1005569f: Merge change 23012 into eclair
Merge commit '1005569fbb459007ff9d9fddbfa6e49947166166' into eclair-plus-aosp

* commit '1005569fbb459007ff9d9fddbfa6e49947166166':
  Fix issue #2084148: Define the format for the auto focus preview for barcode scanning
2009-08-27 17:00:17 -07:00
Android (Google) Code Review
1005569fbb Merge change 23012 into eclair
* changes:
  Fix issue #2084148: Define the format for the auto focus preview for barcode scanning
2009-08-27 16:58:21 -07:00
Andreas Huber
1a66583fea am bf8ecd7c: Merge change 22991 into eclair
Merge commit 'bf8ecd7c7ecfb3579a91b43d95e7fa0d8a0d63be' into eclair-plus-aosp

* commit 'bf8ecd7c7ecfb3579a91b43d95e7fa0d8a0d63be':
  Apparently setting the preferred role of the OMX component is now required on this platform.
2009-08-27 16:35:43 -07:00
Android (Google) Code Review
bf8ecd7c7e Merge change 22991 into eclair
* changes:
  Apparently setting the preferred role of the OMX component is now required on this platform.
2009-08-27 16:34:15 -07:00
Dianne Hackborn
e5276a7474 Fix issue #2084148: Define the format for the auto focus preview for barcode scanning
Add new manifest/aapt support for specifying device features an application
requires.  The aapt badging now returns these (as well as uses-permission since
I need to look for those anyway); if an app doesn't explicitly request the
camera feature but does request the permission, then aapt will say that it has
requested both the basic camera feature as well as the autofocus feature.

Here's what you put in your manifest to say you need a camera but don't need
autofocus:

    <uses-permission android:name="android.permission.CAMERA" />
    <uses-feature android:name="android.hardware.camera" />
    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />

Here's what will be seen from aapt:

uses-permission:'android.permission.CAMERA'
uses-feature:'android.hardware.camera'
uses-feature-not-required:'android.hardware.camera.autofocus'

Change-Id: I4dd19cee0486cc54771f5bf14fc9db0e892115d5
2009-08-27 16:28:44 -07:00
Robert Greenwalt
870333b1e3 am 29418e98: Merge change 22529 into eclair
Merge commit '29418e98731b4a5f94d9ac5f4a0df9d5d21bca55' into eclair-plus-aosp

* commit '29418e98731b4a5f94d9ac5f4a0df9d5d21bca55':
  Track apn Enable synchronously and notice failures
2009-08-27 16:20:24 -07:00
Fred Quintana
3aad3ae2f9 am a640c49e: Merge change 22984 into eclair
Merge commit 'a640c49edafde3d00887d9c099b2d13b71f8b6d6' into eclair-plus-aosp

* commit 'a640c49edafde3d00887d9c099b2d13b71f8b6d6':
  fix AbstractThreadedSyncAdapter to actually cancel syncs
2009-08-27 16:20:17 -07:00
Android (Google) Code Review
29418e9873 Merge change 22529 into eclair
* changes:
  Track apn Enable synchronously and notice failures
2009-08-27 16:18:50 -07:00
Android (Google) Code Review
a640c49eda Merge change 22984 into eclair
* changes:
  fix AbstractThreadedSyncAdapter to actually cancel syncs
2009-08-27 16:18:14 -07:00
Eric Fischer
d5181adf0f am bfa1d083: Merge change 22962 into eclair
Merge commit 'bfa1d083aac92a8fc315e18a381287108b138baf' into eclair-plus-aosp

* commit 'bfa1d083aac92a8fc315e18a381287108b138baf':
  Fix strings whose apostrophes were eaten because of the lack of a backslash.
2009-08-27 16:04:06 -07:00
Android (Google) Code Review
bfa1d083aa Merge change 22962 into eclair
* changes:
  Fix strings whose apostrophes were eaten because of the lack of a backslash.
2009-08-27 16:01:59 -07:00
Andreas Huber
813a875286 Apparently setting the preferred role of the OMX component is now required on this platform. 2009-08-27 15:28:12 -07:00
Andreas Huber
a7f5f38a41 am c1dccce7: Merge change 22986 into eclair
Merge commit 'c1dccce74104c5ababb1118fda3ea43974adbad4' into eclair-plus-aosp

* commit 'c1dccce74104c5ababb1118fda3ea43974adbad4':
  Squashed commit of the following:
2009-08-27 15:26:09 -07:00
Dianne Hackborn
6f664bd89d am d6ac7c73: Merge change 22975 into eclair
Merge commit 'd6ac7c73e17f0ce0cc3b1290760c4f67cafcdec5' into eclair-plus-aosp

* commit 'd6ac7c73e17f0ce0cc3b1290760c4f67cafcdec5':
  Fix issue #2069662: The wallpaper doesn't move along with the home screen
2009-08-27 15:26:05 -07:00
Grace Kloba
ce761d3219 Only add model in the UA for the release build 2009-08-27 15:24:59 -07:00
Android (Google) Code Review
c1dccce741 Merge change 22986 into eclair
* changes:
  Squashed commit of the following:
2009-08-27 15:24:35 -07:00
Android (Google) Code Review
d6ac7c73e1 Merge change 22975 into eclair
* changes:
  Fix issue #2069662: The wallpaper doesn't move along with the home screen
2009-08-27 15:10:27 -07:00
Andreas Huber
f110ec4395 am 5352e237: Merge change 22968 into eclair
Merge commit '5352e237cad365f39c87aaeda3822c891c7ca474' into eclair-plus-aosp

* commit '5352e237cad365f39c87aaeda3822c891c7ca474':
  Fix a typo.
2009-08-27 14:55:15 -07:00
Android (Google) Code Review
5352e237ca Merge change 22968 into eclair
* changes:
  Fix a typo.
2009-08-27 14:54:13 -07:00
Andreas Huber
329577aa6d Squashed commit of the following:
commit 3fa5f3ce910f34da0cedb8bcce1bd593db7eb740
Author: Andreas Huber <andih@google.com>
Date:   Thu Aug 27 14:48:54 2009 -0700

    Getting rid of more code now obsolete with the departure of OMXDecoder.

commit e0d923ec0c7bb60bec8eb97739036a4c70c0feef
Author: Andreas Huber <andih@google.com>
Date:   Thu Aug 27 14:33:06 2009 -0700

    Remove obsoleted OMXDecoder class. OMXDecoder is dead, long live OMXCodec.
2009-08-27 14:50:58 -07:00
Eric Fischer
b2795f46bf Fix strings whose apostrophes were eaten because of the lack of a backslash.
Change-Id: I5738ea969ce233c15550d572fbdb5e62108c1e3e
2009-08-27 14:49:54 -07:00
Fred Quintana
b19b4c711f fix AbstractThreadedSyncAdapter to actually cancel syncs 2009-08-27 14:43:01 -07:00
Dianne Hackborn
3d62b71514 am fa526029: am f734e027: Merge change 22939 into donut
Merge commit 'fa5260290f3c19988c292f21845a948374c3c31d' into eclair-plus-aosp

* commit 'fa5260290f3c19988c292f21845a948374c3c31d':
  Final Donut API list.
2009-08-27 14:42:30 -07:00
Dianne Hackborn
fa5260290f am f734e027: Merge change 22939 into donut
Merge commit 'f734e027bfed6c884e5f060c3291d3aeb5706dc8' into eclair

* commit 'f734e027bfed6c884e5f060c3291d3aeb5706dc8':
  Final Donut API list.
2009-08-27 14:40:51 -07:00