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

Merge "Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am: 8ef79a9246 am: 51500a1c5a am: 28ed18877b am: 65436b097a" into nyc-mr1-dev-plus-aosp

Browse Source 
am: 8ee81d525e

* commit '8ee81d525e3435704285eba13344108396034d54':
  docs: Fixed 'MessageStyle' typo

Change-Id: I86a78408520c05d3da77d28444d1270b232d5f18
This commit is contained in:
Eric Schmidt
2016-06-02 00:11:28 +00:00
committed by android-build-merger
parent 3a866db8a1 8ee81d525e
commit 98db6f9b60
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/html/preview/api-overview.jd
View File

@@ -119,10 +119,10 @@ use. Some of the changes include:</p>
</li>
<li>
<strong>Message style customization</strong>: You can customize more of the
user interface labels associated with your notifications using the
<code>MessageStyle</code> class. You can configure the message, conversation
title, and content view.
<strong>Messaging style customization</strong>: You can customize more of
the user interface labels associated with your notifications using the
<code>MessagingStyle</code> class. You can configure the message,
conversation title, and content view.
</li>
<li>

6
docs/html/preview/features/notification-updates.jd
View File

@@ -16,7 +16,7 @@ trainingnavtop=true
<li><a href="#direct">Direct Reply</a></li>
<li><a href="#bundle">Bundled Notifications</a></li>
<li><a href="#custom">Custom Views</a></li>
<li><a href="#style">Message Style</a></li>
<li><a href="#style">Messaging Style</a></li>
</ol>
</div>
@@ -378,14 +378,14 @@ Notification notification = new Notification.Builder()
<h2 id="style">Messaging Style</h2>
<p>
Android N introduces a new API for customizing the style of a notification.
Using the <code>MessageStyle</code> class, you can change several of the
Using the <code>MessagingStyle</code> class, you can change several of the
labels displayed on the notification, including the conversation title,
additional messages, and the content view for the notification.
</p>
<p>
The following code snippet demonstrates how to customize a notification's
style using the <code>MessageStyle</code> class.
style using the <code>MessagingStyle</code> class.
</p>
<pre>