Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51daba32 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am d4d42af5: am df00735c: am e02d5a20: am a32c4376: update to wear docs.... 

am d4d42af5: am df00735c: am e02d5a20: am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad

* commit 'd4d42af5':
  update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
parents 34c40cab d4d42af5

docs/html/reference/android/preview/support/v4/app/NotificationManagerCompat.html

+60 −4
Original line number Diff line number Diff line
@@ -1031,6 +1031,16 @@ From class 
    <div class="jd-details-descr">

      

  <div class="jd-tagdata jd-tagdescr"><p>Cancel a previously shown notification.</p></div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Parameters</h5>

      <table class="jd-tagtable">

        <tr>

          <th>id</td>

          <td>the ID of the notification

</td>

        </tr>

      </table>

  </div>



    </div>

</div>
@@ -1060,6 +1070,20 @@ From class 
    <div class="jd-details-descr">

      

  <div class="jd-tagdata jd-tagdescr"><p>Cancel a previously shown notification.</p></div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Parameters</h5>

      <table class="jd-tagtable">

        <tr>

          <th>tag</td>

          <td>the string identifier of the notification.</td>

        </tr>

        <tr>

          <th>id</td>

          <td>the ID of the notification

</td>

        </tr>

      </table>

  </div>



    </div>

</div>
@@ -1178,6 +1202,20 @@ From class 
    <div class="jd-details-descr">

      

  <div class="jd-tagdata jd-tagdescr"><p>Post a notification to be shown in the status bar, stream, etc.</p></div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Parameters</h5>

      <table class="jd-tagtable">

        <tr>

          <th>id</td>

          <td>the ID of the notification</td>

        </tr>

        <tr>

          <th>notification</td>

          <td>the notification to post to the system

</td>

        </tr>

      </table>

  </div>



    </div>

</div>
@@ -1207,6 +1245,24 @@ From class 
    <div class="jd-details-descr">

      

  <div class="jd-tagdata jd-tagdescr"><p>Post a notification to be shown in the status bar, stream, etc.</p></div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Parameters</h5>

      <table class="jd-tagtable">

        <tr>

          <th>tag</td>

          <td>the string identifier for a notification. Can be <code>null</code>.</td>

        </tr>

        <tr>

          <th>id</td>

          <td>the ID of the notification. The pair (tag, id) must be unique within your app.</td>

        </tr>

        <tr>

          <th>notification</td>

          <td>the notification to post to the system

</td>

        </tr>

      </table>

  </div>



    </div>

</div>

docs/html/reference/android/preview/support/wearable/notifications/RemoteInput.Builder.html

+56 −11
Original line number Diff line number Diff line
@@ -886,11 +886,14 @@ From class 
      <table class="jd-tagtable">

        <tr>

          <th>returnKey</td>

          <td>the extras key to be set with input collected from the user

         when the intent is sent.

</td>

          <td>the intent extras key that refers to the input collected from the user</td>

        </tr>

      </table>

  </div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Returns</h5>

      <ul class="nolist"><li>this object for method chaining

</li></ul>

  </div>



    </div>
@@ -966,10 +969,24 @@ From class 
      </div>

    <div class="jd-details-descr">

      

  <div class="jd-tagdata jd-tagdescr"><p>Specifies whether the user can provide arbitrary values.  The

 default is <code>true</code>.  If this is set to <code>false</code>, a

 non-null non-empty value should be passed to <code><a href="/reference/android/preview/support/wearable/notifications/RemoteInput.Builder.html#setChoices(java.lang.String[])">setChoices(String[])</a></code>.

</p></div>

  <div class="jd-tagdata jd-tagdescr"><p>Specifies whether the user can provide arbitrary values.</p></div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Parameters</h5>

      <table class="jd-tagtable">

        <tr>

          <th>allowFreeFormInput</td>

          <td>The default is <code>true</code>.

         If you specify <code>false</code>, you must

         provide a non-null and non-empty array to <code><a href="/reference/android/preview/support/wearable/notifications/RemoteInput.Builder.html#setChoices(java.lang.String[])">setChoices(String[])</a></code> or

         an <code><a href="http://developer.android.com/reference/java/lang/IllegalArgumentException.html">IllegalArgumentException</a></code> is thrown.</td>

        </tr>

      </table>

  </div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Returns</h5>

      <ul class="nolist"><li>this object for method chaining

</li></ul>

  </div>



    </div>

</div>
@@ -998,8 +1015,23 @@ From class 
      </div>

    <div class="jd-details-descr">

      

  <div class="jd-tagdata jd-tagdescr"><p>Specifies choices available to the user to satisfy this input.

</p></div>

  <div class="jd-tagdata jd-tagdescr"><p>Specifies choices available to the user to satisfy this input.</p></div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Parameters</h5>

      <table class="jd-tagtable">

        <tr>

          <th>choices</td>

          <td>an array of pre-defined choices for users input.

        You must provide a non-null and non-empty array if

        you set <code><a href="/reference/android/preview/support/wearable/notifications/RemoteInput.html#allowFreeFormInput">allowFreeFormInput</a></code> to <code>false</code>.</td>

        </tr>

      </table>

  </div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Returns</h5>

      <ul class="nolist"><li>this object for method chaining

</li></ul>

  </div>



    </div>

</div>
@@ -1028,8 +1060,21 @@ From class 
      </div>

    <div class="jd-details-descr">

      

  <div class="jd-tagdata jd-tagdescr"><p>Set a label to be displayed to the user when collecting this input.

</p></div>

  <div class="jd-tagdata jd-tagdescr"><p>Set a label to be displayed to the user when collecting this input.</p></div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Parameters</h5>

      <table class="jd-tagtable">

        <tr>

          <th>label</td>

          <td>The label to show to users when they input a response.</td>

        </tr>

      </table>

  </div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Returns</h5>

      <ul class="nolist"><li>this object for method chaining

</li></ul>

  </div>



    </div>

</div>

docs/html/reference/android/preview/support/wearable/notifications/RemoteInput.html

+30 −26
Original line number Diff line number Diff line
@@ -467,22 +467,27 @@ Summary: 




<h2>Class Overview</h2>

<p itemprop="articleBody">A RemoteInput specifies a response to be collected from the user as part of an intent being

 sent. For example, when used with a notification Action, a response may be collected

 when the user triggers the action, and the results sent as data along with the action's

 PendingIntent. The result value is set in the extras of the triggered Intent with the key

 <code><a href="/reference/android/preview/support/wearable/notifications/RemoteInput.html#returnKey">returnKey</a></code>.



 <p>Use the builder class <code><a href="/reference/android/preview/support/wearable/notifications/RemoteInput.Builder.html">RemoteInput.Builder</a></code> to create this object.



 <p>Example which adds a RemoteInput to an Action:

<p itemprop="articleBody">A <code>RemoteInput</code> object collects a response from users and sets the

 response as an intent extra inside the <code><a href="http://developer.android.com/reference/android/app/PendingIntent.html">PendingIntent</a></code> that is sent.

 Always use <code><a href="/reference/android/preview/support/wearable/notifications/RemoteInput.Builder.html">RemoteInput.Builder</a></code> to create instances of this class.

 <p class="note"> See

 <a href="/wear/notifications/remote-input.html">Receiving Voice Input from

 a Notification</a> for more information on how to use this class.



 <p>The following example adds a <code>RemoteInput</code> to a <code><a href="/reference/android/preview/support/wearable/notifications/WearableNotifications.Action.html">WearableNotifications.Action</a></code>,

 sets the intent extra key as <code>quick_reply</code>, and sets the label as <code>Quick Reply</code>.

 Users are prompted to input a response when they trigger the action. The results are sent as an

 intent extra with the key of <code><a href="/reference/android/preview/support/wearable/notifications/RemoteInput.html#returnKey">returnKey</a></code> in the action's

 <code><a href="http://developer.android.com/reference/android/app/PendingIntent.html">PendingIntent</a></code>.



 <pre class="prettyprint">

 public static final String EXTRA_QUICK_REPLY_TEXT = "quick_reply";

 WearableNotifications.Action action = new WearableNotifications.Action.Builder(

         R.drawable.reply, &quot;Reply&quot;, actionIntent)

         .addRemoteInput(new RemoteInput.Builder(EXTRA_QUICK_REPLY_TEXT)

                 .setLabel("Quick reply").build())

         <b>.addRemoteInput(new RemoteInput.Builder(EXTRA_QUICK_REPLY_TEXT)

                 .setLabel("Quick reply").build()</b>)

         .build();</pre>



</p>
@@ -619,8 +624,8 @@ android.os.Parcelable 
          final

          boolean</nobr></td>

          <td class="jd-linkcol"><a href="/reference/android/preview/support/wearable/notifications/RemoteInput.html#allowFreeFormInput">allowFreeFormInput</a></td>

          <td class="jd-descrcol" width="100%">Indicates whether or not the user may provide an arbitrary value for

 this input.</td>

          <td class="jd-descrcol" width="100%">Indicates whether or not users can provide an arbitrary value for

 input.</td>

      </tr>
@@ -631,7 +636,7 @@ android.os.Parcelable 
          final

          <a href="http://developer.android.com/reference/java/lang/String.html">String[]</a></nobr></td>

          <td class="jd-linkcol"><a href="/reference/android/preview/support/wearable/notifications/RemoteInput.html#choices">choices</a></td>

          <td class="jd-descrcol" width="100%">The choices available to the user.</td>

          <td class="jd-descrcol" width="100%">Possible input choices.</td>

      </tr>
@@ -642,7 +647,7 @@ android.os.Parcelable 
          final

          <a href="http://developer.android.com/reference/java/lang/String.html">String</a></nobr></td>

          <td class="jd-linkcol"><a href="/reference/android/preview/support/wearable/notifications/RemoteInput.html#label">label</a></td>

          <td class="jd-descrcol" width="100%">The label to be displayed to the user when collecting this input.</td>

          <td class="jd-descrcol" width="100%">The label to display to users when collecting this input.</td>

      </tr>
@@ -653,8 +658,7 @@ android.os.Parcelable 
          final

          <a href="http://developer.android.com/reference/java/lang/String.html">String</a></nobr></td>

          <td class="jd-linkcol"><a href="/reference/android/preview/support/wearable/notifications/RemoteInput.html#returnKey">returnKey</a></td>

          <td class="jd-descrcol" width="100%">The extras key to be populated with input from the user when the

 intent is sent.</td>

          <td class="jd-descrcol" width="100%">The lookup key for the intent extra that the response is set in.</td>

      </tr>
@@ -1062,10 +1066,10 @@ From interface 
      </div>

    <div class="jd-details-descr">

      

  <div class="jd-tagdata jd-tagdescr"><p>Indicates whether or not the user may provide an arbitrary value for

 this input.  If set to false, then the user should select one of the

 provided choices.  It is an error to set this to <code>false</code> and

 not provide <code><a href="/reference/android/preview/support/wearable/notifications/RemoteInput.html#choices">choices</a></code>.

  <div class="jd-tagdata jd-tagdescr"><p>Indicates whether or not users can provide an arbitrary value for

 input. If you set this to <code>false</code>, users must select one of the

 provided <code><a href="/reference/android/preview/support/wearable/notifications/RemoteInput.html#choices">choices</a></code>. An <code><a href="http://developer.android.com/reference/java/lang/IllegalArgumentException.html">IllegalArgumentException</a></code> is thrown

 if you set this to false and <code><a href="/reference/android/preview/support/wearable/notifications/RemoteInput.html#choices">choices</a></code> is <code>null</code> or empty.

</p></div>
@@ -1094,8 +1098,8 @@ From interface 
      </div>

    <div class="jd-details-descr">

      

  <div class="jd-tagdata jd-tagdescr"><p>The choices available to the user.  May be null if there are no choices

 to present to the user.

  <div class="jd-tagdata jd-tagdescr"><p>Possible input choices. This can be <code>null</code>

 if there are no choices to present.

</p></div>
@@ -1124,7 +1128,7 @@ From interface 
      </div>

    <div class="jd-details-descr">

      

  <div class="jd-tagdata jd-tagdescr"><p>The label to be displayed to the user when collecting this input.

  <div class="jd-tagdata jd-tagdescr"><p>The label to display to users when collecting this input.

</p></div>
@@ -1153,8 +1157,8 @@ From interface 
      </div>

    <div class="jd-details-descr">

      

  <div class="jd-tagdata jd-tagdescr"><p>The extras key to be populated with input from the user when the

 intent is sent.

  <div class="jd-tagdata jd-tagdescr"><p>The lookup key for the intent extra that the response is set in. This is populated

 when the <code><a href="http://developer.android.com/reference/android/app/PendingIntent.html">PendingIntent</a></code> is sent.

</p></div>

docs/html/reference/android/preview/support/wearable/notifications/WearableNotifications.Action.Builder.html

+42 −17
Original line number Diff line number Diff line
@@ -448,15 +448,6 @@ Summary: 


<h2>Class Overview</h2>

<p itemprop="articleBody">Builder class for <code><a href="/reference/android/preview/support/wearable/notifications/WearableNotifications.Action.html">WearableNotifications.Action</a></code> objects.



 <p>Example:



 <pre class="prettyprint">

 WearableNotifications.Builder builder = new WearableNotifications.Builder(mContext)

         .addAction(new WearableNotifications.Action.Builder(

                 R.drawable.navigate, &quot;Navigate&quot, pendingIntent)

                 .build());

 Notification notif = builder.build();</pre>

</p>
@@ -525,7 +516,7 @@ Summary: 
        <td class="jd-linkcol" width="100%"><nobr>

        <span class="sympad"><a href="/reference/android/preview/support/wearable/notifications/WearableNotifications.Action.Builder.html#WearableNotifications.Action.Builder(int, java.lang.CharSequence, android.app.PendingIntent)">WearableNotifications.Action.Builder</a></span>(int icon, <a href="http://developer.android.com/reference/java/lang/CharSequence.html">CharSequence</a> title, <a href="http://developer.android.com/reference/android/app/PendingIntent.html">PendingIntent</a> intent)</nobr>

        

        <div class="jd-descrdiv">Construct a new builder for an <code><a href="/reference/android/preview/support/wearable/notifications/WearableNotifications.Action.html">WearableNotifications.Action</a></code> object.</div>

        <div class="jd-descrdiv">Construct a new builder for <code><a href="/reference/android/preview/support/wearable/notifications/WearableNotifications.Action.html">WearableNotifications.Action</a></code> object.</div>

  

  </td></tr>
@@ -872,8 +863,25 @@ From class 
      </div>

    <div class="jd-details-descr">

      

  <div class="jd-tagdata jd-tagdescr"><p>Construct a new builder for an <code><a href="/reference/android/preview/support/wearable/notifications/WearableNotifications.Action.html">WearableNotifications.Action</a></code> object.

</p></div>

  <div class="jd-tagdata jd-tagdescr"><p>Construct a new builder for <code><a href="/reference/android/preview/support/wearable/notifications/WearableNotifications.Action.html">WearableNotifications.Action</a></code> object.</p></div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Parameters</h5>

      <table class="jd-tagtable">

        <tr>

          <th>icon</td>

          <td>icon to show for this action</td>

        </tr>

        <tr>

          <th>title</td>

          <td>the title of the action</td>

        </tr>

        <tr>

          <th>intent</td>

          <td>the <code><a href="http://developer.android.com/reference/android/app/PendingIntent.html">PendingIntent</a></code> to fire when users trigger this action

</td>

        </tr>

      </table>

  </div>



    </div>

</div>
@@ -918,9 +926,22 @@ From class 
    <div class="jd-details-descr">

      

  <div class="jd-tagdata jd-tagdescr"><p>Add an input to be collected from the user when this action is sent.

 Response values are sent as extras to this Action's pending intent when

 sent.

</p></div>

 Response values are sent as extras to this action's pending intent when

 sent.</p></div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Parameters</h5>

      <table class="jd-tagtable">

        <tr>

          <th>remoteInput</td>

          <td>a <code><a href="/reference/android/preview/support/wearable/notifications/RemoteInput.html">RemoteInput</a></code> to add to the action</td>

        </tr>

      </table>

  </div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Returns</h5>

      <ul class="nolist"><li>this object for method chaining

</li></ul>

  </div>



    </div>

</div>
@@ -950,8 +971,12 @@ From class 
    <div class="jd-details-descr">

      

  <div class="jd-tagdata jd-tagdescr"><p>Combine all of the options that have been set and return a new <code><a href="/reference/android/preview/support/wearable/notifications/WearableNotifications.Action.html">WearableNotifications.Action</a></code>

 object.

</p></div>

 object.</p></div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Returns</h5>

      <ul class="nolist"><li>the built action

</li></ul>

  </div>



    </div>

</div>

docs/html/reference/android/preview/support/wearable/notifications/WearableNotifications.Action.html

+9 −8
Original line number Diff line number Diff line
@@ -474,14 +474,11 @@ Summary: 




<h2>Class Overview</h2>

<p itemprop="articleBody">Subclass of <code><a href="/reference/android/support/v4/app/NotificationCompat.Action.html">NotificationCompat.Action</a></code> which adds support for additional

 wearable extensions.



 <p>To create a new Action, use the <code><a href="/reference/android/preview/support/wearable/notifications/WearableNotifications.Action.Builder.html">WearableNotifications.Action.Builder</a></code> class and then call

<p itemprop="articleBody">Subclass of <code><a href="/reference/android/support/v4/app/NotificationCompat.Action.html">NotificationCompat.Action</a></code> that adds additional

 wearable extensions for actions.

 <p>Always use the <code><a href="/reference/android/preview/support/wearable/notifications/WearableNotifications.Action.Builder.html">WearableNotifications.Action.Builder</a></code> to build instances of this class and call

 <code><a href="/reference/android/preview/support/wearable/notifications/WearableNotifications.Builder.html#addAction(android.preview.support.wearable.notifications.WearableNotifications.Action)">addAction(WearableNotifications.Action)</a></code> to add the action to a notification.



 <p>Example:



 <pre class="prettyprint">

 WearableNotifications.Builder builder = new WearableNotifications.Builder(mContext)

         .addAction(new WearableNotifications.Action.Builder(
@@ -991,8 +988,12 @@ From class 
      </div>

    <div class="jd-details-descr">

      

  <div class="jd-tagdata jd-tagdescr"><p>Get a list of inputs to be collected from the user when this action is sent.

</p></div>

  <div class="jd-tagdata jd-tagdescr"><p>Get a list of inputs to be collected from the user when this action is sent.</p></div>

  <div class="jd-tagdata">

      <h5 class="jd-tagtitle">Returns</h5>

      <ul class="nolist"><li>the array of <code><a href="/reference/android/preview/support/wearable/notifications/RemoteInput.html">RemoteInput</a></code> objects associated with this action

</li></ul>

  </div>



    </div>

</div>