Merge "Update javadocs to include correct attribute names" into oc-support-26.0-dev
diff --git a/wear/src/android/support/wear/widget/drawer/WearableActionDrawerView.java b/wear/src/android/support/wear/widget/drawer/WearableActionDrawerView.java
index 3074865..994b804 100644
--- a/wear/src/android/support/wear/widget/drawer/WearableActionDrawerView.java
+++ b/wear/src/android/support/wear/widget/drawer/WearableActionDrawerView.java
@@ -50,13 +50,13 @@
* WearableDrawerLayout} to create a drawer for users to easily pull up contextual actions. These
* contextual actions may be specified by using a {@link Menu}, which may be populated by either:
*
- * <ul> <li>Specifying the {@code action_menu} attribute in the XML layout file. Example:
+ * <ul> <li>Specifying the {@code app:actionMenu} attribute in the XML layout file. Example:
* <pre>
* <android.support.wear.widget.drawer.WearableActionDrawerView
* xmlns:app="http://schemas.android.com/apk/res-auto"
* android:layout_width=”match_parent”
* android:layout_height=”match_parent”
- * app:action_menu="@menu/action_drawer" /></pre>
+ * app:actionMenu="@menu/action_drawer" /></pre>
*
* <li>Getting the menu with {@link #getMenu}, and then inflating it with {@link
* MenuInflater#inflate}. Example:
diff --git a/wear/src/android/support/wear/widget/drawer/WearableDrawerLayout.java b/wear/src/android/support/wear/widget/drawer/WearableDrawerLayout.java
index 9825692..6d27064 100644
--- a/wear/src/android/support/wear/widget/drawer/WearableDrawerLayout.java
+++ b/wear/src/android/support/wear/widget/drawer/WearableDrawerLayout.java
@@ -60,8 +60,7 @@
*
* <pre>
* <android.support.wear.widget.drawer.WearableDrawerLayout [...]>
- * <FrameLayout
- * android:id=”@+id/content” />
+ * <FrameLayout android:id=”@+id/content” />
*
* <android.support.wear.widget.drawer.WearableNavigationDrawerView
* android:layout_width=”match_parent”
@@ -76,25 +75,25 @@
* <p>To use custom content in a drawer, place {@link WearableDrawerView} in a WearableDrawerLayout
* and specify the layout_gravity to pick the drawer location (the following example is for a top
* drawer). <b>Note:</b> You must either call {@link WearableDrawerView#setDrawerContent} and pass
- * in your drawer content view, or specify it in the {@code app:drawer_content} XML attribute.
+ * in your drawer content view, or specify it in the {@code app:drawerContent} XML attribute.
*
* <pre>
* <android.support.wear.widget.drawer.WearableDrawerLayout [...]>
* <FrameLayout
+ * android:id=”@+id/content”
* android:layout_width=”match_parent”
- * android:layout_height=”match_parent”
- * android:id=”@+id/content” />
+ * android:layout_height=”match_parent” />
*
* <android.support.wear.widget.drawer.WearableDrawerView
* android:layout_width=”match_parent”
* android:layout_height=”match_parent”
* android:layout_gravity=”top”
- * app:drawer_content="@+id/top_drawer_content" >
+ * app:drawerContent="@+id/top_drawer_content" >
*
* <FrameLayout
+ * android:id=”@id/top_drawer_content”
* android:layout_width=”match_parent”
- * android:layout_height=”match_parent”
- * android:id=”@id/top_drawer_content” />
+ * android:layout_height=”match_parent” />
*
* </android.support.wear.widget.drawer.WearableDrawerView>
* </android.support.wear.widget.drawer.WearableDrawerLayout></pre>
diff --git a/wear/src/android/support/wear/widget/drawer/WearableDrawerView.java b/wear/src/android/support/wear/widget/drawer/WearableDrawerView.java
index 0203860..dafac39 100644
--- a/wear/src/android/support/wear/widget/drawer/WearableDrawerView.java
+++ b/wear/src/android/support/wear/widget/drawer/WearableDrawerView.java
@@ -48,8 +48,8 @@
* content must be provided.
*
* <p>There are two ways to specify the content and peek views: by invoking {@code setter} methods
- * on the {@code WearableDrawerView}, or by specifying the {@code drawer_content} and {@code
- * peek_view} attributes. Examples:
+ * on the {@code WearableDrawerView}, or by specifying the {@code app:drawerContent} and {@code
+ * app:peekView} attributes. Examples:
*
* <pre>
* // From Java:
@@ -62,8 +62,8 @@
* android:layout_height="match_parent"
* android:layout_gravity="bottom"
* android:background="@color/red"
- * app:drawer_content="@+id/drawer_content"
- * app:peek_view="@+id/peek_view">
+ * app:drawerContent="@+id/drawer_content"
+ * app:peekView="@+id/peek_view">
*
* <FrameLayout
* android:id="@id/drawer_content"
diff --git a/wear/src/android/support/wear/widget/drawer/WearableNavigationDrawerView.java b/wear/src/android/support/wear/widget/drawer/WearableNavigationDrawerView.java
index 31cbdd0..480812b 100644
--- a/wear/src/android/support/wear/widget/drawer/WearableNavigationDrawerView.java
+++ b/wear/src/android/support/wear/widget/drawer/WearableNavigationDrawerView.java
@@ -55,8 +55,8 @@
* navigation drawer will be displayed as empty. The multiple page navigation drawer will display 1
* or more pages to the user, each representing different navigation verticals.
*
- * <p>The developer may specify which style to use with the {@code app:navigation_style} custom
- * attribute. If not specified, {@link #SINGLE_PAGE} will be used as the default.
+ * <p>The developer may specify which style to use with the {@code app:navigationStyle} custom
+ * attribute. If not specified, {@link #SINGLE_PAGE singlePage} will be used as the default.
*/
@TargetApi(Build.VERSION_CODES.M)
public class WearableNavigationDrawerView extends WearableDrawerView {