Merge pull request android#171 from android/fix_lint

Fix the CI failure
NaveenMac · Aug 18, 2020 · e0c3eb0 · e0c3eb0
2 parents 6169ad1 + aa205b7
commit e0c3eb0
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/ConstraintLayoutExamples/motionlayout/build.gradle b/ConstraintLayoutExamples/motionlayout/build.gradle
@@ -29,6 +29,7 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         release {

diff --git a/...ayout/src/main/java/com/google/androidstudio/motionlayoutexample/utils/BoundsImageView.kt b/...ayout/src/main/java/com/google/androidstudio/motionlayoutexample/utils/BoundsImageView.kt
@@ -20,11 +20,11 @@ import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.util.AttributeSet
-import android.widget.ImageView
+import androidx.appcompat.widget.AppCompatImageView
 
 class BoundsImageView @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
-) : ImageView(context, attrs, defStyleAttr) {
+) : AppCompatImageView(context, attrs, defStyleAttr) {
 
     private var paint = Paint()
 

diff --git a/ConstraintLayoutExamples/motionlayout/src/main/res/layout/motion_18_coordination.xml b/ConstraintLayoutExamples/motionlayout/src/main/res/layout/motion_18_coordination.xml
@@ -26,6 +26,6 @@
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_add_a_photo_24dp"/>
+        app:srcCompat="@drawable/ic_add_a_photo_24dp"/>
 
 </androidx.constraintlayout.motion.widget.MotionLayout>
diff --git a/ConstraintLayoutExamples/motionlayout/src/main/res/layout/motion_19_coordination.xml b/ConstraintLayoutExamples/motionlayout/src/main/res/layout/motion_19_coordination.xml
@@ -28,6 +28,6 @@
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_add_a_photo_24dp"/>
+        app:srcCompat="@drawable/ic_add_a_photo_24dp"/>
 
 </androidx.constraintlayout.motion.widget.MotionLayout>
diff --git a/ConstraintLayoutExamples/motionlayout/src/main/res/layout/motion_24_youtube.xml b/ConstraintLayoutExamples/motionlayout/src/main/res/layout/motion_24_youtube.xml
@@ -39,7 +39,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:scaleType="centerCrop"
-        android:src="@drawable/cat_1"
+        app:srcCompat="@drawable/cat_1"
         app:layout_constraintTop_toTopOf="@id/top_image_container"
         app:layout_constraintBottom_toBottomOf="@id/top_image_container"
         app:layout_constraintStart_toStartOf="@id/top_image_container"
@@ -51,8 +51,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
-        android:src="@drawable/ic_play_arrow_gray_32dp"
         android:alpha="0"
+        app:srcCompat="@drawable/ic_play_arrow_gray_32dp"
         app:layout_constraintEnd_toStartOf="@id/image_clear"
         app:layout_constraintTop_toTopOf="@id/top_image_container"
         app:layout_constraintBottom_toBottomOf="@id/top_image_container"
@@ -63,8 +63,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
-        android:src="@drawable/ic_clear_gray_32dp"
         android:alpha="0"
+        app:srcCompat="@drawable/ic_clear_gray_32dp"
         app:layout_constraintEnd_toEndOf="@id/top_image_container"
         app:layout_constraintBottom_toBottomOf="@id/top_image_container"
         app:layout_constraintTop_toTopOf="@id/top_image_container"

diff --git a/ConstraintLayoutExamples/motionlayout/src/main/res/layout/motion_25_keytrigger.xml b/ConstraintLayoutExamples/motionlayout/src/main/res/layout/motion_25_keytrigger.xml
@@ -29,7 +29,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
-        android:src="@drawable/ic_add_a_photo_24dp"
+        app:srcCompat="@drawable/ic_add_a_photo_24dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         />

diff --git a/ConstraintLayoutExamples/motionlayout/src/main/res/layout/motion_26_multistate.xml b/ConstraintLayoutExamples/motionlayout/src/main/res/layout/motion_26_multistate.xml
@@ -25,7 +25,7 @@
         android:id="@+id/arrow_right"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_keyboard_arrow_right"
+        app:srcCompat="@drawable/ic_keyboard_arrow_right"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -35,7 +35,7 @@
         android:id="@+id/arrow_up"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_keyboard_arrow_up"
+        app:srcCompat="@drawable/ic_keyboard_arrow_up"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"

diff --git a/...integrations/src/main/java/com/example/androidstudio/motionlayoutintegrations/Entrance.kt b/...integrations/src/main/java/com/example/androidstudio/motionlayoutintegrations/Entrance.kt
@@ -20,9 +20,9 @@ class Entrance : AppCompatActivity() {
         }
     }
 
-    override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
+    override fun onRestoreInstanceState(savedInstanceState: Bundle) {
         super.onRestoreInstanceState(savedInstanceState)
-        val motionLayoutState = savedInstanceState?.getBundle(SIS_MOTION_LAYOUT_STATE)
+        val motionLayoutState = savedInstanceState.getBundle(SIS_MOTION_LAYOUT_STATE)
         motionLayoutState?.let {
             binding.motionLayout.transitionState = motionLayoutState
         }