diff options
| author | Scott Main <smain@google.com> | 2014-03-10 16:26:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-10 16:26:50 +0000 |
| commit | c0eb623c107ef81dff0a508ae1ba2a9aa6878f0b (patch) | |
| tree | 69e8c3d62d36e0ecddb2ed99fc62c5d76823f760 | |
| parent | 31b5dfbc11e46e08b299e0a063d53753ce8170db (diff) | |
| parent | 7b0c111b5f3595de5cac61b0657a6f2ecb7e77bd (diff) | |
| download | frameworks_base-c0eb623c107ef81dff0a508ae1ba2a9aa6878f0b.zip frameworks_base-c0eb623c107ef81dff0a508ae1ba2a9aa6878f0b.tar.gz frameworks_base-c0eb623c107ef81dff0a508ae1ba2a9aa6878f0b.tar.bz2 | |
am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs
* commit '7b0c111b5f3595de5cac61b0657a6f2ecb7e77bd':
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 41b67b7..cb274ae 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 3119cd9..5e2a551 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> |