summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2014-03-26 22:57:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-26 22:57:16 +0000
commit2adb64c96671bf39bfa74c5416f117afd13f4091 (patch)
tree4635044f11959b0671dc0ead0f3faa93d9b1f173
parent5632dc1cf0b4bded368dd53ab425e725f37dfeb8 (diff)
parente5ec1544f15e31490a404e0ba9f4842dd03fb5e2 (diff)
downloadframeworks_base-2adb64c96671bf39bfa74c5416f117afd13f4091.zip
frameworks_base-2adb64c96671bf39bfa74c5416f117afd13f4091.tar.gz
frameworks_base-2adb64c96671bf39bfa74c5416f117afd13f4091.tar.bz2
am e5ec1544: am 6bbfa5b5: am 2556034b: am 322cf5c4: fix image sizes in design guide and code snippet bug bug: 13644390 bug: 13626796
* commit 'e5ec1544f15e31490a404e0ba9f4842dd03fb5e2': fix image sizes in design guide and code snippet bug bug: 13644390 bug: 13626796
-rw-r--r--docs/html/wear/design/index.html6
-rw-r--r--docs/html/wear/notifications/remote-input.html2
2 files changed, 5 insertions, 3 deletions
diff --git a/docs/html/wear/design/index.html b/docs/html/wear/design/index.html
index 9952490..53ea1f3 100644
--- a/docs/html/wear/design/index.html
+++ b/docs/html/wear/design/index.html
@@ -433,7 +433,8 @@ By providing a smart connection to the rest of the world while respecting the us
<p>Actions appear to the right of your notification, allowing the user to act on your notification. Up to three actions are permitted. The most-used action should be placed first, so that it is a single swipe away from your content.</p>
-<p>Actions consist of an icon and a caption. Icons should be PNG files, white on transparent background, 64 × 64 DP. Captions should be verb-driven and short, and will be automatically truncated at one line.</p>
+<p>Actions consist of an icon and a caption. Icons should be PNG files, white on transparent background, 32 × 32 dp (with 8 dp padding), as specified in the <a href="/design/style/iconography.html#action-bar">Iconography</a> design guide
+for the action bar icons. Captions should be verb-driven and short, and will be automatically truncated at one line.</p>
<p>Actions are optional. Many useful notifications will not need to include actions at all.</p>
@@ -452,7 +453,8 @@ Notifications for Android Wear</a>.</p>
<p>Images appear behind cards in the stream, providing context and additional glanceability. Your image should support the core message of the notification; for example, a card about a sports team could include the team color and logo; a message from a contact should display that person's profile photo.</p>
-<p>Bear in mind that the card will partially cover the lower part of the image. Images should be at least 320 × 320 pixels at hdpi. Image backgrounds move when horizontally swiped, so landscape-oriented images work better on notifications that include pages or actions.</p>
+<p>Bear in mind that the card will partially cover the lower part of the image. Images should be sized as
+appropriate for the notification appearance on handsets, which is 64 x 64 dp. Image backgrounds move when horizontally swiped, so landscape-oriented images work better on notifications that include pages or actions.</p>
<p>To add large images, use <code><a href="/reference/android/support/v4/app/NotificationCompat.Builder.html#setLargeIcon(android.graphics.Bitmap)">setLargeIcon()</a></code> with any notification, as
shown in <a href="/wear/notifications/creating.html">Creating
diff --git a/docs/html/wear/notifications/remote-input.html b/docs/html/wear/notifications/remote-input.html
index c8f6621..3d869b5 100644
--- a/docs/html/wear/notifications/remote-input.html
+++ b/docs/html/wear/notifications/remote-input.html
@@ -489,7 +489,7 @@ RemoteInput remoteInput = new RemoteInput.Builder(EXTRA_VOICE_REPLY)
// Create wearable notification and add remote input
Notification replyNotification =
new WearableNotifications.Builder(replyNotificationBuilder)
- .addRemoteInputForContentIntent(replyAction)
+ .addRemoteInputForContentIntent(remoteInput)
.build();
</pre>