Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7ba69dd8: am 9e1379f1: Fix sdk docs build for framework from remote input api addition.

Browse Source 
* commit '7ba69dd8bd428494c7a2848b5d3325d47cf4afbf':
  Fix sdk docs build for framework from remote input api addition.
This commit is contained in:
Griff Hazen
2014-05-20 20:18:11 +00:00
committed by Android Git Automerger
parent b720abeee8 7ba69dd8bd
commit 51eb4e657c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/Notification.java
View File

@@ -1999,7 +1999,7 @@ public class Notification implements Parcelable
* cause this value to be ignored.
*
* <p>This sort key can also be used to order members of a notification group. See
* {@link Builder#setGroup}.
* {@link #setGroup}.
*
* @see String#compareTo(String)
*/

2
core/java/android/app/RemoteInput.java
View File

@@ -153,7 +153,7 @@ public final class RemoteInput implements Parcelable {
* Specifies choices available to the user to satisfy this input.
* @param choices an array of pre-defined choices for users input.
* You must provide a non-null and non-empty array if
* you set {@link #mAllowFreeFormInput} to {@code false}.
* you disabled free form input using {@link #setAllowFreeFormInput}.
* @return this object for method chaining
*/
public Builder setChoices(CharSequence[] choices) {