Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 845e81e2 authored by smain@google.com's avatar smain@google.com Committed by Android Git Automerger
Browse files

am 2dc4cfa0: am 74bafd41: am 555d6e70: am 2411fe88: Merge "add the helpouts... 

am 2dc4cfa0: am 74bafd41: am 555d6e70: am 2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs automerge: 6e08d30d automerge: 39d6b21e

* commit '2dc4cfa0':
  add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
parents 5bd45a66 2dc4cfa0

docs/html/training/basics/activity-lifecycle/index.jd

+2 −2
Original line number Diff line number Diff line 
page.title=Managing the Activity Lifecycle

page.tags=activity lifecycle

helpoutsWidget=true



trainingnavtop=true

startpage=true

next.title=Launching an Activity

next.link=starting.html



@jd:body

docs/html/training/basics/activity-lifecycle/pausing.jd

+2 −6
Original line number Diff line number Diff line 
page.title=Pausing and Resuming an Activity

parent.title=Managing the Activity Lifecycle

parent.link=index.html

page.tags=activity lifecycle

helpoutsWidget=true



trainingnavtop=true

previous.title=Starting an Activity

previous.link=starting.html

next.title=Stopping and Restarting an Activity

next.link=stopping.html



@jd:body

docs/html/training/basics/activity-lifecycle/recreating.jd

+2 −4
Original line number Diff line number Diff line 
page.title=Recreating an Activity

parent.title=Managing the Activity Lifecycle

parent.link=index.html

page.tags=activity lifecycle

helpoutsWidget=true



trainingnavtop=true

previous.title=Stopping and Restarting an Activity

previous.link=stopping.html



@jd:body

docs/html/training/basics/activity-lifecycle/starting.jd

+2 −4
Original line number Diff line number Diff line 
page.title=Starting an Activity

parent.title=Managing the Activity Lifecycle

parent.link=index.html

page.tags=activity lifecycle

helpoutsWidget=true



trainingnavtop=true

next.title=Pausing and Resuming an Activity

next.link=pausing.html



@jd:body

docs/html/training/basics/activity-lifecycle/stopping.jd

+2 −6
Original line number Diff line number Diff line 
page.title=Stopping and Restarting an Activity

parent.title=Managing the Activity Lifecycle

parent.link=index.html

page.tags=activity lifecycle

helpoutsWidget=true



trainingnavtop=true

previous.title=Pausing and Resuming an Activity

previous.link=pausing.html

next.title=Recreating an Activity

next.link=recreating.html



@jd:body