Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docs: Mention SwitchCompat in Switch and toggle documentation

Browse Source 
Bug: 19574556
Change-Id: I2ebb504b144a442d90cfdf6ab4b407726a3b896f
This commit is contained in:
Mark Lu
2016-08-30 18:12:30 -07:00
parent 689c92db9d
commit 3404032dfc
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/widget/Switch.java
View File

@@ -65,6 +65,9 @@ import com.android.internal.R;
* {@link #setSwitchTextAppearance(android.content.Context, int) switchTextAppearance} and * {@link #setSwitchTextAppearance(android.content.Context, int) switchTextAppearance} and
* the related setSwitchTypeface() methods control that of the thumb. * the related setSwitchTypeface() methods control that of the thumb.
* *
* <p>{@link android.support.v7.widget.SwitchCompat} is a version of
* the Switch widget which runs on devices back to API 7.</p>
*
* <p>See the <a href="{@docRoot}guide/topics/ui/controls/togglebutton.html">Toggle Buttons</a> * <p>See the <a href="{@docRoot}guide/topics/ui/controls/togglebutton.html">Toggle Buttons</a>
* guide.</p> * guide.</p>
* *

10
docs/html/guide/topics/ui/controls/togglebutton.jd
View File

@@ -14,6 +14,7 @@ page.tags=switch,togglebutton
<ol> <ol>
<li>{@link android.widget.ToggleButton}</li> <li>{@link android.widget.ToggleButton}</li>
<li>{@link android.widget.Switch}</li> <li>{@link android.widget.Switch}</li>
<li>{@link android.support.v7.widget.SwitchCompat}</li>
<li>{@link android.widget.CompoundButton}</li> <li>{@link android.widget.CompoundButton}</li>
</ol> </ol>
</div> </div>
@@ -21,9 +22,12 @@ page.tags=switch,togglebutton
<p>A toggle button allows the user to change a setting between two states.</p> <p>A toggle button allows the user to change a setting between two states.</p>
<p>You can add a basic toggle button to your layout with the {@link android.widget.ToggleButton} <p>You can add a basic toggle button to your layout with the
object. Android 4.0 (API level 14) introduces another kind of toggle button called a switch that {@link android.widget.ToggleButton} object. Android 4.0 (API level 14)
provides a slider control, which you can add with a {@link android.widget.Switch} object.</p> introduces another kind of toggle button called a switch that provides a slider
control, which you can add with a {@link android.widget.Switch} object.
{@link android.support.v7.widget.SwitchCompat} is a version of the Switch
widget which runs on devices back to API 7.</p>
<p> <p>
If you need to change a button's state yourself, you can use the {@link If you need to change a button's state yourself, you can use the {@link