OSDN Git Service
The Android Automerger [Fri, 29 Jan 2010 16:09:31 +0000 (08:09 -0800)]
Merge branch 'master' into froyo-release
Ed Heyl [Thu, 28 Jan 2010 23:09:40 +0000 (15:09 -0800)]
am
ffae6f51: (-s ours) am
25a331ab: Merge "Update version string." into eclair
Merge commit '
ffae6f5127387c7a1f5cc49ca3f5f3203f7d15f0'
* commit '
ffae6f5127387c7a1f5cc49ca3f5f3203f7d15f0':
Update version string.
Scott Main [Thu, 28 Jan 2010 23:06:03 +0000 (15:06 -0800)]
am
5729dbfa: am
e6fed880: Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don\'t get executed when pressed. Bug:
1909300" into eclair
Merge commit '
5729dbfa00ffb659c5758195b617af4349c0ef75'
* commit '
5729dbfa00ffb659c5758195b617af4349c0ef75':
docs: accept the enter key on key-down, rather than key-up,
Raphael [Thu, 28 Jan 2010 21:43:39 +0000 (13:43 -0800)]
am
ccd0338c: am
e749b5a7: Fix windows make: layoutlib_api moved to sdk.git too.
Merge commit '
ccd0338ce637e62c483a727de04236aa05f989aa'
* commit '
ccd0338ce637e62c483a727de04236aa05f989aa':
Fix windows make: layoutlib_api moved to sdk.git too.
Jesse Wilson [Thu, 28 Jan 2010 21:33:29 +0000 (13:33 -0800)]
Merge "Suppress the annoying "XML missing method" warnings from the doc build."
Jesse Wilson [Thu, 28 Jan 2010 18:50:58 +0000 (10:50 -0800)]
Suppress the annoying "XML missing method" warnings from the doc build.
Dirk Dougherty [Thu, 28 Jan 2010 18:48:00 +0000 (10:48 -0800)]
am
262e8214: am
6339cfe8: Merge "doc change: add announce for developer lab at mwc." into eclair
Merge commit '
262e821409fbd59b593e56cb75a339e8a2364533'
* commit '
262e821409fbd59b593e56cb75a339e8a2364533':
doc change: add announce for developer lab at mwc.
The Android Automerger [Thu, 28 Jan 2010 16:10:19 +0000 (08:10 -0800)]
FRE28
The Android Automerger [Thu, 28 Jan 2010 16:09:52 +0000 (08:09 -0800)]
Merge branch 'master' into froyo-release
Andreas Huber [Wed, 27 Jan 2010 00:23:53 +0000 (16:23 -0800)]
Enable stagefright's http implementation by default.
related-to-bug:
2395398
Suchi Amalapurapu [Wed, 27 Jan 2010 22:14:56 +0000 (14:14 -0800)]
Add DefaultContainerService to core make file
The Android Automerger [Wed, 27 Jan 2010 16:09:29 +0000 (08:09 -0800)]
FRE27
Ed Heyl [Tue, 26 Jan 2010 23:01:17 +0000 (15:01 -0800)]
am
25a331ab: Merge "Update version string." into eclair
Merge commit '
25a331ab870edcf31dbbfab0a9e6f4cef88654f5' into eclair-plus-aosp
* commit '
25a331ab870edcf31dbbfab0a9e6f4cef88654f5':
Update version string.
Scott Main [Tue, 26 Jan 2010 23:01:13 +0000 (15:01 -0800)]
am
e6fed880: Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don\'t get executed when pressed. Bug:
1909300" into eclair
Merge commit '
e6fed8807f469a91e10b64990a7709482378dfa9' into eclair-plus-aosp
* commit '
e6fed8807f469a91e10b64990a7709482378dfa9':
docs: accept the enter key on key-down, rather than key-up,
Ed Heyl [Tue, 26 Jan 2010 22:55:33 +0000 (14:55 -0800)]
Merge "Update version string." into eclair
Dianne Hackborn [Tue, 26 Jan 2010 20:54:40 +0000 (12:54 -0800)]
Update version string.
Change-Id: I9b03dadcbc93109f9c91bb9813a41ec23a6c1448
The Android Automerger [Tue, 26 Jan 2010 16:18:51 +0000 (08:18 -0800)]
FRE26
The Android Automerger [Tue, 26 Jan 2010 16:18:38 +0000 (08:18 -0800)]
Merge branch 'master' into froyo-release
Valentin Kravtsov [Mon, 18 Jan 2010 18:18:46 +0000 (18:18 +0000)]
Adding clean step
Change-Id: I715681edf2d668ee9b5a483fa82af2e608285f47
Scott Main [Mon, 25 Jan 2010 23:39:40 +0000 (15:39 -0800)]
Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don't get executed when pressed. Bug:
1909300" into eclair
Scott Main [Mon, 25 Jan 2010 22:38:43 +0000 (14:38 -0800)]
docs: accept the enter key on key-down, rather than key-up,
in order to be sure we capture this key before anything else.
Fixes case where highlighted suggestions don't get executed
when pressed.
Bug:
1909300
Doug Zongker [Mon, 25 Jan 2010 22:32:31 +0000 (14:32 -0800)]
Merge "add a .gitignore file to make git ignore *.pyc files"
Raphael [Mon, 25 Jan 2010 22:30:49 +0000 (14:30 -0800)]
am
e749b5a7: Fix windows make: layoutlib_api moved to sdk.git too.
Merge commit '
e749b5a71abe9c3659921c50cc4468a1a4f984f5' into eclair-plus-aosp
* commit '
e749b5a71abe9c3659921c50cc4468a1a4f984f5':
Fix windows make: layoutlib_api moved to sdk.git too.
The Android Automerger [Mon, 25 Jan 2010 16:50:50 +0000 (08:50 -0800)]
FRE25
The Android Automerger [Mon, 25 Jan 2010 16:50:29 +0000 (08:50 -0800)]
Merge branch 'master' into froyo-release
Raphael [Sat, 23 Jan 2010 02:36:37 +0000 (18:36 -0800)]
Fix windows make: layoutlib_api moved to sdk.git too.
Change-Id: Ia030eda4514361b20a5ecb29c997ab625909228c
Dirk Dougherty [Fri, 22 Jan 2010 22:27:55 +0000 (14:27 -0800)]
am
6339cfe8: Merge "doc change: add announce for developer lab at mwc." into eclair
Merge commit '
6339cfe89b62bfa7803ff93c4fc13c9be759f47a' into eclair-plus-aosp
* commit '
6339cfe89b62bfa7803ff93c4fc13c9be759f47a':
doc change: add announce for developer lab at mwc.
Dirk Dougherty [Fri, 22 Jan 2010 22:23:07 +0000 (14:23 -0800)]
Merge "doc change: add announce for developer lab at mwc." into eclair
Dirk Dougherty [Wed, 20 Jan 2010 23:36:11 +0000 (15:36 -0800)]
doc change: add announce for developer lab at mwc.
Bug:
2160782
Change-Id: I363e964f0d35eaf7b2d7593d6a3630196ed6de33
Doug Zongker [Fri, 22 Jan 2010 18:23:45 +0000 (10:23 -0800)]
add a .gitignore file to make git ignore *.pyc files
Change-Id: Ie8877ca9c1152681433a638a5e4d20948326f7ca
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:35:52 +0000 (08:35 -0800)]
FRE22B
android-build SharedAccount [Fri, 22 Jan 2010 16:34:06 +0000 (08:34 -0800)]
clean step for JIT switch
The Android Automerger [Fri, 22 Jan 2010 16:09:17 +0000 (08:09 -0800)]
FRE22
The Android Automerger [Thu, 21 Jan 2010 16:09:57 +0000 (08:09 -0800)]
FRE21
The Android Automerger [Wed, 20 Jan 2010 16:08:43 +0000 (08:08 -0800)]
FRE20
The Android Automerger [Wed, 20 Jan 2010 16:08:29 +0000 (08:08 -0800)]
Merge branch 'master' into froyo-release
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")
The Android Automerger [Tue, 19 Jan 2010 16:57:15 +0000 (08:57 -0800)]
FRE19
The Android Automerger [Tue, 19 Jan 2010 16:56:47 +0000 (08:56 -0800)]
Merge branch 'master' into froyo-release
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.
The Android Automerger [Fri, 15 Jan 2010 18:32:20 +0000 (10:32 -0800)]
FRE15C
The Android Automerger [Fri, 15 Jan 2010 18:32:14 +0000 (10:32 -0800)]
Merge branch 'master' into froyo-release
The Android Automerger [Fri, 15 Jan 2010 17:27:09 +0000 (09:27 -0800)]
FRE15B
The Android Automerger [Fri, 15 Jan 2010 17:20:04 +0000 (09:20 -0800)]
FRE15
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
android-build SharedAccount [Thu, 14 Jan 2010 16:49:20 +0000 (08:49 -0800)]
FRE14B
The Android Automerger [Thu, 14 Jan 2010 16:09:03 +0000 (08:09 -0800)]
FRE14
The Android Automerger [Thu, 14 Jan 2010 16:08:32 +0000 (08:08 -0800)]
Merge branch 'master' into froyo-release
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)
The Android Automerger [Wed, 13 Jan 2010 16:18:11 +0000 (08:18 -0800)]
FRE13
The Android Automerger [Wed, 13 Jan 2010 16:17:48 +0000 (08:17 -0800)]
Merge branch 'master' into froyo-release
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
The Android Automerger [Tue, 12 Jan 2010 16:03:20 +0000 (08:03 -0800)]
FRE12
The Android Automerger [Mon, 11 Jan 2010 22:25:51 +0000 (14:25 -0800)]
FRE11B
The Android Automerger [Mon, 11 Jan 2010 22:25:27 +0000 (14:25 -0800)]
Merge branch 'master' into froyo-release
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
The Android Automerger [Mon, 11 Jan 2010 15:52:38 +0000 (07:52 -0800)]
FRE11
The Android Automerger [Mon, 11 Jan 2010 15:52:08 +0000 (07:52 -0800)]
Merge branch 'master' into froyo-release
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."
android-build SharedAccount [Fri, 8 Jan 2010 17:12:05 +0000 (09:12 -0800)]
Merge branch 'master' into froyo-release
android-build SharedAccount [Fri, 8 Jan 2010 17:07:21 +0000 (09:07 -0800)]
FRE08
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.
The Android Automerger [Thu, 7 Jan 2010 16:56:05 +0000 (08:56 -0800)]
FRE07
The Android Automerger [Thu, 7 Jan 2010 16:55:41 +0000 (08:55 -0800)]
Merge branch 'master' into froyo-release
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
OSDN Git Service
