Revert "Rename VM's to ViewModel"

This reverts r.android.com/982666

Bug: 135942802
Test: ./gradlew bOS
Change-Id: Icff3208a2248e49f7e903dcbb21324c5a199de81

13 files changed, 61 insertions, 55 deletions

diff --git a/activity/activity/src/main/java/androidx/activity/ComponentActivity.java b/activity/activity/src/main/java/androidx/activity/ComponentActivity.java
index a4f033fe274..2b183f73c60 100644
--- a/activity/activity/src/main/java/androidx/activity/ComponentActivity.java
+++ b/activity/activity/src/main/java/androidx/activity/ComponentActivity.java
@@ -34,7 +34,7 @@ import androidx.lifecycle.LifecycleEventObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LifecycleRegistry;
 import androidx.lifecycle.ReportFragment;
-import androidx.lifecycle.SavedStateViewModelFactory;
+import androidx.lifecycle.SavedStateVMFactory;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.ViewModelStore;
 import androidx.lifecycle.ViewModelStoreOwner;
@@ -290,7 +290,7 @@ public class ComponentActivity extends androidx.core.app.ComponentActivity imple
                     + "Application instance. You can't request ViewModel before onCreate call.");
         }
         if (mDefaultFactory == null) {
-            mDefaultFactory = new SavedStateViewModelFactory(
+            mDefaultFactory = new SavedStateVMFactory(
                     getApplication(),
                     this,
                     getIntent() != null ? getIntent().getExtras() : null);
diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java b/fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java
index 56ce5248135..3c7cc1bdfd5 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/Fragment.java
@@ -64,7 +64,7 @@ import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LifecycleRegistry;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.SavedStateViewModelFactory;
+import androidx.lifecycle.SavedStateVMFactory;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.ViewModelStore;
 import androidx.lifecycle.ViewModelStoreOwner;
@@ -373,7 +373,7 @@ public class Fragment implements ComponentCallbacks, OnCreateContextMenuListener
             throw new IllegalStateException("Can't access ViewModels from detached fragment");
         }
         if (mDefaultFactory == null) {
-            mDefaultFactory = new SavedStateViewModelFactory(
+            mDefaultFactory = new SavedStateVMFactory(
                     requireActivity().getApplication(),
                     this,
                     getArguments());
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/api/1.0.0-alpha02.txt b/lifecycle/lifecycle-viewmodel-savedstate/api/1.0.0-alpha02.txt
index 8bd77f22257..d6d3637ab68 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/api/1.0.0-alpha02.txt
+++ b/lifecycle/lifecycle-viewmodel-savedstate/api/1.0.0-alpha02.txt
@@ -1,8 +1,8 @@
 // Signature format: 3.0
 package androidx.lifecycle {
 
-  public abstract class AbstractSavedStateViewModelFactory implements androidx.lifecycle.ViewModelProvider.Factory {
-    ctor public AbstractSavedStateViewModelFactory(androidx.savedstate.SavedStateRegistryOwner, android.os.Bundle?);
+  public abstract class AbstractSavedStateVMFactory implements androidx.lifecycle.ViewModelProvider.Factory {
+    ctor public AbstractSavedStateVMFactory(androidx.savedstate.SavedStateRegistryOwner, android.os.Bundle?);
     method public final <T extends androidx.lifecycle.ViewModel> T create(Class<T!>);
     method protected abstract <T extends androidx.lifecycle.ViewModel> T create(String, Class<T!>, androidx.lifecycle.SavedStateHandle);
   }
@@ -19,9 +19,9 @@ package androidx.lifecycle {
     method @MainThread public <T> void set(String, T?);
   }
 
-  public final class SavedStateViewModelFactory extends androidx.lifecycle.AbstractSavedStateViewModelFactory implements androidx.lifecycle.ViewModelProvider.Factory {
-    ctor public SavedStateViewModelFactory(android.app.Application, androidx.savedstate.SavedStateRegistryOwner);
-    ctor public SavedStateViewModelFactory(android.app.Application, androidx.savedstate.SavedStateRegistryOwner, android.os.Bundle?);
+  public final class SavedStateVMFactory extends androidx.lifecycle.AbstractSavedStateVMFactory implements androidx.lifecycle.ViewModelProvider.Factory {
+    ctor public SavedStateVMFactory(android.app.Application, androidx.savedstate.SavedStateRegistryOwner);
+    ctor public SavedStateVMFactory(android.app.Application, androidx.savedstate.SavedStateRegistryOwner, android.os.Bundle?);
     method protected <T extends androidx.lifecycle.ViewModel> T create(String, Class<T!>, androidx.lifecycle.SavedStateHandle);
   }
 
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/api/current.txt b/lifecycle/lifecycle-viewmodel-savedstate/api/current.txt
index 8bd77f22257..d6d3637ab68 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/api/current.txt
+++ b/lifecycle/lifecycle-viewmodel-savedstate/api/current.txt
@@ -1,8 +1,8 @@
 // Signature format: 3.0
 package androidx.lifecycle {
 
-  public abstract class AbstractSavedStateViewModelFactory implements androidx.lifecycle.ViewModelProvider.Factory {
-    ctor public AbstractSavedStateViewModelFactory(androidx.savedstate.SavedStateRegistryOwner, android.os.Bundle?);
+  public abstract class AbstractSavedStateVMFactory implements androidx.lifecycle.ViewModelProvider.Factory {
+    ctor public AbstractSavedStateVMFactory(androidx.savedstate.SavedStateRegistryOwner, android.os.Bundle?);
     method public final <T extends androidx.lifecycle.ViewModel> T create(Class<T!>);
     method protected abstract <T extends androidx.lifecycle.ViewModel> T create(String, Class<T!>, androidx.lifecycle.SavedStateHandle);
   }
@@ -19,9 +19,9 @@ package androidx.lifecycle {
     method @MainThread public <T> void set(String, T?);
   }
 
-  public final class SavedStateViewModelFactory extends androidx.lifecycle.AbstractSavedStateViewModelFactory implements androidx.lifecycle.ViewModelProvider.Factory {
-    ctor public SavedStateViewModelFactory(android.app.Application, androidx.savedstate.SavedStateRegistryOwner);
-    ctor public SavedStateViewModelFactory(android.app.Application, androidx.savedstate.SavedStateRegistryOwner, android.os.Bundle?);
+  public final class SavedStateVMFactory extends androidx.lifecycle.AbstractSavedStateVMFactory implements androidx.lifecycle.ViewModelProvider.Factory {
+    ctor public SavedStateVMFactory(android.app.Application, androidx.savedstate.SavedStateRegistryOwner);
+    ctor public SavedStateVMFactory(android.app.Application, androidx.savedstate.SavedStateRegistryOwner, android.os.Bundle?);
     method protected <T extends androidx.lifecycle.ViewModel> T create(String, Class<T!>, androidx.lifecycle.SavedStateHandle);
   }
 
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/api/restricted_1.0.0-alpha02.txt b/lifecycle/lifecycle-viewmodel-savedstate/api/restricted_1.0.0-alpha02.txt
index 0789db9631f..4dfb81fd88b 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/api/restricted_1.0.0-alpha02.txt
+++ b/lifecycle/lifecycle-viewmodel-savedstate/api/restricted_1.0.0-alpha02.txt
@@ -1,7 +1,7 @@
 // Signature format: 3.0
 package androidx.lifecycle {
 
-  public abstract class AbstractSavedStateViewModelFactory implements androidx.lifecycle.ViewModelProvider.Factory {
+  public abstract class AbstractSavedStateVMFactory implements androidx.lifecycle.ViewModelProvider.Factory {
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final <T extends androidx.lifecycle.ViewModel> T create(String, Class<T!>);
   }
 
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/api/restricted_current.txt b/lifecycle/lifecycle-viewmodel-savedstate/api/restricted_current.txt
index 0789db9631f..4dfb81fd88b 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/api/restricted_current.txt
+++ b/lifecycle/lifecycle-viewmodel-savedstate/api/restricted_current.txt
@@ -1,7 +1,7 @@
 // Signature format: 3.0
 package androidx.lifecycle {
 
-  public abstract class AbstractSavedStateViewModelFactory implements androidx.lifecycle.ViewModelProvider.Factory {
+  public abstract class AbstractSavedStateVMFactory implements androidx.lifecycle.ViewModelProvider.Factory {
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final <T extends androidx.lifecycle.ViewModel> T create(String, Class<T!>);
   }
 
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/build.gradle b/lifecycle/lifecycle-viewmodel-savedstate/build.gradle
index f6e2474a4ac..939684e56ca 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/build.gradle
+++ b/lifecycle/lifecycle-viewmodel-savedstate/build.gradle
@@ -59,4 +59,3 @@ androidx {
     description = "Android Lifecycle ViewModel"
     url = AndroidXExtension.ARCHITECTURE_URL
 }
-
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/lint-baseline.xml b/lifecycle/lifecycle-viewmodel-savedstate/lint-baseline.xml
index 99af9c1558d..623ce710317 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/lint-baseline.xml
+++ b/lifecycle/lifecycle-viewmodel-savedstate/lint-baseline.xml
@@ -19,13 +19,24 @@
 
     <issue
         id="LambdaLast"
-        message="Functional interface parameters (such as parameter 1, &quot;owner&quot;, in androidx.lifecycle.AbstractSavedStateViewModelFactory.AbstractSavedStateViewModelFactory) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
+        message="Functional interface parameters (such as parameter 1, &quot;owner&quot;, in androidx.lifecycle.AbstractSavedStateVMFactory.AbstractSavedStateVMFactory) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
         errorLine1="            @Nullable Bundle defaultArgs) {"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/androidx/lifecycle/AbstractSavedStateViewModelFactory.java"
+            file="src/main/java/androidx/lifecycle/AbstractSavedStateVMFactory.java"
             line="51"
             column="13"/>
     </issue>
 
+    <issue
+        id="LambdaLast"
+        message="Functional interface parameters (such as parameter 2, &quot;owner&quot;, in androidx.lifecycle.SavedStateVMFactory.SavedStateVMFactory) should be last to improve Kotlin interoperability; see https://kotlinlang.org/docs/reference/java-interop.html#sam-conversions"
+        errorLine1="            @Nullable Bundle defaultArgs) {"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/lifecycle/SavedStateVMFactory.java"
+            line="117"
+            column="13"/>
+    </issue>
+
 </issues>
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/src/androidTest/java/androidx/lifecycle/viewmodel/savedstate/SavedStateFactoryTest.kt b/lifecycle/lifecycle-viewmodel-savedstate/src/androidTest/java/androidx/lifecycle/viewmodel/savedstate/SavedStateFactoryTest.kt
index 652c298f1cb..92103fbd5fc 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/src/androidTest/java/androidx/lifecycle/viewmodel/savedstate/SavedStateFactoryTest.kt
+++ b/lifecycle/lifecycle-viewmodel-savedstate/src/androidTest/java/androidx/lifecycle/viewmodel/savedstate/SavedStateFactoryTest.kt
@@ -20,7 +20,7 @@ import android.app.Application
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.SavedStateViewModelFactory
+import androidx.lifecycle.SavedStateVMFactory
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelStore
@@ -41,10 +41,9 @@ class SavedStateFactoryTest {
 
     @Test
     fun testCreateAndroidVM() {
-        val savedStateVMFactory = SavedStateViewModelFactory(
+        val savedStateVMFactory = SavedStateVMFactory(
             activityRule.activity.application,
-            activityRule.activity
-        )
+            activityRule.activity)
         val vm = ViewModelProvider(ViewModelStore(), savedStateVMFactory)
         assertThat(vm.get(MyAndroidViewModel::class.java).handle).isNotNull()
         assertThat(vm.get(MyViewModel::class.java).handle).isNotNull()
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/src/androidTest/java/androidx/lifecycle/viewmodel/savedstate/ViewModelsWithStateTests.java b/lifecycle/lifecycle-viewmodel-savedstate/src/androidTest/java/androidx/lifecycle/viewmodel/savedstate/ViewModelsWithStateTests.java
index 1731404b8f7..1fe67d89d63 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/src/androidTest/java/androidx/lifecycle/viewmodel/savedstate/ViewModelsWithStateTests.java
+++ b/lifecycle/lifecycle-viewmodel-savedstate/src/androidTest/java/androidx/lifecycle/viewmodel/savedstate/ViewModelsWithStateTests.java
@@ -27,7 +27,7 @@ import android.os.Bundle;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.SavedStateHandle;
-import androidx.lifecycle.SavedStateViewModelFactory;
+import androidx.lifecycle.SavedStateVMFactory;
 import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.viewmodel.savedstate.activity.FakingSavedStateActivity;
@@ -143,11 +143,11 @@ public class ViewModelsWithStateTests {
     private ViewModelProvider vmProvider(FakingSavedStateActivity activity) {
         if (FRAGMENT_MODE.equals(mode)) {
             Fragment fragment = activity.getFragment();
-            return new ViewModelProvider(fragment, new SavedStateViewModelFactory(
+            return new ViewModelProvider(fragment, new SavedStateVMFactory(
                     fragment.requireActivity().getApplication(),
                     fragment));
         }
-        return new ViewModelProvider(activity, new SavedStateViewModelFactory(
+        return new ViewModelProvider(activity, new SavedStateVMFactory(
                 activity.getApplication(),
                 activity));
     }
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/src/main/java/androidx/lifecycle/AbstractSavedStateViewModelFactory.java b/lifecycle/lifecycle-viewmodel-savedstate/src/main/java/androidx/lifecycle/AbstractSavedStateVMFactory.java
index a9b7bd53f3f..fdb630bfacb 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/src/main/java/androidx/lifecycle/AbstractSavedStateViewModelFactory.java
+++ b/lifecycle/lifecycle-viewmodel-savedstate/src/main/java/androidx/lifecycle/AbstractSavedStateVMFactory.java
@@ -26,11 +26,11 @@ import androidx.savedstate.SavedStateRegistryOwner;
 
 /**
  * Skeleton of androidx.lifecycle.ViewModelProvider.KeyedFactory
- * that creates {@link SavedStateHandle} for every requested {@link androidx.lifecycle.ViewModel}.
- * The subclasses implement {@link #create(String, Class, SavedStateHandle)} to actually instantiate
+ * that creates {@link SavedStateHandle} for every requested {@link androidx.lifecycle.ViewModel}. The subclasses
+ * implement {@link #create(String, Class, SavedStateHandle)} to actually instantiate
  * {@code androidx.lifecycle.ViewModel}s.
  */
-public abstract class AbstractSavedStateViewModelFactory extends ViewModelProvider.KeyedFactory {
+public abstract class AbstractSavedStateVMFactory extends ViewModelProvider.KeyedFactory {
     static final String TAG_SAVED_STATE_HANDLE_CONTROLLER = "androidx.lifecycle.savedstate.vm.tag";
 
     private final SavedStateRegistry mSavedStateRegistry;
@@ -47,7 +47,7 @@ public abstract class AbstractSavedStateViewModelFactory extends ViewModelProvid
      *                    if there is no previously saved state
      *                    or previously saved state misses a value by such key
      */
-    public AbstractSavedStateViewModelFactory(@NonNull SavedStateRegistryOwner owner,
+    public AbstractSavedStateVMFactory(@NonNull SavedStateRegistryOwner owner,
             @Nullable Bundle defaultArgs) {
         mSavedStateRegistry = owner.getSavedStateRegistry();
         mLifecycle = owner.getLifecycle();
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/src/main/java/androidx/lifecycle/SavedStateHandle.java b/lifecycle/lifecycle-viewmodel-savedstate/src/main/java/androidx/lifecycle/SavedStateHandle.java
index 07b60b3c500..a0bb8ed7ccd 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/src/main/java/androidx/lifecycle/SavedStateHandle.java
+++ b/lifecycle/lifecycle-viewmodel-savedstate/src/main/java/androidx/lifecycle/SavedStateHandle.java
@@ -39,7 +39,7 @@ import java.util.Set;
 
 /**
  * A handle to saved state passed down to {@link androidx.lifecycle.ViewModel}. You should use
- * {@link SavedStateViewModelFactory} if you want to receive this object in {@code ViewModel}'s
+ * {@link SavedStateVMFactory} if you want to receive this object in {@code ViewModel}'s
  * constructor.
  * <p>
  * This is a key-value map that will let you write and retrieve objects to and from the saved state.
diff --git a/lifecycle/lifecycle-viewmodel-savedstate/src/main/java/androidx/lifecycle/SavedStateViewModelFactory.java b/lifecycle/lifecycle-viewmodel-savedstate/src/main/java/androidx/lifecycle/SavedStateVMFactory.java
index 9a89a3f8295..f957f0094fb 100644
--- a/lifecycle/lifecycle-viewmodel-savedstate/src/main/java/androidx/lifecycle/SavedStateViewModelFactory.java
+++ b/lifecycle/lifecycle-viewmodel-savedstate/src/main/java/androidx/lifecycle/SavedStateVMFactory.java
@@ -29,52 +29,49 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 
 /**
- * {@link androidx.lifecycle.ViewModelProvider.Factory} that can create ViewModels accessing and
- * contributing to a saved state via {@link SavedStateHandle} received in a constructor. If
- * {@code defaultArgs} bundle was passed into the constructor, it will provide default values in
+ * {@link androidx.lifecycle.ViewModelProvider.Factory} that can create ViewModels accessing and contributing
+ * to a saved state via {@link SavedStateHandle} received in a constructor. If {@code defaultArgs}
+ * bundle was passed into the constructor, it will provide default values in
  * {@code SavedStateHandle}.
  * <p>
- * If ViewModel is instance of {@link androidx.lifecycle.AndroidViewModel}, it looks for a
- * constructor that receives an {@link Application} and {@link SavedStateHandle} (in this order),
- * otherwise it looks for a constructor that receives {@link SavedStateHandle} only.
+ * If ViewModel is instance of {@link androidx.lifecycle.AndroidViewModel}, it looks for a constructor that
+ * receives an {@link Application} and {@link SavedStateHandle} (in this order), otherwise
+ * it looks for a constructor that receives {@link SavedStateHandle} only.
  */
-public final class SavedStateViewModelFactory extends AbstractSavedStateViewModelFactory {
+public final class SavedStateVMFactory extends AbstractSavedStateVMFactory {
     private final Application mApplication;
     private final ViewModelProvider.AndroidViewModelFactory mFactory;
 
     /**
-     * Creates {@link SavedStateViewModelFactory}.
+     * Creates {@link SavedStateVMFactory}.
      * <p>
-     * {@link androidx.lifecycle.ViewModel} created with this factory can access to saved state
-     * scoped to the given {@code activity}.
+     * {@link androidx.lifecycle.ViewModel} created with this factory can access to saved state scoped to
+     * the given {@code activity}.
      *
      * @param application an application
-     * @param owner       {@link SavedStateRegistryOwner} that will provide restored state for
-     *                                                   created
-     *                    {@link androidx.lifecycle.ViewModel ViewModels}
+     * @param owner {@link SavedStateRegistryOwner} that will provide restored state for created
+     * {@link androidx.lifecycle.ViewModel ViewModels}
      */
-    public SavedStateViewModelFactory(@NonNull Application application,
+    public SavedStateVMFactory(@NonNull Application application,
             @NonNull SavedStateRegistryOwner owner) {
         this(application, owner, null);
     }
 
     /**
-     * Creates {@link SavedStateViewModelFactory}.
+     * Creates {@link SavedStateVMFactory}.
      * <p>
-     * {@link androidx.lifecycle.ViewModel} created with this factory can access to saved state
-     * scoped to the given {@code activity}.
+     * {@link androidx.lifecycle.ViewModel} created with this factory can access to saved state scoped to
+     * the given {@code activity}.
      *
      * @param application an application
-     * @param owner       {@link SavedStateRegistryOwner} that will provide restored state for
-     *                                                   created
-     *                    {@link androidx.lifecycle.ViewModel ViewModels}
+     * @param owner {@link SavedStateRegistryOwner} that will provide restored state for created
+     * {@link androidx.lifecycle.ViewModel ViewModels}
      * @param defaultArgs values from this {@code Bundle} will be used as defaults by
-     *                    {@link SavedStateHandle} if there is no previously saved state or
-     *                    previously saved state
-     *                    misses a value by such key.
+     * {@link SavedStateHandle} if there is no previously saved state or previously saved state
+     * misses a value by such key.
      */
     @SuppressLint("LambdaLast")
-    public SavedStateViewModelFactory(@NonNull Application application,
+    public SavedStateVMFactory(@NonNull Application application,
             @NonNull SavedStateRegistryOwner owner,
             @Nullable Bundle defaultArgs) {
         super(owner, defaultArgs);