Merge commit '75e44a1c72c5e6ebf68601bbb903fa3e375bd7d5'
* commit '75e44a1c72c5e6ebf68601bbb903fa3e375bd7d5':
AI 148197: Add a link in "Community" page to the android market discussion forum.
Merge commit 'a417ee5afa8133d42d76691d6501741dc6c7178d' into donut
* commit 'a417ee5afa8133d42d76691d6501741dc6c7178d':
AI 148197: Add a link in "Community" page to the android market discussion forum.
Merge commit '4f508936342dd866d1183ca418ca091437a5ddf6'
* commit '4f508936342dd866d1183ca418ca091437a5ddf6':
AI 148193: More misc fixes in format, links, content for Android 1.5 SDK docs.
Merge commit '392d29ab0d02dc4040436ccc9638b7498b2eb1de' into donut
* commit '392d29ab0d02dc4040436ccc9638b7498b2eb1de':
AI 148193: More misc fixes in format, links, content for Android 1.5 SDK docs.
Merge commit '275555c8eb3fb5df6e7320873b88b77cdde85a9e'
* commit '275555c8eb3fb5df6e7320873b88b77cdde85a9e':
location: Add support for location providers outside of the system process.
Also added new permissions android.permission.INSTALL_LOCATION_PROVIDER
and android.permission.INSTALL_LOCATION_COLLECTOR to the public API.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '767db0a1ec760042b145e7c19a672c7180ad10f3'
* commit '767db0a1ec760042b145e7c19a672c7180ad10f3':
AI 148189: update the NotepadCodelab zip file to remove R.java, other project/bin files and erratic hidden files;
Merge commit '9a81736176f507489f262344b6e3d55bbe53be7c'
* commit '9a81736176f507489f262344b6e3d55bbe53be7c':
Add the ability to specify the onClick handler with XML. The new android:onClick attribute defines the name of the method in the Activity to invoke when the button is clicked. The method has to be public and get one View parameter.
Merge commit '003eaa2808e1e41d85ec6a5612de96e3ae575664' into donut
* commit '003eaa2808e1e41d85ec6a5612de96e3ae575664':
AI 148189: update the NotepadCodelab zip file to remove R.java, other project/bin files and erratic hidden files;
Merge commit 'e5c4725666da25138193bed83831b66b9c0b2c45'
* commit 'e5c4725666da25138193bed83831b66b9c0b2c45':
pass original ptrs to JNI release functions (instead of += index to them)
Merge commit '15e3d0f082d551f8819fbe4b0d502cc108627876'
* commit '15e3d0f082d551f8819fbe4b0d502cc108627876':
location: Use ILocationProvider Binder interface for all location providers.
This change eliminates the LocationProviderImpl class which had been used
for location providers running in the system process.
Now the LocationProvider base class is only used to implement the
LocationManager.createProvider() method for retrieving provider information.
Added a new IGpsStatusProvider interface for providers that serve GPS status.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Fixes conflicting attr IDs due to donut-to-master automerge.
As a side effect, it fixes the "Field android.R.attr.contentAuthority
has changed value from 16843373 to 16843374" error introduced by change
804.
Background:
I submitted two changes to donut that add new public attributes:
https://android-git.corp.google.com/g/Gerrit#change,795https://android-git.corp.google.com/g/Gerrit#change,796
This was fine in donut (though still waiting for build server to
finish), but when auto-merged to master it caused a new build breakage.
This was on top of existing breakage due to
https://android-git.corp.google.com/g/Gerrit#change,804
The problem is that there are now multiple attribute definitions with
identical IDs, as you can see at the bottom of:
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=blob;f=core/res/res/values/public.xml;h=becc90ef05481321c60301176b91ca7b4553a6d7;hb=master
This did not cause an automerge failure, since my new attributes were
in the "platform 4" section, whereas the new attributes in master were
in the "platform 5" section. It seems like the temporary solution
would be to change the resource IDs in "platform 5" to come after the
ones in "platform 4". But the next time someone adds an attribute in
"platform 4", we will have the same problem. Any ideas?
If this attribute is provided and true, the searchable activity will be
included in any global lists of search targets.
This is needed to support third-party suggestion providers in
global search. See http://b/issue?id=1819651
This lets the searchable activity specify the number of
characters needed to trigger suggestions. Before, this was
hard-coded at 0. This caused unnecessary querying of the
suggestion provider in cases where the provider does not
return suggestions for empty or short queries.
Merge commit '2bc9e139655666e3c6a58d8fa74a12111b06cafd'
* commit '2bc9e139655666e3c6a58d8fa74a12111b06cafd':
TypedProperties: add getStringInfo() to help deal with null strings
Merge commit '52a3cb53ddcce049d2e804c3042514df576cb5b9'
* commit '52a3cb53ddcce049d2e804c3042514df576cb5b9':
TypedProperties: change the file format to be a subset of Java
Merge commit '2cd006c8f927d3e364c32f946b844377bdc56d3e'
* commit '2cd006c8f927d3e364c32f946b844377bdc56d3e':
Make the home screen come up in the simulator.
Merge commit '980d12b13bad50d6fbb50f3fe8f8dbc451a7d87c'
* commit '980d12b13bad50d6fbb50f3fe8f8dbc451a7d87c':
Fix typo in exception message and add a new exception if the user tries to use the same child as both the handle and content for the SlidingDrawer.
