summaryrefslogtreecommitdiffstats
path: root/docs/html/design
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2012-01-27 17:56:49 -0800
committerDirk Dougherty <ddougherty@google.com>2012-03-05 22:02:35 -0800
commit4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219 (patch)
tree30364eba130764c5ebc4d8bfa9878199d57acd32 /docs/html/design
parente606cb460272cd99bac05b4477a5e489827b368b (diff)
downloadframeworks_base-4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219.zip
frameworks_base-4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219.tar.gz
frameworks_base-4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219.tar.bz2
Doc change: String changes for Android Market
Change-Id: I823812a4fd24021bec906ad856479c92a8d2a759
Diffstat (limited to 'docs/html/design')
-rw-r--r--docs/html/design/building-blocks/progress.html2
-rw-r--r--docs/html/design/building-blocks/tabs.html2
-rw-r--r--docs/html/design/patterns/actionbar.html2
-rw-r--r--docs/html/design/patterns/app-structure.html6
-rw-r--r--docs/html/design/patterns/navigation.html8
-rw-r--r--docs/html/design/style/iconography.html2
6 files changed, 11 insertions, 11 deletions
diff --git a/docs/html/design/building-blocks/progress.html b/docs/html/design/building-blocks/progress.html
index 32183bc..500ccb1 100644
--- a/docs/html/design/building-blocks/progress.html
+++ b/docs/html/design/building-blocks/progress.html
@@ -147,7 +147,7 @@ available space.</p>
<li class="value-1"><h4>Activity bar (shown with the Holo Dark theme)</h4>
<p>
-An indeterminate activity bar is used at the start of an application download because Market hasn't
+An indeterminate activity bar is used at the start of an application download because Google Play hasn't
been able to contact the server yet, and it's not possible to determine how long it will take for
the download to begin.
diff --git a/docs/html/design/building-blocks/tabs.html b/docs/html/design/building-blocks/tabs.html
index d4b0e52..029e484 100644
--- a/docs/html/design/building-blocks/tabs.html
+++ b/docs/html/design/building-blocks/tabs.html
@@ -130,7 +130,7 @@ to the next/previous view, swipe left or right.</p>
<source src="../static/content/tabs_scrolly.ogv" type="video/ogg">
</video>
<div class="figure-caption">
- Scrolling tabs in Android Market.
+ Scrolling tabs on Google Play.
<div class="video-instructions">&nbsp;</div>
</div>
diff --git a/docs/html/design/patterns/actionbar.html b/docs/html/design/patterns/actionbar.html
index 1566d04..e93498e 100644
--- a/docs/html/design/patterns/actionbar.html
+++ b/docs/html/design/patterns/actionbar.html
@@ -281,7 +281,7 @@ themselves.</p>
<source src="../static/content/tabs_scrolly.ogv" type="video/ogg">
</video>
<div class="figure-caption">
- Scrolling tabs in Android Market.
+ Scrolling tabs on Google Play.
<div class="video-instructions">&nbsp;</div>
</div>
diff --git a/docs/html/design/patterns/app-structure.html b/docs/html/design/patterns/app-structure.html
index 1b48280..6780594 100644
--- a/docs/html/design/patterns/app-structure.html
+++ b/docs/html/design/patterns/app-structure.html
@@ -112,7 +112,7 @@ Android Design - Application Structure
single screen</li>
<li>Apps such as Phone whose main purpose is to switch between different activities without deeper
navigation</li>
-<li>Apps such as Gmail or Market that combine a broad set of data views with deep navigation</li>
+<li>Apps such as Gmail and Google Play that combine a broad set of data views with deep navigation</li>
</ul>
<p>Your app's structure depends largely on the content and tasks you want to surface for your users.</p>
<h2 id="general-structure">General Structure</h2>
@@ -165,7 +165,7 @@ layouts that are visually engaging and appropriate for the data type and screen
<img src="../static/content/app_structure_market.png">
<div class="figure-caption">
- Market's start screen primarily allows navigation into the stores for Apps, Music, Books,
+ The Google Play app's start screen primarily allows navigation into the stores for Apps, Music, Books,
Movies and Games. It is also enriched with tailored recommendations and promotions that
surface content of interest to the user. Search is readily available from the action bar.
</div>
@@ -250,7 +250,7 @@ minimize navigational effort. Rule of thumb: no more than 5&ndash;7 tabs.</p>
<img src="../static/content/app_structure_scrolltabs.png">
<div class="figure-caption">
- Market uses tabs to simultaneously show category choice and content. To navigate between
+ Google Play uses tabs to simultaneously show category choice and content. To navigate between
categories, users can swipe left/right on the content.
</div>
diff --git a/docs/html/design/patterns/navigation.html b/docs/html/design/patterns/navigation.html
index 6287b5e..5d1568e 100644
--- a/docs/html/design/patterns/navigation.html
+++ b/docs/html/design/patterns/navigation.html
@@ -167,7 +167,7 @@ navigation does not change the behavior of Up or Back.</p>
<img src="../static/content/navigation_between_siblings_gmail.png">
<p>However, a notable exception to this occurs when browsing between "related" detail views not tied
-together by the referring list&mdash;for example, when browsing in the Market between apps from
+together by the referring list&mdash;for example, when browsing on Google Play between apps from
the same developer, or albums by the same artist. In these cases, following each link does create
history, causing the Back button to step through each screen of related content which has been
viewed. Up should continue to bypass these related screens and navigate to the most recently viewed
@@ -176,7 +176,7 @@ container screen.</p>
<img src="../static/content/navigation_between_siblings_market1.png">
<p>You have the ability to make the Up behavior even smarter based on your knowledge of detail
-view. If we extend our Market sample from above, imagine the user has navigated from the last Book
+view. If we extend our Google Play sample from above, imagine the user has navigated from the last Book
viewed to the details for the Movie adaptation. In that case, Up can return to a container (Movies)
which the user had not previously navigated through.</p>
@@ -200,10 +200,10 @@ return to the referring app.</p>
- If the destination screen is typically reached from one particular screen within your app, Up
should navigate to that screen.
- Otherwise, Up should navigate to the topmost ("Home") screen of your app.</p>
-<p>For example, after choosing to share a book being viewed in Market, the user navigates directly to
+<p>For example, after choosing to share a book being viewed on Google Play, the user navigates directly to
Gmail's compose screen. From there, Up returns to the Inbox (which happens to be both the
typical referrer to compose, as well as the topmost screen of the app), while Back returns to
-Market.</p>
+Google Play.</p>
<img src="../static/content/navigation_from_outside_up.png">
diff --git a/docs/html/design/style/iconography.html b/docs/html/design/style/iconography.html
index 96954de..0b2852e 100644
--- a/docs/html/design/style/iconography.html
+++ b/docs/html/design/style/iconography.html
@@ -146,7 +146,7 @@ any type of background.</p>
<li class="no-bullet with-icon tablet">
<p>Launcher icons on a mobile device must be <strong>48x48 <acronym title="Density-independent pixels. One dp is one pixel on a 160 dpi screen.">dp</acronym></strong>.</p></li>
<li class="no-bullet with-icon web">
- <p>Launcher icons for display in Market must be <strong>512x512 pixels</strong>.</p></li>
+ <p>Launcher icons for display on Google Play must be <strong>512x512 pixels</strong>.</p></li>
</ul>
</div>