diff --git a/docs/html/training/basics/actionbar/adding-buttons.jd b/docs/html/training/basics/actionbar/adding-buttons.jd index 5fb0d59bff282..26c9d0ea69443 100644 --- a/docs/html/training/basics/actionbar/adding-buttons.jd +++ b/docs/html/training/basics/actionbar/adding-buttons.jd @@ -74,7 +74,21 @@ is available in the action bar, but the Settings action should always appear in the overflow. (By default, all actions appear in the overflow, but it's good practice to explicitly declare your design intentions for each action.) -

However, if your app is using the Support Library for compatibility on versions +

The {@code icon} attribute requires a resource ID for an +image. The name that follows {@code @drawable/} must be the name of a bitmap image you've +saved in your project's {@code res/drawable/} directory. For example, +{@code "@drawable/ic_action_search"} refers to {@code ic_action_search.png}. +Likewise, the {@code title} attribute uses a string resource that's defined by an XML +file in your project's {@code res/values/} directory, as discussed in Building a Simple User +Interface. + +

Note: When creating icons and other bitmap images for your app, +it's important that you provide multiple versions that are each optimized for a different screen +density. This is discussed more in the lesson about Supporting Different Screens. + +

If your app is using the Support Library for compatibility on versions as low as Android 2.1, the {@code showAsAction} attribute is not available from the {@code android:} namespace. Instead this attribute is provided by the Support Library and you must define your own XML namespace and use that namespace as the attribute prefix. diff --git a/docs/html/training/basics/actionbar/styling.jd b/docs/html/training/basics/actionbar/styling.jd index a1cc10cd5e73a..1f76e03f31e19 100644 --- a/docs/html/training/basics/actionbar/styling.jd +++ b/docs/html/training/basics/actionbar/styling.jd @@ -20,7 +20,7 @@ trainingnavtop=true

@@ -146,13 +146,13 @@ background like this:

<style name="CustomActionBarTheme" parent="@style/Theme.Holo.Light.DarkActionBar"> <item name="android:actionBarStyle">@style/MyActionBar</item> - <style> + </style> <!-- ActionBar styles --> <style name="MyActionBar" parent="@style/Widget.Holo.Light.ActionBar.Solid.Inverse"> <item name="android:background">@drawable/actionbar_background</item> - <style> + </style> </resources> @@ -178,7 +178,7 @@ background like this:

<!-- Support library compatibility --> <item name="actionBarStyle">@style/MyActionBar</item> - <style> + </style> <!-- ActionBar styles --> <style name="MyActionBar" @@ -187,7 +187,7 @@ background like this:

<!-- Support library compatibility --> <item name="background">@drawable/actionbar_background</item> - <style> + </style> </resources> @@ -236,25 +236,25 @@ for each text element:

<item name="android:actionBarStyle">@style/MyActionBar</item> <item name="android:actionBarTabTextStyle">@style/MyActionBarTabText</item> <item name="android:actionMenuTextColor">@color/actionbar_text</item> - <style> + </style> <!-- ActionBar styles --> <style name="MyActionBar" parent="@style/Widget.Holo.ActionBar"> <item name="android:titleTextStyle">@style/MyActionBarTitleText</item> - <style> + </style> <!-- ActionBar title text --> <style name="MyActionBarTitleText" parent="@style/TextAppearance.Holo.Widget.ActionBar.Title"> <item name="android:textColor">@color/actionbar_text</item> - <style> + </style> <!-- ActionBar tabs text styles --> <style name="MyActionBarTabText" parent="@style/Widget.Holo.ActionBar.TabText"> <item name="android:textColor">@color/actionbar_text</item> - <style> + </style> </resources> @@ -280,7 +280,7 @@ for each text element:

<item name="actionBarStyle">@style/MyActionBar</item> <item name="actionBarTabTextStyle">@style/MyActionBarTabText</item> <item name="actionMenuTextColor">@color/actionbar_text</item> - <style> + </style> <!-- ActionBar styles --> <style name="MyActionBar" @@ -289,21 +289,21 @@ for each text element:

<!-- Support library compatibility --> <item name="titleTextStyle">@style/MyActionBarTitleText</item> - <style> + </style> <!-- ActionBar title text --> <style name="MyActionBarTitleText" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"> <item name="android:textColor">@color/actionbar_text</item> <!-- The textColor property is backward compatible with the Support Library --> - <style> + </style> <!-- ActionBar tabs text --> <style name="MyActionBarTabText" parent="@style/Widget.AppCompat.ActionBar.TabText"> <item name="android:textColor">@color/actionbar_text</item> <!-- The textColor property is backward compatible with the Support Library --> - <style> + </style> </resources> @@ -392,14 +392,14 @@ for several different states of an action bar tab:

<style name="CustomActionBarTheme" parent="@style/Theme.Holo"> <item name="android:actionBarTabStyle">@style/MyActionBarTabs</item> - <style> + </style> <!-- ActionBar tabs styles --> <style name="MyActionBarTabs" parent="@style/Widget.Holo.ActionBar.TabView"> <!-- tab indicator --> <item name="android:background">@drawable/actionbar_tab_indicator</item> - <style> + </style> </resources> @@ -420,7 +420,7 @@ for several different states of an action bar tab:

<!-- Support library compatibility --> <item name="actionBarTabStyle">@style/MyActionBarTabs</item> - <style> + </style> <!-- ActionBar tabs styles --> <style name="MyActionBarTabs" @@ -430,7 +430,7 @@ for several different states of an action bar tab:

<!-- Support library compatibility --> <item name="background">@drawable/actionbar_tab_indicator</item> - <style> + </style> </resources> @@ -442,7 +442,7 @@ for several different states of an action bar tab:

href="{@docRoot}guide/topics/ui/themes.html">Styles and Themes guide.
  • For even more complete styling for the action bar, try the Android Action Bar Style + href="http://www.actionbarstylegenerator.com">Android Action Bar Style Generator.
    • \ No newline at end of file diff --git a/docs/html/training/basics/activity-lifecycle/starting.jd b/docs/html/training/basics/activity-lifecycle/starting.jd index dce6e30c69e06..90465991390ba 100644 --- a/docs/html/training/basics/activity-lifecycle/starting.jd +++ b/docs/html/training/basics/activity-lifecycle/starting.jd @@ -220,7 +220,7 @@ public void onCreate(Bundle savedInstanceState) {

    Caution: Using the {@link android.os.Build.VERSION#SDK_INT} to -prevent older system's from executing new APIs works in this way on Android 2.0 (API level +prevent older systems from executing new APIs works in this way on Android 2.0 (API level 5) and higher only. Older versions will encounter a runtime exception.

    Once the {@link android.app.Activity#onCreate onCreate()} finishes execution, the system diff --git a/docs/html/training/basics/supporting-devices/screens.jd b/docs/html/training/basics/supporting-devices/screens.jd index 1114f211b420b..e52ee701fb5e1 100644 --- a/docs/html/training/basics/supporting-devices/screens.jd +++ b/docs/html/training/basics/supporting-devices/screens.jd @@ -23,8 +23,8 @@ next.link=platforms.html

    diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs index c99fc96b0033b..40c170edd8459 100644 --- a/docs/html/training/training_toc.cs +++ b/docs/html/training/training_toc.cs @@ -66,6 +66,30 @@ include the action bar on devices running Android 2.1 or higher." +
  • +
    + Supporting Different Devices +
    + +
    • +
    • -
  • -
    - Supporting Different Devices -
    - -
    • -