diff options
| author | Scott Main <smain@google.com> | 2014-03-12 15:19:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-12 15:19:14 +0000 |
| commit | 8a1e3ac58c94445208e7e2f20c8f91e1138d55d6 (patch) | |
| tree | be4ec3443045bb25c1737ced4cdd1e966c17d6de | |
| parent | ad895779f8b8d63832a4195e4e895641985f97ad (diff) | |
| parent | 6fc25fb727e788ea6f33e6cd8a0421750be2ef9a (diff) | |
| download | frameworks_base-8a1e3ac58c94445208e7e2f20c8f91e1138d55d6.zip frameworks_base-8a1e3ac58c94445208e7e2f20c8f91e1138d55d6.tar.gz frameworks_base-8a1e3ac58c94445208e7e2f20c8f91e1138d55d6.tar.bz2 | |
am 6fc25fb7: am a17a7000: am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs
* commit '6fc25fb727e788ea6f33e6cd8a0421750be2ef9a':
fix typos
| -rw-r--r-- | docs/html/guide/topics/ui/controls/button.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/topics/ui/controls/togglebutton.jd | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/guide/topics/ui/controls/button.jd b/docs/html/guide/topics/ui/controls/button.jd index 02597c8..b52c3e9 100644 --- a/docs/html/guide/topics/ui/controls/button.jd +++ b/docs/html/guide/topics/ui/controls/button.jd @@ -113,7 +113,7 @@ android.view.View} that was clicked)</li> <h3 id="ClickListener">Using an OnClickListener</h3> -<p>You can also declare the click event handler pragmatically rather than in an XML layout. This +<p>You can also declare the click event handler programmatically rather than in an XML layout. This might be necessary if you instantiate the {@link android.widget.Button} at runtime or you need to declare the click behavior in a {@link android.app.Fragment} subclass.</p> diff --git a/docs/html/guide/topics/ui/controls/togglebutton.jd b/docs/html/guide/topics/ui/controls/togglebutton.jd index c57b510..09af516 100644 --- a/docs/html/guide/topics/ui/controls/togglebutton.jd +++ b/docs/html/guide/topics/ui/controls/togglebutton.jd @@ -99,7 +99,7 @@ android.widget.CompoundButton#toggle()} method to change the state.</p> <h3 id="ClickListener">Using an OnCheckedChangeListener</h3> -<p>You can also declare a click event handler pragmatically rather than in an XML layout. This +<p>You can also declare a click event handler programmatically rather than in an XML layout. This might be necessary if you instantiate the {@link android.widget.ToggleButton} or {@link android.widget.Switch} at runtime or you need to declare the click behavior in a {@link android.app.Fragment} subclass.</p> |