GitLab

Merge commit 'ffae6f51'

* commit 'ffae6f51':
  Update version string.

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 '5729dbfa'

* commit '5729dbfa':
  docs: accept the enter key on key-down, rather than key-up,

Merge commit 'ccd0338c'

* commit 'ccd0338c':
  Fix windows make: layoutlib_api moved to sdk.git too.

Merge commit '262e8214'

* commit '262e8214':
  doc change: add announce for developer lab at mwc.

related-to-bug: 2395398

Merge commit '25a331ab' into eclair-plus-aosp

* commit '25a331ab':
  Update version string.

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 'e6fed880' into eclair-plus-aosp

* commit 'e6fed880':
  docs: accept the enter key on key-down, rather than key-up,

Change-Id: I9b03dadcbc93109f9c91bb9813a41ec23a6c1448

Change-Id: I715681edf2d668ee9b5a483fa82af2e608285f47

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

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

Merge commit 'e749b5a7' into eclair-plus-aosp

* commit 'e749b5a7':
  Fix windows make: layoutlib_api moved to sdk.git too.

Change-Id: Ia030eda4514361b20a5ecb29c997ab625909228c

Merge commit '6339cfe8' into eclair-plus-aosp

* commit '6339cfe8':
  doc change: add announce for developer lab at mwc.

Bug: 2160782
Change-Id: I363e964f0d35eaf7b2d7593d6a3630196ed6de33

Change-Id: Ie8877ca9c1152681433a638a5e4d20948326f7ca

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 'daa3b7a4'

* commit 'daa3b7a4':
  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

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 '945ed36e' into eclair-plus-aosp

* commit '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")

GoogleSearch is being replaced by QuickSearchBox, which
includes Google search.

Change-Id: Ief2d1136b8977b0fc6e2b5d97221e5c0bc620daf

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

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 '4bd6c862'

* commit '4bd6c862':
  docs: hide the "back to top" link when there's no vertical scroll

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 '3556305e' into eclair-plus-aosp

* commit '3556305e':
  docs: hide the "back to top" link when there's no vertical scroll