Merge "Docs/API fixes for API review" into nyc-dev
am: ffa1650ba0
* commit 'ffa1650ba0b60f9802360aa8491089c2432270e5':
Docs/API fixes for API review
Change-Id: I49dfa2a577f16eba2a2cc2015da50a086c56ad91
diff --git a/customtabs/api/current.txt b/customtabs/api/current.txt
index 9b24129..23f0b0a 100644
--- a/customtabs/api/current.txt
+++ b/customtabs/api/current.txt
@@ -65,7 +65,7 @@
method public android.support.customtabs.CustomTabsIntent.Builder setActionButton(android.graphics.Bitmap, java.lang.String, android.app.PendingIntent);
method public android.support.customtabs.CustomTabsIntent.Builder setCloseButtonIcon(android.graphics.Bitmap);
method public android.support.customtabs.CustomTabsIntent.Builder setExitAnimations(android.content.Context, int, int);
- method public deprecated android.support.customtabs.CustomTabsIntent.Builder setSecondaryToolbarColor(int);
+ method public android.support.customtabs.CustomTabsIntent.Builder setSecondaryToolbarColor(int);
method public android.support.customtabs.CustomTabsIntent.Builder setSecondaryToolbarViews(android.widget.RemoteViews, int[], android.app.PendingIntent);
method public android.support.customtabs.CustomTabsIntent.Builder setShowTitle(boolean);
method public android.support.customtabs.CustomTabsIntent.Builder setStartAnimations(android.content.Context, int, int);
diff --git a/customtabs/src/android/support/customtabs/CustomTabsClient.java b/customtabs/src/android/support/customtabs/CustomTabsClient.java
index 75e99bd..f743c7d 100644
--- a/customtabs/src/android/support/customtabs/CustomTabsClient.java
+++ b/customtabs/src/android/support/customtabs/CustomTabsClient.java
@@ -77,13 +77,14 @@
/**
* Returns the preferred package to use for Custom Tabs.
*
- * Unless <code>ignoreDefault</code> is true, if the default VIEW handler supports Custom Tabs,
- * its package name will be returned, irrespective of the content of <code>packages</code>.
+ * The preferred package name is the default VIEW intent handler as long as it supports Custom
+ * Tabs. To modify this preferred behavior, set <code>ignoreDefault</code> to true and give a
+ * non empty list of package names in <code>packages</code>.
*
* @param context {@link Context} to use for querying the packages.
* @param packages Ordered list of packages to test for Custom Tabs support, in
* decreasing order of priority.
- * @param ignoreDefault If set, don't systematically prefer the default VIEW handler.
+ * @param ignoreDefault If set, the default VIEW handler won't get priority over other browsers.
* @return The preferred package name for handling Custom Tabs, or <code>null</code>.
*/
public static String getPackageName(
diff --git a/customtabs/src/android/support/customtabs/CustomTabsIntent.java b/customtabs/src/android/support/customtabs/CustomTabsIntent.java
index 6a75de4..cd26670 100644
--- a/customtabs/src/android/support/customtabs/CustomTabsIntent.java
+++ b/customtabs/src/android/support/customtabs/CustomTabsIntent.java
@@ -396,7 +396,7 @@
* @param description The description for the button. To be used for accessibility.
* @param pendingIntent The pending intent delivered when the button is clicked.
*
- * @see CustomTabsIntent#getMaxToolbarItems().
+ * @see CustomTabsIntent#getMaxToolbarItems()
* @deprecated Use
* CustomTabsIntent.Builder#setSecondaryToolbarViews(RemoteViews, int[], PendingIntent).
*/
@@ -422,10 +422,7 @@
/**
* Sets the color of the secondary toolbar.
* @param color The color for the secondary toolbar.
- * @deprecated Use
- * CustomTabsIntent.Builder#setSecondaryToolbarViews(RemoteViews, int[], PendingIntent).
*/
- @Deprecated
public Builder setSecondaryToolbarColor(@ColorInt int color) {
mIntent.putExtra(EXTRA_SECONDARY_TOOLBAR_COLOR, color);
return this;
@@ -441,10 +438,10 @@
* one of the {@link View}s in clickableIDs. When the
* {@link PendingIntent} is sent, it will have the current URL as its
* intent data.
- * @see CustomTabsIntent#EXTRA_REMOTEVIEWS.
- * @see CustomTabsIntent#EXTRA_REMOTEVIEWS_VIEW_IDS.
- * @see CustomTabsIntent#EXTRA_REMOTEVIEWS_PENDINGINTENT.
- * @see CustomTabsIntent#EXTRA_REMOTEVIEWS_CLICKED_ID.
+ * @see CustomTabsIntent#EXTRA_REMOTEVIEWS
+ * @see CustomTabsIntent#EXTRA_REMOTEVIEWS_VIEW_IDS
+ * @see CustomTabsIntent#EXTRA_REMOTEVIEWS_PENDINGINTENT
+ * @see CustomTabsIntent#EXTRA_REMOTEVIEWS_CLICKED_ID
*/
public Builder setSecondaryToolbarViews(@NonNull RemoteViews remoteViews,
@Nullable int[] clickableIDs, @Nullable PendingIntent pendingIntent) {