diff options
| author | smain@google.com <smain@google.com> | 2014-12-11 03:39:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-11 03:39:57 +0000 |
| commit | c73a65d61892542ece0dd9b95000048517f36c02 (patch) | |
| tree | bce96468da76672554aaf1489ddd3f7108a60730 /docs/html/training/basics/actionbar | |
| parent | f5b865101d6f47aa5ef49cbd6b121d897116356c (diff) | |
| parent | bac113bbcbe7780ca658f09019e5118ec851cd07 (diff) | |
| download | frameworks_base-c73a65d61892542ece0dd9b95000048517f36c02.zip frameworks_base-c73a65d61892542ece0dd9b95000048517f36c02.tar.gz frameworks_base-c73a65d61892542ece0dd9b95000048517f36c02.tar.bz2 | |
am 9a6d1d9f: am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs automerge: e04a9fc
automerge: bac113b
* commit 'bac113bbcbe7780ca658f09019e5118ec851cd07':
add helpouts widget to wave 3 pages
Diffstat (limited to 'docs/html/training/basics/actionbar')
5 files changed, 9 insertions, 0 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 |