summaryrefslogtreecommitdiffstats
path: root/docs/html/design
diff options
context:
space:
mode:
authorRicardo Cervera-Navarro <rcervera@google.com>2014-10-14 22:20:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-14 22:20:02 +0000
commitc93723bdf9b2ce4dc0426817b8bec924d9f97a79 (patch)
treef2a5c97214e2dfab4e0b3a828f5cc79865f35b31 /docs/html/design
parent858cfad9482817305cc5b846102c3f8e5d12782a (diff)
parent7668aa27999e5650fe8776853565f792311fb57d (diff)
downloadframeworks_base-c93723bdf9b2ce4dc0426817b8bec924d9f97a79.zip
frameworks_base-c93723bdf9b2ce4dc0426817b8bec924d9f97a79.tar.gz
frameworks_base-c93723bdf9b2ce4dc0426817b8bec924d9f97a79.tar.bz2
am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs
* commit '7668aa27999e5650fe8776853565f792311fb57d': Revert "docs: Watermarked images for codes that weren't found."
Diffstat (limited to 'docs/html/design')
-rw-r--r--docs/html/design/media/dialogs_examples.pngbin44959 -> 39873 bytes
-rw-r--r--docs/html/design/media/navigation_drawer_titles_icons.pngbin20467 -> 15000 bytes
-rw-r--r--docs/html/design/media/selection_adjusting_actions.pngbin197541 -> 190458 bytes
-rw-r--r--docs/html/design/media/touch_feedback_communication.pngbin203895 -> 199575 bytes
-rw-r--r--docs/html/design/media/ui_overview_notifications.pngbin49688 -> 42875 bytes
5 files changed, 0 insertions, 0 deletions
diff --git a/docs/html/design/media/dialogs_examples.png b/docs/html/design/media/dialogs_examples.png
index 6ffcee2..c136476 100644
--- a/docs/html/design/media/dialogs_examples.png
+++ b/docs/html/design/media/dialogs_examples.png
Binary files differ
diff --git a/docs/html/design/media/navigation_drawer_titles_icons.png b/docs/html/design/media/navigation_drawer_titles_icons.png
index 902a72d..7cf1e0c 100644
--- a/docs/html/design/media/navigation_drawer_titles_icons.png
+++ b/docs/html/design/media/navigation_drawer_titles_icons.png
Binary files differ
diff --git a/docs/html/design/media/selection_adjusting_actions.png b/docs/html/design/media/selection_adjusting_actions.png
index 32a7fec..0799b6b 100644
--- a/docs/html/design/media/selection_adjusting_actions.png
+++ b/docs/html/design/media/selection_adjusting_actions.png
Binary files differ
diff --git a/docs/html/design/media/touch_feedback_communication.png b/docs/html/design/media/touch_feedback_communication.png
index 1d4a9dc..f8162d0 100644
--- a/docs/html/design/media/touch_feedback_communication.png
+++ b/docs/html/design/media/touch_feedback_communication.png
Binary files differ
diff --git a/docs/html/design/media/ui_overview_notifications.png b/docs/html/design/media/ui_overview_notifications.png
index 7975657..6043412 100644
--- a/docs/html/design/media/ui_overview_notifications.png
+++ b/docs/html/design/media/ui_overview_notifications.png
Binary files differ