OSDN Git Service
Scott Main [Fri, 22 Jan 2010 17:43:09 +0000 (09:43 -0800)]
am
daa3b7a4: am
945ed36e: docs: add the ability to exclude PRE elements from being prettified by adding the class "no-pretty-print" (needs to hyphenate \'prettyprint\', otherwise the prettify script will parse "no-prettyprint" the same as "prettyprint")
Merge commit '
daa3b7a46958206cdac5d21e4235a6dfabb6829a'
* commit '
daa3b7a46958206cdac5d21e4235a6dfabb6829a':
docs: add the ability to exclude PRE elements from being prettified
android-build SharedAccount [Fri, 22 Jan 2010 16:34:06 +0000 (08:34 -0800)]
clean step for JIT switch
Bjorn Bringert [Tue, 19 Jan 2010 20:10:32 +0000 (20:10 +0000)]
Cleanstep to remove old QuickSearchBox.apk
Without this, BrowserProvder crashes with:
E/AndroidRuntime( 875): java.lang.RuntimeException: Unable to get provider com.android.browser.BrowserProvider: java.lang.NullPointerException
E/AndroidRuntime( 875): at android.app.ActivityThread.installProvider(ActivityThread.java:4269)
E/AndroidRuntime( 875): at android.app.ActivityThread.installContentProviders(ActivityThread.java:4041)
E/AndroidRuntime( 875): at android.app.ActivityThread.handleBindApplication(ActivityThread.java:4000)
E/AndroidRuntime( 875): at android.app.ActivityThread.access$2900(ActivityThread.java:118)
E/AndroidRuntime( 875): at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1900)
E/AndroidRuntime( 875): at android.os.Handler.dispatchMessage(Handler.java:99)
E/AndroidRuntime( 875): at android.os.Looper.loop(Looper.java:123)
E/AndroidRuntime( 875): at android.app.ActivityThread.main(ActivityThread.java:4360)
E/AndroidRuntime( 875): at java.lang.reflect.Method.invokeNative(Native Method)
E/AndroidRuntime( 875): at java.lang.reflect.Method.invoke(Method.java:521)
E/AndroidRuntime( 875): at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:860)
E/AndroidRuntime( 875): at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:618)
E/AndroidRuntime( 875): at dalvik.system.NativeStart.main(Native Method)
E/AndroidRuntime( 875): Caused by: java.lang.NullPointerException
E/AndroidRuntime( 875): at android.os.Parcel.readException(Parcel.java:1224)
E/AndroidRuntime( 875): at android.os.Parcel.readException(Parcel.java:1206)
E/AndroidRuntime( 875): at android.app.ISearchManager$Stub$Proxy.getSearchableInfo(ISearchManager.java:220)
E/AndroidRuntime( 875): at android.app.SearchManager.getSearchableInfo(SearchManager.java:2056)
E/AndroidRuntime( 875): at com.android.browser.BrowserProvider.updateShowWebSuggestions(BrowserProvider.java:410)
E/AndroidRuntime( 875): at com.android.browser.BrowserProvider.onCreate(BrowserProvider.java:363)
E/AndroidRuntime( 875): at android.content.ContentProvider.attachInfo(ContentProvider.java:725)
E/AndroidRuntime( 875): at android.app.ActivityThread.installProvider(ActivityThread.java:4266)
E/AndroidRuntime( 875): ... 12 more
which is a result of an earlier problem in Searchables:
01-19 11:58:46.317 E/AndroidRuntime( 416): java.lang.RuntimeException: Unable to start receiver com.android.quicksearchbox.SearchWidgetProvider: java.lang.SecurityException: Neither user 10033 nor current process has android.permission.SET_PREFERRED_APPLICATIONS.
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.app.ActivityThread.handleReceiver(ActivityThread.java:2645)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.app.ActivityThread.access$3100(ActivityThread.java:118)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1912)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.os.Handler.dispatchMessage(Handler.java:99)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.os.Looper.loop(Looper.java:123)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.app.ActivityThread.main(ActivityThread.java:4360)
01-19 11:58:46.317 E/AndroidRuntime( 416): at java.lang.reflect.Method.invokeNative(Native Method)
01-19 11:58:46.317 E/AndroidRuntime( 416): at java.lang.reflect.Method.invoke(Method.java:521)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:860)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:618)
01-19 11:58:46.317 E/AndroidRuntime( 416): at dalvik.system.NativeStart.main(Native Method)
01-19 11:58:46.317 E/AndroidRuntime( 416): Caused by: java.lang.SecurityException: Neither user 10033 nor current process has android.permission.SET_PREFERRED_APPLICATIONS.
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.os.Parcel.readException(Parcel.java:1218)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.os.Parcel.readException(Parcel.java:1206)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.app.ISearchManager$Stub$Proxy.getSearchablesInGlobalSearch(ISearchManager.java:242)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.app.SearchManager.getSearchablesInGlobalSearch(SearchManager.java:2152)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.Sources.addExternalSources(Sources.java:275)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.Sources.updateSources(Sources.java:266)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.Sources.load(Sources.java:235)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.QsbApplication.createSources(QsbApplication.java:96)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.QsbApplication.getSources(QsbApplication.java:89)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.SearchWidgetProvider.getSources(SearchWidgetProvider.java:222)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.SearchWidgetProvider.bindSourceSelector(SearchWidgetProvider.java:162)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.SearchWidgetProvider.updateSearchWidgets(SearchWidgetProvider.java:105)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.SearchWidgetProvider.onUpdate(SearchWidgetProvider.java:90)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.appwidget.AppWidgetProvider.onReceive(AppWidgetProvider.java:61)
01-19 11:58:46.317 E/AndroidRuntime( 416): at com.android.quicksearchbox.SearchWidgetProvider.onReceive(SearchWidgetProvider.java:84)
01-19 11:58:46.317 E/AndroidRuntime( 416): at android.app.ActivityThread.handleReceiver(ActivityThread.java:2636)
01-19 11:58:46.317 E/AndroidRuntime( 416): ... 10 more
Change-Id: I66eff8d571a40a6d724c49c258a49ba9d5c18f9f
Bjorn Bringert [Tue, 19 Jan 2010 19:19:44 +0000 (11:19 -0800)]
Merge "Don't build GoogleSearch"
Scott Main [Tue, 19 Jan 2010 19:13:44 +0000 (11:13 -0800)]
am
945ed36e: docs: add the ability to exclude PRE elements from being prettified by adding the class "no-pretty-print" (needs to hyphenate \'prettyprint\', otherwise the prettify script will parse "no-prettyprint" the same as "prettyprint")
Merge commit '
945ed36ec486f83c4546cac8d6bed954dfe32c4e' into eclair-plus-aosp
* commit '
945ed36ec486f83c4546cac8d6bed954dfe32c4e':
docs: add the ability to exclude PRE elements from being prettified
Scott Main [Sat, 16 Jan 2010 01:30:38 +0000 (17:30 -0800)]
docs: add the ability to exclude PRE elements from being prettified
by adding the class "no-pretty-print" (needs to hyphenate 'prettyprint',
otherwise the prettify script will parse "no-prettyprint" the same as
"prettyprint")
Bjorn Bringert [Mon, 18 Jan 2010 22:11:36 +0000 (22:11 +0000)]
Don't build GoogleSearch
GoogleSearch is being replaced by QuickSearchBox, which
includes Google search.
Change-Id: Ief2d1136b8977b0fc6e2b5d97221e5c0bc620daf
Joe Onorato [Fri, 15 Jan 2010 23:23:35 +0000 (18:23 -0500)]
cleanspec for the google_voiceime generated files.
Jeff Hamilton [Thu, 14 Jan 2010 20:37:37 +0000 (14:37 -0600)]
Fix the build.
Bjorn Bringert [Thu, 14 Jan 2010 17:33:44 +0000 (17:33 +0000)]
Allow multiple directories in LOCAL_RESOURCE_DIR
Before, LOCAL_RESOURCE_DIR got messed up when the build system
tried to find the whole LOCAL_RESOURCE_DIR string in each
overlay directory.
This change splits LOCAL_RESOURCE_DIR before appending it to
the overlay directory paths.
I've verified that this now works:
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/overlay $(LOCAL_PATH)/res
Change-Id: Iea47f94a14720af0ca4b422aec30acf4acbe13cf
Scott Main [Wed, 13 Jan 2010 20:17:08 +0000 (12:17 -0800)]
am
4bd6c862: am
3556305e: Merge "docs: hide the "back to top" link when there\'s no vertical scroll also use local variables for DOM objects (in a slow effort to eventually remove all non-essential global vars)" into eclair
Merge commit '
4bd6c862f0897f99abc227611822e1dace03b6e0'
* commit '
4bd6c862f0897f99abc227611822e1dace03b6e0':
docs: hide the "back to top" link when there's no vertical scroll
Scott Main [Wed, 13 Jan 2010 19:18:02 +0000 (11:18 -0800)]
am
3556305e: Merge "docs: hide the "back to top" link when there\'s no vertical scroll also use local variables for DOM objects (in a slow effort to eventually remove all non-essential global vars)" into eclair
Merge commit '
3556305eb00cd63ce75bc5ef4a84fd1b454c50fb' into eclair-plus-aosp
* commit '
3556305eb00cd63ce75bc5ef4a84fd1b454c50fb':
docs: hide the "back to top" link when there's no vertical scroll
Scott Main [Wed, 13 Jan 2010 19:07:54 +0000 (11:07 -0800)]
Merge "docs: hide the "back to top" link when there's no vertical scroll also use local variables for DOM objects (in a slow effort to eventually remove all non-essential global vars)" into eclair
Andreas Huber [Wed, 13 Jan 2010 17:28:20 +0000 (09:28 -0800)]
Merge "Enable metadata scanning and retrieval through stagefright by default."
Doug Zongker [Wed, 13 Jan 2010 17:22:22 +0000 (09:22 -0800)]
Merge "update ro.build.tags when signing release builds"
Scott Main [Tue, 12 Jan 2010 21:37:00 +0000 (13:37 -0800)]
docs: hide the "back to top" link when there's no vertical scroll
also use local variables for DOM objects (in a slow effort to eventually
remove all non-essential global vars)
Wei-Ta Chen [Wed, 13 Jan 2010 09:29:12 +0000 (01:29 -0800)]
Merge "Add libjpeg to the prelink map."
Andreas Huber [Mon, 11 Jan 2010 23:45:50 +0000 (15:45 -0800)]
Enable metadata scanning and retrieval through stagefright by default.
related-to-bug:
2295456
Raphael Moll [Tue, 12 Jan 2010 23:43:22 +0000 (15:43 -0800)]
am
acbbba88: am
d1b68863: Merge "Add etc1tool to Windows SDK." into eclair
Merge commit '
acbbba88fb2a2e43b63cb83675ea368c47621ca8'
* commit '
acbbba88fb2a2e43b63cb83675ea368c47621ca8':
Add etc1tool to Windows SDK.
Raphael Moll [Tue, 12 Jan 2010 23:38:41 +0000 (15:38 -0800)]
am
d1b68863: Merge "Add etc1tool to Windows SDK." into eclair
Merge commit '
d1b68863f5ef252a92adcfb22d3ca48872981a61' into eclair-plus-aosp
* commit '
d1b68863f5ef252a92adcfb22d3ca48872981a61':
Add etc1tool to Windows SDK.
Raphael Moll [Tue, 12 Jan 2010 23:32:00 +0000 (15:32 -0800)]
Merge "Add etc1tool to Windows SDK." into eclair
Scott Main [Tue, 12 Jan 2010 21:11:58 +0000 (13:11 -0800)]
am
29bec3f7: am
7e680c89: Merge "docs: make the Resources docs use the same clearsilver template as the Dev Guide. This removes the custom resourcespage.cs file and routes resources pages to use docpage.cs, while still setting the resource hdf flag true (in order to h
Merge commit '
29bec3f707401630e6ad93dcaa3e9a620f0d9bbb'
* commit '
29bec3f707401630e6ad93dcaa3e9a620f0d9bbb':
docs: make the Resources docs use the same clearsilver template
Scott Main [Tue, 12 Jan 2010 20:23:50 +0000 (12:23 -0800)]
am
7e680c89: Merge "docs: make the Resources docs use the same clearsilver template as the Dev Guide. This removes the custom resourcespage.cs file and routes resources pages to use docpage.cs, while still setting the resource hdf flag true (in order to highlight the
Merge commit '
7e680c89ae01ca30c411f32e2e7ca1c093db0336' into eclair-plus-aosp
* commit '
7e680c89ae01ca30c411f32e2e7ca1c093db0336':
docs: make the Resources docs use the same clearsilver template
Scott Main [Tue, 12 Jan 2010 20:19:56 +0000 (12:19 -0800)]
Merge "docs: make the Resources docs use the same clearsilver template as the Dev Guide. This removes the custom resourcespage.cs file and routes resources pages to use docpage.cs, while still setting the resource hdf flag true (in order to highlight the Resources tab)." into eclair
Raphael [Tue, 12 Jan 2010 19:14:17 +0000 (11:14 -0800)]
Add etc1tool to Windows SDK.
SDK BUG
2368918
This depends on Change I83485145 from development.git.
Change-Id: I1b4f5e39bd08c0cfbb656f2857921fb5ad305812
Doug Zongker [Mon, 11 Jan 2010 21:09:15 +0000 (13:09 -0800)]
update ro.build.tags when signing release builds
Apply the same changes to tags to ro.build.tags that we do for the
tags in the fingerprint (ro.build.fingerprint) and the description
(ro.build.description).
Change-Id: Ie5a057d8f04cbc32d849f91e1f9d2ea7832e81f6
http://b/
2363735 - release-key user builds ship with property ro.build.tags == test-keys
Joe Onorato [Mon, 11 Jan 2010 20:46:14 +0000 (12:46 -0800)]
Merge "$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/VoiceSearchWithKeyboard.apk)"
Joe Onorato [Mon, 11 Jan 2010 20:45:42 +0000 (15:45 -0500)]
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/VoiceSearchWithKeyboard.apk)
Jean-Baptiste Queru [Thu, 7 Jan 2010 19:44:22 +0000 (11:44 -0800)]
Remove special-handling of the restricted tag.
Nobody is using it any more, and it'd be too easy to
make a build system change that wouldn't properly handle it.
Change-Id: Ia61232ff944c34c46932c1885b2b0ec1b479566b
Jean-Baptiste Queru [Thu, 7 Jan 2010 19:19:39 +0000 (11:19 -0800)]
Remove special-case where CLASS=apps ignored TAGS=user
Also add a warning when there's TAG=user on a CLASS=apps module,
as this is not what people normally intend (this should be handled
in core.mk instead).
This used to be a source of confusion, with people using TAGS=user on
APPS and non-APPS modules, and being surprised to see some of those
included but not others.
Change-Id: I56b5618a556abdc6b841bf7a943d77c20fe9a4c5
Jean-Baptiste Queru [Thu, 7 Jan 2010 19:06:50 +0000 (11:06 -0800)]
Warn when using unrecognized/uncommon tags.
Such tags don't do anything, so using them is at
best a no-op, at worst a typo where the author intended
something else.
Change-Id: I1462032f4df3564b06a82685f226a6d5a665a633
Bjorn Bringert [Mon, 11 Jan 2010 11:09:39 +0000 (03:09 -0800)]
Merge "Include QuickSearchBox in build"
Bjorn Bringert [Fri, 8 Jan 2010 22:29:41 +0000 (22:29 +0000)]
Include QuickSearchBox in build
Change-Id: I079e2ae0dabb7a94e95658ae4189abfa2f292a7a
Fixes: http://b/issue?id=
2360980
Joe Onorato [Fri, 8 Jan 2010 19:37:38 +0000 (11:37 -0800)]
Merge "add a warning about using include in product spec files."
Dirk Dougherty [Thu, 7 Jan 2010 20:47:15 +0000 (12:47 -0800)]
am
bd4fcbfb: am
5b395224: Merge "SDK doc change: css styling for blockquote." into eclair
Merge commit '
bd4fcbfb03758cca84b6ce0041cfa77e178f6135'
* commit '
bd4fcbfb03758cca84b6ce0041cfa77e178f6135':
SDK doc change: css styling for blockquote.
Dirk Dougherty [Thu, 7 Jan 2010 20:43:47 +0000 (12:43 -0800)]
am
5b395224: Merge "SDK doc change: css styling for blockquote." into eclair
Merge commit '
5b3952249ccf7e41ac6a0ac1490cf150bca3a80f' into eclair-plus-aosp
* commit '
5b3952249ccf7e41ac6a0ac1490cf150bca3a80f':
SDK doc change: css styling for blockquote.
Dirk Dougherty [Thu, 7 Jan 2010 20:39:47 +0000 (12:39 -0800)]
Merge "SDK doc change: css styling for blockquote." into eclair
Dirk Dougherty [Thu, 7 Jan 2010 20:09:07 +0000 (12:09 -0800)]
SDK doc change: css styling for blockquote.
Bug:
2160782
Change-Id: I99a9494feb8b754636745f979db27380ae623c96
Joe Onorato [Thu, 7 Jan 2010 19:24:46 +0000 (11:24 -0800)]
add a warning about using include in product spec files.
currently disabled because there are too many of them.
Wei Huang [Thu, 7 Jan 2010 04:32:55 +0000 (20:32 -0800)]
clean GSF GTalkService objects.
Change-Id: If2461c60a53aa081fb097581e71272eea1449657
Scott Main [Thu, 7 Jan 2010 18:08:48 +0000 (10:08 -0800)]
am
91533402: am
b6da4808: update for change Ia39d3bb0, which regressed a resizing hack for IE6.
Merge commit '
915334025e0c7a5b77c387315118e687461e4842'
* commit '
915334025e0c7a5b77c387315118e687461e4842':
update for change Ia39d3bb0, which regressed a resizing hack for IE6.
Scott Main [Thu, 7 Jan 2010 18:06:00 +0000 (10:06 -0800)]
am
b6da4808: update for change Ia39d3bb0, which regressed a resizing hack for IE6.
Merge commit '
b6da4808699180c608bccef88ddb843411e663c7' into eclair-plus-aosp
* commit '
b6da4808699180c608bccef88ddb843411e663c7':
update for change Ia39d3bb0, which regressed a resizing hack for IE6.
Scott Main [Wed, 6 Jan 2010 22:18:02 +0000 (14:18 -0800)]
update for change Ia39d3bb0, which regressed a resizing hack for IE6.
This now will avoid writing the cookie for the width when IE6 calls
resizeWidth() in order to properly resize the doc-content div (other
browsers to not call resizeWidth() for resizing doc-content because it
has auto width, which IE6 does not perform).
Scott Main [Thu, 7 Jan 2010 00:57:28 +0000 (16:57 -0800)]
am
83e85549: am
a39d3bb0: docs: fix resizeAll script for IE6 so that the resizeWidth function is only called when the side navigation is actually resizable
Merge commit '
83e855494b0b4215c78593efdf69b98c115288f1'
* commit '
83e855494b0b4215c78593efdf69b98c115288f1':
docs: fix resizeAll script for IE6 so that the resizeWidth function
Scott Main [Thu, 7 Jan 2010 00:55:15 +0000 (16:55 -0800)]
am
a39d3bb0: docs: fix resizeAll script for IE6 so that the resizeWidth function is only called when the side navigation is actually resizable
Merge commit '
a39d3bb0c9001c79f93ae829d564e5fef27a573a' into eclair-plus-aosp
* commit '
a39d3bb0c9001c79f93ae829d564e5fef27a573a':
docs: fix resizeAll script for IE6 so that the resizeWidth function
Scott Main [Wed, 6 Jan 2010 22:18:02 +0000 (14:18 -0800)]
docs: fix resizeAll script for IE6 so that the resizeWidth function
is only called when the side navigation is actually resizable
This stops 'width' cookies from being written for the SDK docs
(and any other page that doesn't have resizable nav) and also adds
some security to the init() function to be sure we properly read
cookie names.
Wei-Ta Chen [Wed, 6 Jan 2010 10:42:25 +0000 (18:42 +0800)]
Add libjpeg to the prelink map.
libjpeg is now built to a shared library,
which enables it be dynamically linked by various packeages/libraries.
Joe Onorato [Tue, 5 Jan 2010 20:47:14 +0000 (12:47 -0800)]
Don't do the check build step for apps that link against the SDK.
We already have the apicheck process to make sure that nobody breaks that,
so doing the extra check isn't necessary.
Joe Onorato [Mon, 4 Jan 2010 20:57:38 +0000 (12:57 -0800)]
Tell python not to spam the source tree with .pyc files.
This only has an effect on python 2.6 and above.
Jack Palevich [Tue, 29 Dec 2009 11:04:13 +0000 (19:04 +0800)]
Add libETC1 to the prelink map.
libETC1 is a library for compressing and
decompressing images in the ETC1 format.
This is a common texture format for OpenGL ES 2.0
GPUs.
Jean-Baptiste Queru [Mon, 21 Dec 2009 23:50:18 +0000 (15:50 -0800)]
resolved conflicts for merge of
a7bfdbf2 to master
Jean-Baptiste Queru [Mon, 21 Dec 2009 23:31:49 +0000 (15:31 -0800)]
merge from open-source master
Jean-Baptiste Queru [Fri, 18 Dec 2009 01:47:28 +0000 (17:47 -0800)]
Add all-html-files-under
This allows to run droiddoc on only a specific set of subdirectories
instead of using all subdirectories.
Change-Id: I6b5daa31f6ce6801705a5c87bd05ea0e4e8c5d88
Brett Chabot [Fri, 18 Dec 2009 00:40:56 +0000 (16:40 -0800)]
am
d5cf3a95: am
1e43c510: Add CTS accounts tests to CTS makefile.
Merge commit '
d5cf3a95cce2d9699d2c3f5998d51302f51aa03c'
* commit '
d5cf3a95cce2d9699d2c3f5998d51302f51aa03c':
Add CTS accounts tests to CTS makefile.
Brett Chabot [Fri, 18 Dec 2009 00:38:04 +0000 (16:38 -0800)]
am
1e43c510: Add CTS accounts tests to CTS makefile.
Merge commit '
1e43c510758439b3195597056121c59b71481254' into eclair-plus-aosp
* commit '
1e43c510758439b3195597056121c59b71481254':
Add CTS accounts tests to CTS makefile.
Brett Chabot [Thu, 17 Dec 2009 23:14:40 +0000 (15:14 -0800)]
Add CTS accounts tests to CTS makefile.
Change-Id: If7d87e2deed2036536ad852c382dca0e8bbad87b
Andreas Huber [Thu, 17 Dec 2009 22:03:12 +0000 (14:03 -0800)]
Squashed commit of the following:
commit
b03d5f537dee393affddf89663ae6977a5512d98
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 17 14:00:37 2009 -0800
Update cleanspec to facilitate incremental building with full stagefright lib.
commit
b92560a1989f8b9cb27a8772cec5346d3d90dc84
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 17 13:31:48 2009 -0800
Enable building stagefright in all builds, make stagefright the default player.
Jeff Hamilton [Thu, 17 Dec 2009 21:35:37 +0000 (15:35 -0600)]
Cleanspecs from Ed to cleanup after my previous name change.
Jeff Hamilton [Thu, 17 Dec 2009 21:25:19 +0000 (15:25 -0600)]
Switch the platform name from Eclair-MR2 to Froyo.
Scott Main [Thu, 17 Dec 2009 20:52:54 +0000 (12:52 -0800)]
docs: make the Resources docs use the same clearsilver template
as the Dev Guide. This removes the custom resourcespage.cs file
and routes resources pages to use docpage.cs, while still
setting the resource hdf flag true (in order to highlight the
Resources tab).
Scott Main [Thu, 17 Dec 2009 05:43:46 +0000 (21:43 -0800)]
am
b0c21911: am
99a25fba: Merge change I92c7fe59 into eclair
Merge commit '
b0c219115533fe94056d4498603ce8e474e1b9a0'
* commit '
b0c219115533fe94056d4498603ce8e474e1b9a0':
docs: change DOCTYPE to html5 format
Scott Main [Thu, 17 Dec 2009 05:40:55 +0000 (21:40 -0800)]
am
99a25fba: Merge change I92c7fe59 into eclair
Merge commit '
99a25fbaa50a077c5d62b9ae204677c176534d8b' into eclair-plus-aosp
* commit '
99a25fbaa50a077c5d62b9ae204677c176534d8b':
docs: change DOCTYPE to html5 format
Android (Google) Code Review [Thu, 17 Dec 2009 05:38:02 +0000 (21:38 -0800)]
Merge change I92c7fe59 into eclair
* changes:
docs: change DOCTYPE to html5 format
Scott Main [Thu, 17 Dec 2009 05:36:15 +0000 (21:36 -0800)]
docs: change DOCTYPE to html5 format
Android (Google) Code Review [Thu, 17 Dec 2009 00:11:15 +0000 (16:11 -0800)]
Merge change I32b3795d
* changes:
add Provision to the generic build
Scott Main [Wed, 16 Dec 2009 23:52:41 +0000 (15:52 -0800)]
am
d79b160d: am
ab32fed6: docs for esr: add support for breadcrumbing in the resource docs
Merge commit '
d79b160d90450068237282393be0d7456cb14bc1'
* commit '
d79b160d90450068237282393be0d7456cb14bc1':
docs for esr: add support for breadcrumbing in the resource docs
Scott Main [Wed, 16 Dec 2009 23:44:37 +0000 (15:44 -0800)]
am
ab32fed6: docs for esr: add support for breadcrumbing in the resource docs
Merge commit '
ab32fed6a8efbdb8640f6f6b355b751fd6c7eb53' into eclair-plus-aosp
* commit '
ab32fed6a8efbdb8640f6f6b355b751fd6c7eb53':
docs for esr: add support for breadcrumbing in the resource docs
Scott Main [Wed, 16 Dec 2009 23:36:20 +0000 (15:36 -0800)]
docs for esr: add support for breadcrumbing in the resource docs
Jean-Baptiste Queru [Wed, 16 Dec 2009 18:29:18 +0000 (10:29 -0800)]
add Provision to the generic build
Change-Id: I32b3795dd147c2615186b615525c4f75e0728e19
Dirk Dougherty [Wed, 16 Dec 2009 07:31:15 +0000 (23:31 -0800)]
am
930ca65a: am
8c627b04: Merge change Ib471b5b2 into eclair
Merge commit '
930ca65a3cde0bf0817e38efee5772338abbf0c0'
* commit '
930ca65a3cde0bf0817e38efee5772338abbf0c0':
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Dirk Dougherty [Wed, 16 Dec 2009 03:29:52 +0000 (19:29 -0800)]
am
8c627b04: Merge change Ib471b5b2 into eclair
Merge commit '
8c627b04898cab723e0df8666a7cc11d5d1c70f1' into eclair-plus-aosp
* commit '
8c627b04898cab723e0df8666a7cc11d5d1c70f1':
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Android (Google) Code Review [Wed, 16 Dec 2009 03:26:48 +0000 (19:26 -0800)]
Merge change Ib471b5b2 into eclair
* changes:
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Dirk Dougherty [Wed, 16 Dec 2009 02:48:38 +0000 (18:48 -0800)]
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Bug:
2160782
Change-Id: Ib471b5b28f599447e77294c8dcc23d24a18c3436
Doug Zongker [Wed, 16 Dec 2009 01:27:49 +0000 (17:27 -0800)]
map -e with no cert to PRESIGNED
Needed for backwards compatibility with scripts that use -e.
Android (Google) Code Review [Tue, 15 Dec 2009 23:51:10 +0000 (15:51 -0800)]
Merge change If6a53aa5
* changes:
add "EXTERNAL" as special value of LOCAL_CERTIFICATE
Doug Zongker [Tue, 15 Dec 2009 23:06:55 +0000 (15:06 -0800)]
add "EXTERNAL" as special value of LOCAL_CERTIFICATE
Setting LOCAL_CERTIFICATE to "EXTERNAL" now marks an apk (either a
prebuilt or otherwise) as needing the default test key within the
system, but one that should be signed after the target_files is
produced but before sign_target_files_apks does the rest of the
signing. (We use this to ship apps on the system that are signed by
third parties, like Facebook.)
Xavier Ducrohet [Tue, 15 Dec 2009 23:05:54 +0000 (15:05 -0800)]
am
6f6b2090: am
920f2aae: Add the LiveWallpaper sample as prebuilt to the SDK system image.
Merge commit '
6f6b2090cfb981b0c52b0c9271753968a6e94cc2'
* commit '
6f6b2090cfb981b0c52b0c9271753968a6e94cc2':
Add the LiveWallpaper sample as prebuilt to the SDK system image.
Xavier Ducrohet [Tue, 15 Dec 2009 23:03:19 +0000 (15:03 -0800)]
am
374909f6: am
fac84b56: Merge change Icb5cf14e into eclair
Merge commit '
374909f68a78941909ecd0b6a329822fdd01cac5'
* commit '
374909f68a78941909ecd0b6a329822fdd01cac5':
Add feature list support to DroidDoc.
Xavier Ducrohet [Tue, 15 Dec 2009 23:03:15 +0000 (15:03 -0800)]
am
c1cd624b: am
88f254bf: Add gallery to the SDK build now that it\'s split from the Camera app.
Merge commit '
c1cd624b3a4c0528ea386a12f20b6049f12c3858'
* commit '
c1cd624b3a4c0528ea386a12f20b6049f12c3858':
Add gallery to the SDK build now that it's split from the Camera app.
Dirk Dougherty [Tue, 15 Dec 2009 23:03:11 +0000 (15:03 -0800)]
am
7b0e85e1: am
502c498f: sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Merge commit '
7b0e85e1814376286c7d036f73241f9a19f70b08'
* commit '
7b0e85e1814376286c7d036f73241f9a19f70b08':
sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Xavier Ducrohet [Tue, 15 Dec 2009 18:33:15 +0000 (10:33 -0800)]
am
920f2aae: Add the LiveWallpaper sample as prebuilt to the SDK system image.
Merge commit '
920f2aaee64cc21f00d712ba17a1dded02ccff6b' into eclair-plus-aosp
* commit '
920f2aaee64cc21f00d712ba17a1dded02ccff6b':
Add the LiveWallpaper sample as prebuilt to the SDK system image.
Xavier Ducrohet [Tue, 15 Dec 2009 15:42:24 +0000 (07:42 -0800)]
am
fac84b56: Merge change Icb5cf14e into eclair
Merge commit '
fac84b561193a62b3e9bc7a50b8948a6356be92c' into eclair-plus-aosp
* commit '
fac84b561193a62b3e9bc7a50b8948a6356be92c':
Add feature list support to DroidDoc.
Xavier Ducrohet [Tue, 15 Dec 2009 15:41:17 +0000 (07:41 -0800)]
am
88f254bf: Add gallery to the SDK build now that it\'s split from the Camera app.
Merge commit '
88f254bf55b8a78921d94f40e3bcc9c25a348570' into eclair-plus-aosp
* commit '
88f254bf55b8a78921d94f40e3bcc9c25a348570':
Add gallery to the SDK build now that it's split from the Camera app.
Dirk Dougherty [Tue, 15 Dec 2009 15:38:57 +0000 (07:38 -0800)]
am
502c498f: sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Merge commit '
502c498fec23cb28d16f5e86e981400f76da36ea' into eclair-plus-aosp
* commit '
502c498fec23cb28d16f5e86e981400f76da36ea':
sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Android Git Automerger [Tue, 15 Dec 2009 08:44:45 +0000 (00:44 -0800)]
Merge commit 'goog/eclair-plus-aosp'
Xavier Ducrohet [Tue, 15 Dec 2009 06:37:13 +0000 (22:37 -0800)]
Add the LiveWallpaper sample as prebuilt to the SDK system image.
Change-Id: I5a1b0d2e383b757e52879792ee80dbd61f97f9a4
Android (Google) Code Review [Tue, 15 Dec 2009 02:20:10 +0000 (18:20 -0800)]
Merge change Icb5cf14e into eclair
* changes:
Add feature list support to DroidDoc.
Xavier Ducrohet [Tue, 15 Dec 2009 01:55:05 +0000 (17:55 -0800)]
Add feature list support to DroidDoc.
Similarly to intent actions/categories, DroidDoc look
for the FEATURE-type SdkConstant annotation and builds
a list of optional features for the platform.
This is then packaged with the SDK to be used by the
custom editors (manifest editor in this case)
Change-Id: Icb5cf14ebd8251017cd850eacfdbb889219b3697
Xavier Ducrohet [Tue, 15 Dec 2009 00:46:05 +0000 (16:46 -0800)]
Add gallery to the SDK build now that it's split from the Camera app.
Bug:
2275030
Change-Id: Iad74a37d0df1d77185062cb4323665be7185c242
Doug Zongker [Mon, 14 Dec 2009 23:33:14 +0000 (15:33 -0800)]
am
4cac8afc: am
714111cb: include pre-signed prebuilt .apks in apkcerts.txt
Merge commit '
4cac8afc21a356ce3ca074f12383cf1526d44156'
* commit '
4cac8afc21a356ce3ca074f12383cf1526d44156':
include pre-signed prebuilt .apks in apkcerts.txt
Doug Zongker [Mon, 14 Dec 2009 23:24:22 +0000 (15:24 -0800)]
am
714111cb: include pre-signed prebuilt .apks in apkcerts.txt
Merge commit '
714111cbdde0fd5c4f276d4666ddb99cbf0c5008' into eclair-mr2-plus-aosp
* commit '
714111cbdde0fd5c4f276d4666ddb99cbf0c5008':
include pre-signed prebuilt .apks in apkcerts.txt
Doug Zongker [Mon, 14 Dec 2009 17:56:19 +0000 (09:56 -0800)]
include pre-signed prebuilt .apks in apkcerts.txt
Dirk Dougherty [Thu, 3 Dec 2009 02:01:16 +0000 (18:01 -0800)]
sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Bug:
2160782
Change-Id: I5c45bdf4861ba2dc150e95d5523367a14b401304
Doug Zongker [Fri, 11 Dec 2009 23:01:40 +0000 (15:01 -0800)]
am
39ecb46e: am
9bc88726: Merge change I45302ff0 into eclair-mr2
Merge commit '
39ecb46ed1c124e4d3e3ebb594a62b65984483ac'
* commit '
39ecb46ed1c124e4d3e3ebb594a62b65984483ac':
make prebuilt .apks require LOCAL_CERTIFICATE
Doug Zongker [Fri, 11 Dec 2009 22:54:54 +0000 (14:54 -0800)]
am
9bc88726: Merge change I45302ff0 into eclair-mr2
Merge commit '
9bc88726cb24e92007d42c126ec094e687b3905f' into eclair-mr2-plus-aosp
* commit '
9bc88726cb24e92007d42c126ec094e687b3905f':
make prebuilt .apks require LOCAL_CERTIFICATE
Android (Google) Code Review [Fri, 11 Dec 2009 22:50:33 +0000 (14:50 -0800)]
Merge change I45302ff0 into eclair-mr2
* changes:
make prebuilt .apks require LOCAL_CERTIFICATE
Doug Zongker [Fri, 11 Dec 2009 21:50:35 +0000 (13:50 -0800)]
make prebuilt .apks require LOCAL_CERTIFICATE
Require people who check in new prebuilts to decide what keys they
should be signed with, rather than having a fire drill every time we
go to sign a build and discover new prebuilts.
Scott Main [Fri, 11 Dec 2009 07:41:29 +0000 (23:41 -0800)]
am
be4eca18: am
f7b3211e: am
1dd6ff63: Merge change I483cf38d into eclair
Merge commit '
be4eca189416ca9578d6d35ae3c7e89ff9e4aa38'
* commit '
be4eca189416ca9578d6d35ae3c7e89ff9e4aa38':
docs: add "figure" class for DIV elements that contain
Ying Wang [Fri, 11 Dec 2009 07:41:26 +0000 (23:41 -0800)]
Scott Main [Fri, 11 Dec 2009 01:52:19 +0000 (17:52 -0800)]
am
f7b3211e: am
1dd6ff63: Merge change I483cf38d into eclair
Merge commit '
f7b3211e089a2b243938f5e3101d40cbdaf8b8bb' into eclair-mr2-plus-aosp
* commit '
f7b3211e089a2b243938f5e3101d40cbdaf8b8bb':
docs: add "figure" class for DIV elements that contain