Minor API update as requested by API council reviewer.

Bug: 153434075
Test: ./gradlew wear:wear:connectedCheck --info --daemon -Pandroid.testInstrumentationRunnerArguments.class=androidx.wear.activity.ConfirmationActivityTest
Change-Id: Ifb8d39a84965751cde76234e93e486cc6ccd416e
diff --git a/wear/wear/api/1.1.0-alpha01.txt b/wear/wear/api/1.1.0-alpha01.txt
index b6b0a6d..b193e32 100644
--- a/wear/wear/api/1.1.0-alpha01.txt
+++ b/wear/wear/api/1.1.0-alpha01.txt
@@ -5,8 +5,7 @@
     ctor public ConfirmationActivity();
     method protected void onAnimationFinished();
     method public void onCreate(android.os.Bundle!);
-    field public static final int DEFAULT_ANIMATION_DURATION_MS = 1000; // 0x3e8
-    field public static final String EXTRA_ANIMATION_DURATION_MS = "androidx.wear.activity.extra.ANIMATION_DURATION_MS";
+    field public static final String EXTRA_ANIMATION_DURATION_MILLIS = "androidx.wear.activity.extra.ANIMATION_DURATION_MILLIS";
     field public static final String EXTRA_ANIMATION_TYPE = "androidx.wear.activity.extra.ANIMATION_TYPE";
     field public static final String EXTRA_MESSAGE = "androidx.wear.activity.extra.MESSAGE";
     field public static final int FAILURE_ANIMATION = 3; // 0x3
diff --git a/wear/wear/api/current.txt b/wear/wear/api/current.txt
index b6b0a6d..b193e32 100644
--- a/wear/wear/api/current.txt
+++ b/wear/wear/api/current.txt
@@ -5,8 +5,7 @@
     ctor public ConfirmationActivity();
     method protected void onAnimationFinished();
     method public void onCreate(android.os.Bundle!);
-    field public static final int DEFAULT_ANIMATION_DURATION_MS = 1000; // 0x3e8
-    field public static final String EXTRA_ANIMATION_DURATION_MS = "androidx.wear.activity.extra.ANIMATION_DURATION_MS";
+    field public static final String EXTRA_ANIMATION_DURATION_MILLIS = "androidx.wear.activity.extra.ANIMATION_DURATION_MILLIS";
     field public static final String EXTRA_ANIMATION_TYPE = "androidx.wear.activity.extra.ANIMATION_TYPE";
     field public static final String EXTRA_MESSAGE = "androidx.wear.activity.extra.MESSAGE";
     field public static final int FAILURE_ANIMATION = 3; // 0x3
diff --git a/wear/wear/api/public_plus_experimental_1.1.0-alpha01.txt b/wear/wear/api/public_plus_experimental_1.1.0-alpha01.txt
index b6b0a6d..b193e32 100644
--- a/wear/wear/api/public_plus_experimental_1.1.0-alpha01.txt
+++ b/wear/wear/api/public_plus_experimental_1.1.0-alpha01.txt
@@ -5,8 +5,7 @@
     ctor public ConfirmationActivity();
     method protected void onAnimationFinished();
     method public void onCreate(android.os.Bundle!);
-    field public static final int DEFAULT_ANIMATION_DURATION_MS = 1000; // 0x3e8
-    field public static final String EXTRA_ANIMATION_DURATION_MS = "androidx.wear.activity.extra.ANIMATION_DURATION_MS";
+    field public static final String EXTRA_ANIMATION_DURATION_MILLIS = "androidx.wear.activity.extra.ANIMATION_DURATION_MILLIS";
     field public static final String EXTRA_ANIMATION_TYPE = "androidx.wear.activity.extra.ANIMATION_TYPE";
     field public static final String EXTRA_MESSAGE = "androidx.wear.activity.extra.MESSAGE";
     field public static final int FAILURE_ANIMATION = 3; // 0x3
diff --git a/wear/wear/api/public_plus_experimental_current.txt b/wear/wear/api/public_plus_experimental_current.txt
index b6b0a6d..b193e32 100644
--- a/wear/wear/api/public_plus_experimental_current.txt
+++ b/wear/wear/api/public_plus_experimental_current.txt
@@ -5,8 +5,7 @@
     ctor public ConfirmationActivity();
     method protected void onAnimationFinished();
     method public void onCreate(android.os.Bundle!);
-    field public static final int DEFAULT_ANIMATION_DURATION_MS = 1000; // 0x3e8
-    field public static final String EXTRA_ANIMATION_DURATION_MS = "androidx.wear.activity.extra.ANIMATION_DURATION_MS";
+    field public static final String EXTRA_ANIMATION_DURATION_MILLIS = "androidx.wear.activity.extra.ANIMATION_DURATION_MILLIS";
     field public static final String EXTRA_ANIMATION_TYPE = "androidx.wear.activity.extra.ANIMATION_TYPE";
     field public static final String EXTRA_MESSAGE = "androidx.wear.activity.extra.MESSAGE";
     field public static final int FAILURE_ANIMATION = 3; // 0x3
diff --git a/wear/wear/api/restricted_1.1.0-alpha01.txt b/wear/wear/api/restricted_1.1.0-alpha01.txt
index 79c0d86..a1178e5 100644
--- a/wear/wear/api/restricted_1.1.0-alpha01.txt
+++ b/wear/wear/api/restricted_1.1.0-alpha01.txt
@@ -5,8 +5,7 @@
     ctor public ConfirmationActivity();
     method protected void onAnimationFinished();
     method public void onCreate(android.os.Bundle!);
-    field public static final int DEFAULT_ANIMATION_DURATION_MS = 1000; // 0x3e8
-    field public static final String EXTRA_ANIMATION_DURATION_MS = "androidx.wear.activity.extra.ANIMATION_DURATION_MS";
+    field public static final String EXTRA_ANIMATION_DURATION_MILLIS = "androidx.wear.activity.extra.ANIMATION_DURATION_MILLIS";
     field public static final String EXTRA_ANIMATION_TYPE = "androidx.wear.activity.extra.ANIMATION_TYPE";
     field public static final String EXTRA_MESSAGE = "androidx.wear.activity.extra.MESSAGE";
     field public static final int FAILURE_ANIMATION = 3; // 0x3
diff --git a/wear/wear/api/restricted_current.txt b/wear/wear/api/restricted_current.txt
index 79c0d86..a1178e5 100644
--- a/wear/wear/api/restricted_current.txt
+++ b/wear/wear/api/restricted_current.txt
@@ -5,8 +5,7 @@
     ctor public ConfirmationActivity();
     method protected void onAnimationFinished();
     method public void onCreate(android.os.Bundle!);
-    field public static final int DEFAULT_ANIMATION_DURATION_MS = 1000; // 0x3e8
-    field public static final String EXTRA_ANIMATION_DURATION_MS = "androidx.wear.activity.extra.ANIMATION_DURATION_MS";
+    field public static final String EXTRA_ANIMATION_DURATION_MILLIS = "androidx.wear.activity.extra.ANIMATION_DURATION_MILLIS";
     field public static final String EXTRA_ANIMATION_TYPE = "androidx.wear.activity.extra.ANIMATION_TYPE";
     field public static final String EXTRA_MESSAGE = "androidx.wear.activity.extra.MESSAGE";
     field public static final int FAILURE_ANIMATION = 3; // 0x3
diff --git a/wear/wear/src/androidTest/AndroidManifest.xml b/wear/wear/src/androidTest/AndroidManifest.xml
index a62627b..870b7a4 100644
--- a/wear/wear/src/androidTest/AndroidManifest.xml
+++ b/wear/wear/src/androidTest/AndroidManifest.xml
@@ -83,7 +83,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="androidx.wear.widget.ConfirmationActivityTestActivity">
+        <activity android:name="androidx.wear.activity.ConfirmationActivityTestActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/wear/wear/src/androidTest/java/androidx/wear/widget/ConfirmationActivityTest.java b/wear/wear/src/androidTest/java/androidx/wear/activity/ConfirmationActivityTest.java
similarity index 97%
rename from wear/wear/src/androidTest/java/androidx/wear/widget/ConfirmationActivityTest.java
rename to wear/wear/src/androidTest/java/androidx/wear/activity/ConfirmationActivityTest.java
index 6efc610..9d54c3a 100644
--- a/wear/wear/src/androidTest/java/androidx/wear/widget/ConfirmationActivityTest.java
+++ b/wear/wear/src/androidTest/java/androidx/wear/activity/ConfirmationActivityTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.wear.widget;
+package androidx.wear.activity;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -25,7 +25,6 @@
 import androidx.test.filters.LargeTest;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
-import androidx.wear.activity.ConfirmationActivity;
 import androidx.wear.test.R;
 import androidx.wear.widget.util.WakeLockRule;
 
@@ -57,18 +56,18 @@
 
     @Test
     public void testConfirmationDialogShownForDefaultDuration() throws Throwable {
-        int testDuration = ConfirmationActivity.DEFAULT_ANIMATION_DURATION_MS;
+        int testDuration = ConfirmationActivity.DEFAULT_ANIMATION_DURATION_MILLIS;
         // Check that the structure of the test is still valid
         assertTrue(testDuration
                 > (MILLIS_BEFORE_END_OF_DURATION + MILLIS_TO_WAIT_FOR_ACTIVITY_TO_BE_DRAWN));
         testConfirmationDialogShownForConfiguredDuration(
-                ConfirmationActivity.DEFAULT_ANIMATION_DURATION_MS);
+                ConfirmationActivity.DEFAULT_ANIMATION_DURATION_MILLIS);
     }
 
     @Test
     public void testConfirmationDialogShownForLongerDuration() throws Throwable {
         testConfirmationDialogShownForConfiguredDuration(
-                ConfirmationActivity.DEFAULT_ANIMATION_DURATION_MS * 2);
+                ConfirmationActivity.DEFAULT_ANIMATION_DURATION_MILLIS * 2);
     }
 
     private void testConfirmationDialogShownForConfiguredDuration(int duration) throws Throwable {
diff --git a/wear/wear/src/androidTest/java/androidx/wear/widget/ConfirmationActivityTestActivity.java b/wear/wear/src/androidTest/java/androidx/wear/activity/ConfirmationActivityTestActivity.java
similarity index 93%
rename from wear/wear/src/androidTest/java/androidx/wear/widget/ConfirmationActivityTestActivity.java
rename to wear/wear/src/androidTest/java/androidx/wear/activity/ConfirmationActivityTestActivity.java
index 2d80336..a420042 100644
--- a/wear/wear/src/androidTest/java/androidx/wear/widget/ConfirmationActivityTestActivity.java
+++ b/wear/wear/src/androidTest/java/androidx/wear/activity/ConfirmationActivityTestActivity.java
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package androidx.wear.widget;
+package androidx.wear.activity;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.widget.Button;
 
-import androidx.wear.activity.ConfirmationActivity;
 import androidx.wear.test.R;
 
 public class ConfirmationActivityTestActivity extends Activity {
@@ -33,7 +32,7 @@
         mDuration = duration;
     }
 
-    private int mDuration = ConfirmationActivity.DEFAULT_ANIMATION_DURATION_MS;
+    private int mDuration = ConfirmationActivity.DEFAULT_ANIMATION_DURATION_MILLIS;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -47,7 +46,8 @@
                             ConfirmationActivity.class);
                     intent.putExtra(ConfirmationActivity.EXTRA_ANIMATION_TYPE,
                             ConfirmationActivity.SUCCESS_ANIMATION);
-                    intent.putExtra(ConfirmationActivity.EXTRA_ANIMATION_DURATION_MS, mDuration);
+                    intent.putExtra(ConfirmationActivity.EXTRA_ANIMATION_DURATION_MILLIS,
+                            mDuration);
                     intent.putExtra(ConfirmationActivity.EXTRA_MESSAGE, "A message");
 
                     startActivity(intent);
diff --git a/wear/wear/src/androidTest/res/layout/confirmation_activity_test_layout.xml b/wear/wear/src/androidTest/res/layout/confirmation_activity_test_layout.xml
index 5ef7d68..c2ae90b 100644
--- a/wear/wear/src/androidTest/res/layout/confirmation_activity_test_layout.xml
+++ b/wear/wear/src/androidTest/res/layout/confirmation_activity_test_layout.xml
@@ -22,7 +22,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#333333"
-    tools:context="androidx.wear.widget.ConfirmationActivityTestActivity">
+    tools:context="androidx.wear.activity.ConfirmationActivityTestActivity">
     <Button
         android:id="@+id/show_confirmation_activity_button"
         android:layout_width="wrap_content"
diff --git a/wear/wear/src/main/java/androidx/wear/activity/ConfirmationActivity.java b/wear/wear/src/main/java/androidx/wear/activity/ConfirmationActivity.java
index 9359302..719c8e8 100644
--- a/wear/wear/src/main/java/androidx/wear/activity/ConfirmationActivity.java
+++ b/wear/wear/src/main/java/androidx/wear/activity/ConfirmationActivity.java
@@ -50,10 +50,8 @@
  * <p>An optional message, included in the extra {@link #EXTRA_MESSAGE} will be displayed
  * horizontally centered below the animation.
  *
- * <p>An optional duration to keep the confirmation activity visible for, included in the extra
- * {@link #EXTRA_ANIMATION_DURATION_MS}
- *
- * <p>Default duration is {@link #DEFAULT_ANIMATION_DURATION_MS}
+ * <p>An optional duration in milliseconds to keep the confirmation activity visible for, included
+ * in the extra {@link #EXTRA_ANIMATION_DURATION_MILLIS}
  */
 public class ConfirmationActivity extends Activity {
 
@@ -77,17 +75,18 @@
      * The lookup key for an optional int that defines the duration in milliseconds that the
      * confirmation activity should be displayed.
      *
-     * If no value is specified it will default to {@value #DEFAULT_ANIMATION_DURATION_MS}
+     * If no value is specified it will default to
+     * {@link ConfirmationOverlay#DEFAULT_ANIMATION_DURATION_MS}
      */
-    public static final String EXTRA_ANIMATION_DURATION_MS =
-            "androidx.wear.activity.extra.ANIMATION_DURATION_MS";
+    public static final String EXTRA_ANIMATION_DURATION_MILLIS =
+            "androidx.wear.activity.extra.ANIMATION_DURATION_MILLIS";
 
     public static final int SUCCESS_ANIMATION = 1;
     public static final int OPEN_ON_PHONE_ANIMATION = 2;
     public static final int FAILURE_ANIMATION = 3;
 
-    /** Default animation duration in ms. **/
-    public static final int DEFAULT_ANIMATION_DURATION_MS =
+    /** Default animation duration in milliseconds. **/
+    static final int DEFAULT_ANIMATION_DURATION_MILLIS =
             ConfirmationOverlay.DEFAULT_ANIMATION_DURATION_MS;
 
     private static final SparseIntArray CONFIRMATION_OVERLAY_TYPES = new SparseIntArray();
@@ -107,8 +106,8 @@
         Intent intent = getIntent();
 
         int requestedType = intent.getIntExtra(EXTRA_ANIMATION_TYPE, SUCCESS_ANIMATION);
-        int animationDurationMillis = intent.getIntExtra(EXTRA_ANIMATION_DURATION_MS,
-                DEFAULT_ANIMATION_DURATION_MS);
+        int animationDurationMillis = intent.getIntExtra(EXTRA_ANIMATION_DURATION_MILLIS,
+                DEFAULT_ANIMATION_DURATION_MILLIS);
         if (CONFIRMATION_OVERLAY_TYPES.indexOfKey(requestedType) < 0) {
             throw new IllegalArgumentException("Unknown type of animation: " + requestedType);
         }