Merge commit 'daa3b7a46958206cdac5d21e4235a6dfabb6829a'
* commit 'daa3b7a46958206cdac5d21e4235a6dfabb6829a':
docs: add the ability to exclude PRE elements from being prettified
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
Merge commit '945ed36ec486f83c4546cac8d6bed954dfe32c4e' into eclair-plus-aosp
* commit '945ed36ec486f83c4546cac8d6bed954dfe32c4e':
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")
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
Merge commit '4bd6c862f0897f99abc227611822e1dace03b6e0'
* commit '4bd6c862f0897f99abc227611822e1dace03b6e0':
docs: hide the "back to top" link when there's no vertical scroll
Merge commit '3556305eb00cd63ce75bc5ef4a84fd1b454c50fb' into eclair-plus-aosp
* commit '3556305eb00cd63ce75bc5ef4a84fd1b454c50fb':
docs: hide the "back to top" link when there's no vertical scroll
Merge commit 'd1b68863f5ef252a92adcfb22d3ca48872981a61' into eclair-plus-aosp
* commit 'd1b68863f5ef252a92adcfb22d3ca48872981a61':
Add etc1tool to Windows SDK.
Merge commit '29bec3f707401630e6ad93dcaa3e9a620f0d9bbb'
* commit '29bec3f707401630e6ad93dcaa3e9a620f0d9bbb':
docs: make the Resources docs use the same clearsilver template
Merge commit '7e680c89ae01ca30c411f32e2e7ca1c093db0336' into eclair-plus-aosp
* commit '7e680c89ae01ca30c411f32e2e7ca1c093db0336':
docs: make the Resources docs use the same clearsilver template
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
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
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
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
Merge commit '915334025e0c7a5b77c387315118e687461e4842'
* commit '915334025e0c7a5b77c387315118e687461e4842':
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.
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).
Merge commit '83e855494b0b4215c78593efdf69b98c115288f1'
* commit '83e855494b0b4215c78593efdf69b98c115288f1':
docs: fix resizeAll script for IE6 so that the resizeWidth function
Merge commit 'a39d3bb0c9001c79f93ae829d564e5fef27a573a' into eclair-plus-aosp
* commit 'a39d3bb0c9001c79f93ae829d564e5fef27a573a':
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.
