summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorRoman Nurik <romannurik@google.com>2012-01-12 12:45:00 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-12 12:45:00 -0800
commitbaa88ef7d3b4d3b16f97a3c56a3049dcb686baf9 (patch)
tree0fbfceffdcb23a10fdd7cd63728f3aa8d0114cf8 /docs/html
parent7a286d8391a58637e6834f4de296bf66183ce1b2 (diff)
parent403cb28a8170ca1de3e710a2e218badbd0db534a (diff)
downloadframeworks_base-baa88ef7d3b4d3b16f97a3c56a3049dcb686baf9.zip
frameworks_base-baa88ef7d3b4d3b16f97a3c56a3049dcb686baf9.tar.gz
frameworks_base-baa88ef7d3b4d3b16f97a3c56a3049dcb686baf9.tar.bz2
Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/design/get-started/principles.html2
-rw-r--r--docs/html/design/static/content/principles_decide_for_me.pngbin115537 -> 113676 bytes
-rw-r--r--docs/html/design/static/content/principles_make_it_mine.pngbin108801 -> 103064 bytes
3 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/design/get-started/principles.html b/docs/html/design/get-started/principles.html
index ab1fe5c..0d9ef20 100644
--- a/docs/html/design/get-started/principles.html
+++ b/docs/html/design/get-started/principles.html
@@ -148,7 +148,7 @@ needed to perform a task while making it more emotionally satisfying.</p>
<h4>Let me make it mine</h4>
<p>People love to add personal touches because it helps them feel at home and in control. Provide
-sensible, beautiful defaults, but also consider fun, optional customizations that don’t hinder
+sensible, beautiful defaults, but also consider fun, optional customizations that don't hinder
primary tasks.</p>
</div>
diff --git a/docs/html/design/static/content/principles_decide_for_me.png b/docs/html/design/static/content/principles_decide_for_me.png
index 9f4159f..2d8b883 100644
--- a/docs/html/design/static/content/principles_decide_for_me.png
+++ b/docs/html/design/static/content/principles_decide_for_me.png
Binary files differ
diff --git a/docs/html/design/static/content/principles_make_it_mine.png b/docs/html/design/static/content/principles_make_it_mine.png
index 6380277..683a0b7 100644
--- a/docs/html/design/static/content/principles_make_it_mine.png
+++ b/docs/html/design/static/content/principles_make_it_mine.png
Binary files differ