summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Scott Main <smain@google.com> 2014-03-11 19:18:48 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-11 19:18:48 +0000
commita17a7000f2e1c5d38694c6329a8efdcad48fe1d5 (patch)
tree228f3bd106889e1d3ccd4f34915712ed9ef9110d
parenta870652789cc2b06b921fe66aa1bf48d4fc3e97c (diff)
parent2ada4e310d728756fc9bf69086987bfe215dc487 (diff)
am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs
* commit '2ada4e310d728756fc9bf69086987bfe215dc487': fix typos
-rw-r--r--docs/html/guide/topics/ui/controls/button.jd2
-rw-r--r--docs/html/guide/topics/ui/controls/togglebutton.jd2
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 41b67b7f2043..cb274ae51f25 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 3119cd9820b8..5e2a551bb0fa 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>