Merge commit 'e8a1f6af96d09d8105621932073d6f79e24a5dc9'
* commit 'e8a1f6af96d09d8105621932073d6f79e24a5dc9':
Set organizations to be null for generateKeyPair to use the default.
Merge commit '2830b9226bc737da970f8d20601ccde19008415c'
* commit '2830b9226bc737da970f8d20601ccde19008415c':
Update the gservices gtalk setting for the terms and services url.
Merge commit '662df0b9630fd685a7cf86bbfec15ac6b6c286c6'
* commit '662df0b9630fd685a7cf86bbfec15ac6b6c286c6':
Launch user-entered URLs directly without a web search.
This is to fix bug http://b/issue?id=1931983
Instead of changing the keyboard button from search to carriage return,
I have changed it from search to 'Go' which I find more useful since
it indicates that the user can now go to that URL.
These are all variations of needing to validate ranges on editing operations
coming from the IME, to account for the underlying text changing (usually being
deleted) asynchronously with the IME.
* changes:
Helper API cleanup. Allows multiple helpers to function, because they'll always go in the same order, and this lets us not have to write headers to keep them paired.
Merge commit 'ecfb9f91afa49df7b9b62526dcaca431b5ff1e01'
* commit 'ecfb9f91afa49df7b9b62526dcaca431b5ff1e01':
Fixes#1933585. Don't dismiss ACTV's drop down when it's set to alwaysVisible.
Merge commit '2c10b5f483f832523305c11d44035fc7f5d9a54b'
* commit '2c10b5f483f832523305c11d44035fc7f5d9a54b':
Make all static methods in SearchManager non-static.
They were only static because of a now removed restriction that
only activity contexts could instantiate SearchManager.
This only changes hidden APIs, but all users of the changed methods
must be updated to use them non-statically before this is submitted.
Since https://android-git.corp.google.com/g/3880
all activities create a SearchManager object, to handle
saving and restoring the search dialog. This broke
ActivityUnitTestCase, since ApplicationContext.getSearchManager()
threw an exception in non-activity contexts.
This change removes the activity context check from
getSearchManager(). Since SearchManager is now just a thin
wrapper for SearchManagerService, there shouldn't be anything
activity-specific in it.
Fixes http://b/issue?id=1926254
Merge commit '3e3324bae45ff21615c07507e6918ad21681a6a2'
* commit '3e3324bae45ff21615c07507e6918ad21681a6a2':
Merge the change in cupcake_dcm so that Contacts app is able to use it.
Merge commit '9e71b07cfe88cdb1abf4a01077ca263d7f957c94'
* commit '9e71b07cfe88cdb1abf4a01077ca263d7f957c94':
Fixes#1926784. Setting android:ellipsize on an EditText now ellipsizes the hint.
Merge commit '3af8e9389e008c0076b86cc6b3c6f005e7473d10'
* commit '3af8e9389e008c0076b86cc6b3c6f005e7473d10':
Change addCertificate to take byte[] instead of String as we don't know the encoding.
Merge commit '5254657540b0a6ad54be6229b68fa5626e4ef9e5'
* commit '5254657540b0a6ad54be6229b68fa5626e4ef9e5':
Added in Settings.Secure default country and variant for the default TTS language.
It doesn't make much sense to ellipsize the text entered by the user, so we
just ellipsize the hint. This avoids introducing a new XML attribute/Java API
just for the particular case of ellipsizing the hint.
ContactsContract now contains all the useful constants that are
contained in Contacts.Intents. Because we have to continue to
support the Contacts interface, the constants are kept there,
but now simply reference the real versions in Contacts.Intents.
Contacts.Intents will be deprecated and developers are encouraged
to move to Contacts.Intents.
