diff options
| author | Rich Slogar <rslogar@google.com> | 2015-04-23 02:17:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-23 02:17:55 +0000 |
| commit | 1922567e29806af45c32b8f250a42cda02f5f921 (patch) | |
| tree | 88f179c7ccf012dc3449277ea8eb83fbab9d9b91 /docs | |
| parent | 8bd3801d1a7222a1ab002634e5740c21820ab224 (diff) | |
| parent | 8e3250af0f5ac881df4b5f88f4dd784994e979d7 (diff) | |
| download | frameworks_base-1922567e29806af45c32b8f250a42cda02f5f921.zip frameworks_base-1922567e29806af45c32b8f250a42cda02f5f921.tar.gz frameworks_base-1922567e29806af45c32b8f250a42cda02f5f921.tar.bz2 | |
am 8e3250af: am 674b0648: Merge "docs: support library 22.1 feature updates" into lmp-mr1-ub-docs
* commit '8e3250af0f5ac881df4b5f88f4dd784994e979d7':
docs: support library 22.1 feature updates
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/tools/support-library/features.jd | 9 |
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 0f0a0c0..ee1ed72 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 |