diff options
| author | smain@google.com <smain@google.com> | 2014-12-11 10:21:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-11 10:21:47 +0000 |
| commit | 984972fadcc6f37df042523238af26608408c98f (patch) | |
| tree | f095208f421613de6f9554abd95c9b15ea36b042 /docs/html/training/basics | |
| parent | 671dd81eebb9665ce30ecb548b47c4b61244924a (diff) | |
| parent | c73a65d61892542ece0dd9b95000048517f36c02 (diff) | |
| download | frameworks_base-984972fadcc6f37df042523238af26608408c98f.zip frameworks_base-984972fadcc6f37df042523238af26608408c98f.tar.gz frameworks_base-984972fadcc6f37df042523238af26608408c98f.tar.bz2 | |
am 9a6d1d9f: am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs automerge: e04a9fc automerge: bac113b
automerge: c73a65d
* commit 'c73a65d61892542ece0dd9b95000048517f36c02':
add helpouts widget to wave 3 pages
Diffstat (limited to 'docs/html/training/basics')
9 files changed, 16 insertions, 2 deletions
diff --git a/docs/html/training/basics/actionbar/adding-buttons.jd b/docs/html/training/basics/actionbar/adding-buttons.jd index 26c9d0e..40d0bd1 100644 --- a/docs/html/training/basics/actionbar/adding-buttons.jd +++ b/docs/html/training/basics/actionbar/adding-buttons.jd @@ -1,4 +1,6 @@ page.title=Adding Action Buttons +page.tags=actionbar +helpoutsWidget=true trainingnavtop=true diff --git a/docs/html/training/basics/actionbar/index.jd b/docs/html/training/basics/actionbar/index.jd index 0303043..6a8eaff 100644 --- a/docs/html/training/basics/actionbar/index.jd +++ b/docs/html/training/basics/actionbar/index.jd @@ -1,5 +1,6 @@ page.title=Adding the Action Bar page.tags=actionbar +helpoutsWidget=true trainingnavtop=true startpage=true diff --git a/docs/html/training/basics/actionbar/overlaying.jd b/docs/html/training/basics/actionbar/overlaying.jd index 800cd44..634534e 100644 --- a/docs/html/training/basics/actionbar/overlaying.jd +++ b/docs/html/training/basics/actionbar/overlaying.jd @@ -1,4 +1,6 @@ page.title=Overlaying the Action Bar +page.tags=actionbar +helpoutsWidget=true trainingnavtop=true diff --git a/docs/html/training/basics/actionbar/setting-up.jd b/docs/html/training/basics/actionbar/setting-up.jd index 158ce92..bccbd04 100644 --- a/docs/html/training/basics/actionbar/setting-up.jd +++ b/docs/html/training/basics/actionbar/setting-up.jd @@ -1,4 +1,6 @@ page.title=Setting Up the Action Bar +page.tags=actionbar +helpoutsWidget=true trainingnavtop=true diff --git a/docs/html/training/basics/actionbar/styling.jd b/docs/html/training/basics/actionbar/styling.jd index 4128a97..7c63952 100644 --- a/docs/html/training/basics/actionbar/styling.jd +++ b/docs/html/training/basics/actionbar/styling.jd @@ -1,4 +1,6 @@ page.title=Styling the Action Bar +page.tags=actionbar +helpoutsWidget=true trainingnavtop=true diff --git a/docs/html/training/basics/data-storage/databases.jd b/docs/html/training/basics/data-storage/databases.jd index 6ea2140..4a91d0d 100644 --- a/docs/html/training/basics/data-storage/databases.jd +++ b/docs/html/training/basics/data-storage/databases.jd @@ -1,8 +1,8 @@ page.title=Saving Data in SQL Databases +page.tags=data storage +helpoutsWidget=true trainingnavtop=true -previous.title=Saving Data in Files -previous.link=files.html @jd:body diff --git a/docs/html/training/basics/data-storage/files.jd b/docs/html/training/basics/data-storage/files.jd index 52bea4c..49a9169 100644 --- a/docs/html/training/basics/data-storage/files.jd +++ b/docs/html/training/basics/data-storage/files.jd @@ -1,4 +1,6 @@ page.title=Saving Files +page.tags=data storage +helpoutsWidget=true trainingnavtop=true diff --git a/docs/html/training/basics/data-storage/index.jd b/docs/html/training/basics/data-storage/index.jd index fc0c8b5..aa223f6 100644 --- a/docs/html/training/basics/data-storage/index.jd +++ b/docs/html/training/basics/data-storage/index.jd @@ -1,5 +1,6 @@ page.title=Saving Data page.tags=data storage,files,sql,database,preferences +helpoutsWidget=true trainingnavtop=true startpage=true diff --git a/docs/html/training/basics/data-storage/shared-preferences.jd b/docs/html/training/basics/data-storage/shared-preferences.jd index a6717c4..debb17d 100644 --- a/docs/html/training/basics/data-storage/shared-preferences.jd +++ b/docs/html/training/basics/data-storage/shared-preferences.jd @@ -1,4 +1,6 @@ page.title=Saving Key-Value Sets +page.tags=data storage +helpoutsWidget=true trainingnavtop=true |