summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Rich Slogar <rslogar@google.com> 2015-04-23 00:43:48 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-04-23 00:43:49 +0000
commit674b06481dc73ce64116b885eb97266f956b614d (patch)
tree08b16dcafd2b385c1fd0e38be6406ddcec23772d
parent7570ef70f33d9267e722063e9de21e84d6ba2b29 (diff)
parente85ca7d1feb0757c29dc9d77768927932226c866 (diff)
Merge "docs: support library 22.1 feature updates" into lmp-mr1-ub-docs
-rw-r--r--docs/html/tools/support-library/features.jd9
1 files changed, 6 insertions, 3 deletions
diff --git a/docs/html/tools/support-library/features.jd b/docs/html/tools/support-library/features.jd
index 0f0a0c0cce7a..ee1ed724b94c 100644
--- a/docs/html/tools/support-library/features.jd
+++ b/docs/html/tools/support-library/features.jd
@@ -205,9 +205,12 @@ com.android.support:multidex:1.0.0
information on using the Action Bar, see the
<a href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer guide.
</li>
- <li>{@link android.support.v7.app.ActionBarActivity} - Adds an application activity class that
- must be used as a base class for activities that uses the Support Library action bar
- implementation.
+ <li>{@link android.support.v7.app.AppCompatActivity} - Adds an application activity class that can
+ be used as a base class for activities that use the Support Library action bar
+ implementation.
+ </li>
+ <li>{@link android.support.v7.app.AppCompatDialog} - Adds a dialog class that can be used as a base
+ class for AppCompat themed dialogs.
</li>
<li>{@link android.support.v7.widget.ShareActionProvider} - Adds support for a standardized
sharing action (such as email or posting to social applications) that can be included in an