summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cervera-Navarro <rcervera@google.com>2014-10-14 21:59:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-14 21:59:48 +0000
commitaa7bcf140d95049f1482c896b770de7ba339f7c9 (patch)
tree684fa22db3932e4dbc6ffe1556d1b5e6a45dad3f
parent52e2416cc72f7d87e2f7f1aa29b7a9cb85ae0c70 (diff)
parent0813e29817c1efbb7b7c8e55138f763199fc4c51 (diff)
downloadframeworks_base-aa7bcf140d95049f1482c896b770de7ba339f7c9.zip
frameworks_base-aa7bcf140d95049f1482c896b770de7ba339f7c9.tar.gz
frameworks_base-aa7bcf140d95049f1482c896b770de7ba339f7c9.tar.bz2
Merge "Revert "docs: Watermarked images for codes that weren't found."" into klp-docs
-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