diff --git a/ActivitySceneTransitionBasic/README.md b/ActivitySceneTransitionBasic/README.md
index 1dde3cf4..511a8e2a 100644
--- a/ActivitySceneTransitionBasic/README.md
+++ b/ActivitySceneTransitionBasic/README.md
@@ -26,8 +26,7 @@ Pre-requisites
 Screenshots
 -------------
 
-<img src="screenshots/1-main.png" height="400" alt="Screenshot"/> <img src="screenshots/2-transition.png" height="400" alt="Screenshot"/> <img src="screenshots/3-transition.png" height="400" alt="Screenshot"/> <img src="screenshots/4-detail.png" height="400" alt="Screenshot"/> 
-
+<img src="screenshots/capture.gif" height="400" alt="Screenshot"/>
 Getting Started
 ---------------
 
diff --git a/ActivitySceneTransitionBasic/app/build.gradle b/ActivitySceneTransitionBasic/app/build.gradle
index 8cfa3931..9ac262f5 100644
--- a/ActivitySceneTransitionBasic/app/build.gradle
+++ b/ActivitySceneTransitionBasic/app/build.gradle
@@ -17,23 +17,23 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     defaultConfig {
         applicationId 'com.example.android.activityscenetransitionbasic'
-        minSdkVersion 14
-        targetSdkVersion 29
+        minSdkVersion 26
+        targetSdkVersion 30
         versionCode 1
         versionName '1.0'
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.squareup.picasso:picasso:2.4.0'
 }
diff --git a/ActivitySceneTransitionBasic/app/src/main/AndroidManifest.xml b/ActivitySceneTransitionBasic/app/src/main/AndroidManifest.xml
index e0eba3fb..443d57de 100644
--- a/ActivitySceneTransitionBasic/app/src/main/AndroidManifest.xml
+++ b/ActivitySceneTransitionBasic/app/src/main/AndroidManifest.xml
@@ -28,14 +28,15 @@
 
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".DetailActivity" />
+        <activity android:name=".DetailActivity" android:exported="false" />
 
     </application>
 
diff --git a/ActivitySceneTransitionBasic/app/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java b/ActivitySceneTransitionBasic/app/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java
index b2874d8c..f6480f5a 100644
--- a/ActivitySceneTransitionBasic/app/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java
+++ b/ActivitySceneTransitionBasic/app/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java
@@ -61,6 +61,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // BEGIN_INCLUDE(detail_set_view_name)
         /*
+         * ここでセットするViewは、遷移元のactivityOptionsで設定したViewとペアであること.
          * Set the name of the view's which will be transition to, using the static values above.
          * This could be done in the layout XML, but exposing it via static variables allows easy
          * querying from other Activities
@@ -109,6 +110,7 @@ private void loadFullSizeImage() {
     }
 
     /**
+     * 遷移アニメーション終了後、イメージをロードする.
      * Try and add a {@link Transition.TransitionListener} to the entering shared element
      * {@link Transition}. We do this so that we can load the full-size image after the transition
      * has completed.
diff --git a/ActivitySceneTransitionBasic/app/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java b/ActivitySceneTransitionBasic/app/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java
index d31f107d..be174f95 100644
--- a/ActivitySceneTransitionBasic/app/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java
+++ b/ActivitySceneTransitionBasic/app/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java
@@ -77,6 +77,8 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
             ActivityOptionsCompat activityOptions = ActivityOptionsCompat.makeSceneTransitionAnimation(
                     MainActivity.this,
 
+                    // ここで、起動されたアクティビティで、移行元のビューと移行先のビューの名前を含むペアアイテムのリストを提供する
+                    // アニメーション適用される対象のView要素を設定.
                     // Now we provide a list of Pair items which contain the view we can transitioning
                     // from, and the name of the view it is transitioning to, in the launched activity
                     new Pair<>(view.findViewById(R.id.imageview_item),
diff --git a/ActivitySceneTransitionBasic/app/src/main/java/com/example/android/activityscenetransitionbasic/SquareFrameLayout.java b/ActivitySceneTransitionBasic/app/src/main/java/com/example/android/activityscenetransitionbasic/SquareFrameLayout.java
index a5cccd34..f3f71e49 100644
--- a/ActivitySceneTransitionBasic/app/src/main/java/com/example/android/activityscenetransitionbasic/SquareFrameLayout.java
+++ b/ActivitySceneTransitionBasic/app/src/main/java/com/example/android/activityscenetransitionbasic/SquareFrameLayout.java
@@ -22,6 +22,7 @@
 
 /**
  * {@link android.widget.FrameLayout} which forces itself to be laid out as square.
+ * 正方形レイアウトとして配置することを強制するカスタムクラス.
  */
 public class SquareFrameLayout extends FrameLayout {
 
diff --git a/ActivitySceneTransitionBasic/app/src/main/res/layout/details.xml b/ActivitySceneTransitionBasic/app/src/main/res/layout/details.xml
index f387f7e8..411843a2 100644
--- a/ActivitySceneTransitionBasic/app/src/main/res/layout/details.xml
+++ b/ActivitySceneTransitionBasic/app/src/main/res/layout/details.xml
@@ -32,7 +32,8 @@
                 android:id="@+id/imageview_header"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:scaleType="centerCrop" />
+                android:scaleType="centerCrop"
+                android:contentDescription="header image" />
 
         </com.example.android.activityscenetransitionbasic.SquareFrameLayout>
 
diff --git a/ActivitySceneTransitionBasic/app/src/main/res/layout/grid.xml b/ActivitySceneTransitionBasic/app/src/main/res/layout/grid.xml
index 4dded953..ef7e4968 100644
--- a/ActivitySceneTransitionBasic/app/src/main/res/layout/grid.xml
+++ b/ActivitySceneTransitionBasic/app/src/main/res/layout/grid.xml
@@ -21,7 +21,7 @@
     android:clipToPadding="false"
     android:columnWidth="120dp"
     android:drawSelectorOnTop="true"
-    android:horizontalSpacing="@dimen/grid_spacing"
+    android:horizontalSpacing="4dp"
     android:numColumns="auto_fit"
-    android:padding="@dimen/grid_spacing"
-    android:verticalSpacing="@dimen/grid_spacing" />
+    android:padding="4dp"
+    android:verticalSpacing="4dp" />
diff --git a/ActivitySceneTransitionBasic/app/src/main/res/transition/grid_detail_transition.xml b/ActivitySceneTransitionBasic/app/src/main/res/transition/grid_detail_transition.xml
index 3091cd26..9749ab75 100644
--- a/ActivitySceneTransitionBasic/app/src/main/res/transition/grid_detail_transition.xml
+++ b/ActivitySceneTransitionBasic/app/src/main/res/transition/grid_detail_transition.xml
@@ -21,9 +21,11 @@
 <transitionSet xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- changeBounds is used for the TextViews which are shared -->
+    <!-- 共有されるTextViewに使用される. -->
     <changeBounds />
 
     <!-- changeImageTransform is used for the ImageViews which are shared -->
+    <!-- 共有されるImageViewに使用される. -->
     <changeImageTransform />
 
 </transitionSet>
diff --git a/ActivitySceneTransitionBasic/app/src/main/res/values/colors.xml b/ActivitySceneTransitionBasic/app/src/main/res/values/colors.xml
deleted file mode 100644
index 8b6ec3f8..00000000
--- a/ActivitySceneTransitionBasic/app/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources>
-
-
-</resources>
diff --git a/ActivitySceneTransitionBasic/app/src/main/res/values/dimens.xml b/ActivitySceneTransitionBasic/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 6db3dfb2..00000000
--- a/ActivitySceneTransitionBasic/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-
-    <dimen name="grid_spacing">4dp</dimen>
-
-    <!-- Define standard dimensions to comply with Holo-style grids and rhythm. -->
-
-    <dimen name="margin_tiny">4dp</dimen>
-    <dimen name="margin_small">8dp</dimen>
-    <dimen name="margin_medium">16dp</dimen>
-    <dimen name="margin_large">32dp</dimen>
-    <dimen name="margin_huge">64dp</dimen>
-
-    <!-- Semantic definitions -->
-
-    <dimen name="horizontal_page_margin">@dimen/margin_medium</dimen>
-    <dimen name="vertical_page_margin">@dimen/margin_medium</dimen>
-
-</resources>
diff --git a/ActivitySceneTransitionBasic/app/src/main/res/values/styles.xml b/ActivitySceneTransitionBasic/app/src/main/res/values/styles.xml
index dbcf304c..5e4bd67a 100644
--- a/ActivitySceneTransitionBasic/app/src/main/res/values/styles.xml
+++ b/ActivitySceneTransitionBasic/app/src/main/res/values/styles.xml
@@ -18,6 +18,7 @@
 
     <!-- Activity theme -->
     <style name="AppTheme" parent="Theme.AppCompat.Light">
+        <!-- 遷移アニメーションのスタイル アイテム定義: 共有要素のEnter/Exitアニメーションを設定 -->
         <!-- Set the transitions which are used for the entrance and exit of shared elements -->
         <item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">
             @transition/grid_detail_transition
diff --git a/ActivitySceneTransitionBasic/build.gradle b/ActivitySceneTransitionBasic/build.gradle
index 1d51dc78..6b1d2e5a 100644
--- a/ActivitySceneTransitionBasic/build.gradle
+++ b/ActivitySceneTransitionBasic/build.gradle
@@ -21,7 +21,11 @@ buildscript {
     }
 
     dependencies {
+<<<<<<< HEAD
+        classpath 'com.android.tools.build:gradle:7.0.1'
+=======
         classpath 'com.android.tools.build:gradle:4.2.2'
+>>>>>>> remotes/upstream/main
     }
 }
 
diff --git a/ActivitySceneTransitionBasic/gradle/wrapper/gradle-wrapper.properties b/ActivitySceneTransitionBasic/gradle/wrapper/gradle-wrapper.properties
index 024cca5f..78acd819 100644
--- a/ActivitySceneTransitionBasic/gradle/wrapper/gradle-wrapper.properties
+++ b/ActivitySceneTransitionBasic/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,8 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+<<<<<<< HEAD
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+=======
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+>>>>>>> remotes/upstream/main
diff --git a/ActivitySceneTransitionBasic/screenshots/capture.gif b/ActivitySceneTransitionBasic/screenshots/capture.gif
new file mode 100644
index 00000000..7eb3ade7
Binary files /dev/null and b/ActivitySceneTransitionBasic/screenshots/capture.gif differ
diff --git a/BasicTransition/Application/build.gradle b/BasicTransition/Application/build.gradle
index 7e1c0807..b52bc958 100644
--- a/BasicTransition/Application/build.gradle
+++ b/BasicTransition/Application/build.gradle
@@ -6,7 +6,11 @@ buildscript {
     }
 
     dependencies {
+<<<<<<< HEAD
+        classpath 'com.android.tools.build:gradle:7.0.1'
+=======
         classpath 'com.android.tools.build:gradle:4.2.2'
+>>>>>>> remotes/upstream/main
     }
 }
 
@@ -20,10 +24,12 @@ repositories {
 dependencies {
 
 
-        implementation "com.android.support:support-v4:28.0.0"
-        implementation "com.android.support:support-v13:28.0.0"
-        implementation "com.android.support:cardview-v7:28.0.0"
-        implementation "com.android.support:appcompat-v7:28.0.0"
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation "androidx.cardview:cardview:1.0.0"
+//        implementation "com.android.support:support-v4:28.0.0"
+//        implementation "com.android.support:support-v13:28.0.0"
+        // implementation "com.android.support:cardview-v7:28.0.0"
+//        implementation "com.android.support:appcompat-v7:28.0.0"
 
 
 
@@ -41,16 +47,16 @@ List<String> dirs = [
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 28
+        minSdkVersion 26
+        targetSdkVersion 30
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     sourceSets {
diff --git a/BasicTransition/Application/src/main/AndroidManifest.xml b/BasicTransition/Application/src/main/AndroidManifest.xml
index 435f5e0c..a6c2485e 100644
--- a/BasicTransition/Application/src/main/AndroidManifest.xml
+++ b/BasicTransition/Application/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
  Copyright 2014 The Android Open Source Project
 
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,10 +24,11 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name" >
+            android:exported="true"
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/BasicTransition/Application/src/main/java/com/example/android/basictransition/BasicTransitionFragment.java b/BasicTransition/Application/src/main/java/com/example/android/basictransition/BasicTransitionFragment.java
index e67603dc..ba4c7d2a 100644
--- a/BasicTransition/Application/src/main/java/com/example/android/basictransition/BasicTransitionFragment.java
+++ b/BasicTransition/Application/src/main/java/com/example/android/basictransition/BasicTransitionFragment.java
@@ -17,7 +17,6 @@
 package com.example.android.basictransition;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.transition.Scene;
 import android.transition.TransitionInflater;
 import android.transition.TransitionManager;
@@ -26,6 +25,9 @@
 import android.view.ViewGroup;
 import android.widget.RadioGroup;
 
+import androidx.fragment.app.Fragment;
+
+// TransitionManager / Sceneを使ったサンプル
 public class BasicTransitionFragment extends Fragment
         implements RadioGroup.OnCheckedChangeListener {
 
diff --git a/BasicTransition/Application/src/main/java/com/example/android/basictransition/MainActivity.java b/BasicTransition/Application/src/main/java/com/example/android/basictransition/MainActivity.java
index 79454181..818bac74 100644
--- a/BasicTransition/Application/src/main/java/com/example/android/basictransition/MainActivity.java
+++ b/BasicTransition/Application/src/main/java/com/example/android/basictransition/MainActivity.java
@@ -18,12 +18,13 @@
 package com.example.android.basictransition;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ViewAnimator;
 
-import com.example.android.common.activities.SampleActivityBase;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentTransaction;
+
 import com.example.android.common.logger.Log;
 import com.example.android.common.logger.LogFragment;
 import com.example.android.common.logger.LogWrapper;
@@ -31,12 +32,12 @@
 
 /**
  * A simple launcher activity containing a summary sample description, sample log and a custom
- * {@link android.support.v4.app.Fragment} which can display a view.
+ * {@link androidx.fragment.app.Fragment} which can display a view.
  * <p>
  * For devices with displays with a width of 720dp or greater, the sample log is always visible,
  * on other devices it's visibility is controlled by an item on the Action Bar.
  */
-public class MainActivity extends SampleActivityBase {
+public class MainActivity extends FragmentActivity {
 
     public static final String TAG = "MainActivity";
 
@@ -56,6 +57,12 @@ protected void onCreate(Bundle savedInstanceState) {
         }
     }
 
+    @Override
+    protected  void onStart() {
+        super.onStart();
+        initializeLogging();
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.main, menu);
@@ -89,8 +96,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     /** Create a chain of targets that will receive log data */
-    @Override
-    public void initializeLogging() {
+    private void initializeLogging() {
         // Wraps Android's native log framework.
         LogWrapper logWrapper = new LogWrapper();
         // Using Log, front-end to the logging chain, emulates android.util.log method signatures.
diff --git a/BasicTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/BasicTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
deleted file mode 100644
index 3228927b..00000000
--- a/BasicTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-* Copyright 2013 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package com.example.android.common.activities;
-
-import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-
-import com.example.android.common.logger.Log;
-import com.example.android.common.logger.LogWrapper;
-
-/**
- * Base launcher activity, to handle most of the common plumbing for samples.
- */
-public class SampleActivityBase extends FragmentActivity {
-
-    public static final String TAG = "SampleActivityBase";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    protected  void onStart() {
-        super.onStart();
-        initializeLogging();
-    }
-
-    /** Set up targets to receive log data */
-    public void initializeLogging() {
-        // Using Log, front-end to the logging chain, emulates android.util.log method signatures.
-        // Wraps Android's native log framework
-        LogWrapper logWrapper = new LogWrapper();
-        Log.setLogNode(logWrapper);
-
-        Log.i(TAG, "Ready");
-    }
-}
diff --git a/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
index b302acd4..5695d9f7 100644
--- a/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
+++ b/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
@@ -33,7 +33,6 @@
 
 import android.graphics.Typeface;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.Gravity;
@@ -42,6 +41,8 @@
 import android.view.ViewGroup;
 import android.widget.ScrollView;
 
+import androidx.fragment.app.Fragment;
+
 /**
  * Simple fraggment which contains a LogView and uses is to output log data it receives
  * through the LogNode interface.
diff --git a/BasicTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java b/BasicTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
index 20049e33..8f6836ad 100644
--- a/BasicTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
+++ b/BasicTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
@@ -19,8 +19,6 @@
 import android.content.Context;
 import android.graphics.Typeface;
 import android.os.Build;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.Gravity;
@@ -29,12 +27,15 @@
 import android.widget.HorizontalScrollView;
 import android.widget.TextView;
 
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
 /**
  * To be used with ViewPager to provide a tab indicator component which give constant feedback as to
  * the user's scroll progress.
  * <p>
  * To use the component, simply add it to your view hierarchy. Then in your
- * {@link android.app.Activity} or {@link android.support.v4.app.Fragment} call
+ * {@link android.app.Activity} or {@link androidx.fragment.app.Fragment} call
  * {@link #setViewPager(ViewPager)} providing it the ViewPager this layout is being used for.
  * <p>
  * The colors can be customized in two ways. The first and simplest is to provide an array of colors
diff --git a/BasicTransition/Application/src/main/res/layout/activity_basic_transition.xml b/BasicTransition/Application/src/main/res/layout/activity_basic_transition.xml
deleted file mode 100644
index f9a4cd28..00000000
--- a/BasicTransition/Application/src/main/res/layout/activity_basic_transition.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.example.android.basictransition.BasicTransitionActivity"/>
diff --git a/BasicTransition/README.md b/BasicTransition/README.md
index ee246298..6db71ded 100644
--- a/BasicTransition/README.md
+++ b/BasicTransition/README.md
@@ -40,7 +40,7 @@ Pre-requisites
 Screenshots
 -------------
 
-<img src="screenshots/main.png" height="400" alt="Screenshot"/> 
+<img src="screenshots/capture.gif" height="400" alt="Screenshot"/> 
 
 Getting Started
 ---------------
diff --git a/BasicTransition/gradle.properties b/BasicTransition/gradle.properties
index 0bc4294e..59169ec5 100644
--- a/BasicTransition/gradle.properties
+++ b/BasicTransition/gradle.properties
@@ -18,3 +18,5 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/BasicTransition/gradle/wrapper/gradle-wrapper.properties b/BasicTransition/gradle/wrapper/gradle-wrapper.properties
index 1f3fdbc5..6f9483c3 100644
--- a/BasicTransition/gradle/wrapper/gradle-wrapper.properties
+++ b/BasicTransition/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+<<<<<<< HEAD
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+=======
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+>>>>>>> remotes/upstream/main
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/BasicTransition/screenshots/capture.gif b/BasicTransition/screenshots/capture.gif
new file mode 100644
index 00000000..2e676abc
Binary files /dev/null and b/BasicTransition/screenshots/capture.gif differ
diff --git a/CustomTransition/Application/build.gradle b/CustomTransition/Application/build.gradle
index 7e1c0807..908c9ae5 100644
--- a/CustomTransition/Application/build.gradle
+++ b/CustomTransition/Application/build.gradle
@@ -6,7 +6,11 @@ buildscript {
     }
 
     dependencies {
+<<<<<<< HEAD
+        classpath 'com.android.tools.build:gradle:7.0.1'
+=======
         classpath 'com.android.tools.build:gradle:4.2.2'
+>>>>>>> remotes/upstream/main
     }
 }
 
@@ -18,18 +22,12 @@ repositories {
 }
 
 dependencies {
-
-
-        implementation "com.android.support:support-v4:28.0.0"
-        implementation "com.android.support:support-v13:28.0.0"
-        implementation "com.android.support:cardview-v7:28.0.0"
-        implementation "com.android.support:appcompat-v7:28.0.0"
-
-
-
-
-
-
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation "androidx.cardview:cardview:1.0.0"
+//        implementation "com.android.support:support-v4:28.0.0"
+//        implementation "com.android.support:support-v13:28.0.0"
+//        implementation "com.android.support:cardview-v7:28.0.0"
+//        implementation "com.android.support:appcompat-v7:28.0.0"
 }
 
 // The sample build uses multiple directories to
@@ -41,16 +39,16 @@ List<String> dirs = [
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 28
+        minSdkVersion 26
+        targetSdkVersion 30
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     sourceSets {
diff --git a/CustomTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/CustomTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
index 3228927b..d1974d70 100644
--- a/CustomTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
+++ b/CustomTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
@@ -17,7 +17,8 @@
 package com.example.android.common.activities;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+
+import androidx.fragment.app.FragmentActivity;
 
 import com.example.android.common.logger.Log;
 import com.example.android.common.logger.LogWrapper;
diff --git a/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
index b302acd4..5695d9f7 100644
--- a/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
+++ b/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
@@ -33,7 +33,6 @@
 
 import android.graphics.Typeface;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.Gravity;
@@ -42,6 +41,8 @@
 import android.view.ViewGroup;
 import android.widget.ScrollView;
 
+import androidx.fragment.app.Fragment;
+
 /**
  * Simple fraggment which contains a LogView and uses is to output log data it receives
  * through the LogNode interface.
diff --git a/CustomTransition/Application/src/main/java/com/example/android/customtransition/ChangeColor.java b/CustomTransition/Application/src/main/java/com/example/android/customtransition/ChangeColor.java
index d36cfb40..d4bf8f81 100644
--- a/CustomTransition/Application/src/main/java/com/example/android/customtransition/ChangeColor.java
+++ b/CustomTransition/Application/src/main/java/com/example/android/customtransition/ChangeColor.java
@@ -31,12 +31,19 @@
 import android.view.ViewGroup;
 import android.view.ViewPropertyAnimator;
 
+import com.example.android.common.logger.Log;
+
+// Transitionをカスタマイズ.
+// ValueAnimator / ArgbEvaluatorを使ったカラーの変更アニメーション処理を行う.
 public class ChangeColor extends Transition {
 
-    /** Key to store a color value in TransitionValues object */
+    /**
+     * Key to store a color value in TransitionValues object
+     */
     private static final String PROPNAME_BACKGROUND = "customtransition:change_color:background";
 
     // BEGIN_INCLUDE (capture_values)
+
     /**
      * Convenience method: Add the background Drawable property value
      * to the TransitionsValues.value Map for a target.
@@ -48,17 +55,26 @@ private void captureValues(TransitionValues values) {
 
     @Override
     public void captureStartValues(TransitionValues transitionValues) {
+        Log.d("ando", "captureStartValues");
         captureValues(transitionValues);
     }
 
     // Capture the value of the background drawable property for a target in the ending Scene.
     @Override
     public void captureEndValues(TransitionValues transitionValues) {
+        Log.d("ando", "captureEndValues");
         captureValues(transitionValues);
     }
     // END_INCLUDE (capture_values)
 
     // BEGIN_INCLUDE (create_animator)
+
+    /**
+     * 開始シーンと終了シーンの両方にあるターゲットごとにアニメーションを作成します。 それぞれについて
+     * ターゲットのペア、background propertyが（グラフィックではなく）色の場合、
+     * 開始との間を補間するArgbEvaluatorに基づいてValueAnimatorを作成します
+     * 終了色。 また、それぞれのビューの背景色を設定する更新リスナーを作成します
+     */
     // Create an animation for each target that is in both the starting and ending Scene. For each
     // pair of targets, if their background property value is a color (rather than a graphic),
     // create a ValueAnimator based on an ArgbEvaluator that interpolates between the starting and
@@ -67,6 +83,7 @@ public void captureEndValues(TransitionValues transitionValues) {
     @Override
     public Animator createAnimator(ViewGroup sceneRoot,
                                    TransitionValues startValues, TransitionValues endValues) {
+        Log.d("ando", "createAnimator");
         // This transition can only be applied to views that are on both starting and ending scenes.
         if (null == startValues || null == endValues) {
             return null;
@@ -86,6 +103,7 @@ public Animator createAnimator(ViewGroup sceneRoot,
             // If the background color for the target in the starting and ending layouts is
             // different, create an animation.
             if (startColor.getColor() != endColor.getColor()) {
+                // 開始レイアウトから終了レイアウトに変更します。アニメーションはUIスレッドで実行されます。
                 // Create a new Animator object to apply to the targets as the transitions framework
                 // changes from the starting to the ending layout. Use the class ValueAnimator,
                 // which provides a timing pulse to change property values provided to it. The
diff --git a/CustomTransition/Application/src/main/java/com/example/android/customtransition/CustomTransitionFragment.java b/CustomTransition/Application/src/main/java/com/example/android/customtransition/CustomTransitionFragment.java
index 8ef695aa..c21e2304 100644
--- a/CustomTransition/Application/src/main/java/com/example/android/customtransition/CustomTransitionFragment.java
+++ b/CustomTransition/Application/src/main/java/com/example/android/customtransition/CustomTransitionFragment.java
@@ -20,7 +20,6 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.transition.Scene;
 import android.transition.Transition;
 import android.transition.TransitionManager;
@@ -29,6 +28,8 @@
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+import androidx.fragment.app.Fragment;
+
 public class CustomTransitionFragment extends Fragment implements View.OnClickListener {
 
     private static final String STATE_CURRENT_SCENE = "current_scene";
diff --git a/CustomTransition/Application/src/main/java/com/example/android/customtransition/MainActivity.java b/CustomTransition/Application/src/main/java/com/example/android/customtransition/MainActivity.java
index 4df98fcf..a65e41ec 100644
--- a/CustomTransition/Application/src/main/java/com/example/android/customtransition/MainActivity.java
+++ b/CustomTransition/Application/src/main/java/com/example/android/customtransition/MainActivity.java
@@ -18,11 +18,12 @@
 package com.example.android.customtransition;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ViewAnimator;
 
+import androidx.fragment.app.FragmentTransaction;
+
 import com.example.android.common.activities.SampleActivityBase;
 import com.example.android.common.logger.Log;
 import com.example.android.common.logger.LogFragment;
diff --git a/CustomTransition/README.md b/CustomTransition/README.md
index 6df4696b..1ab49d74 100644
--- a/CustomTransition/README.md
+++ b/CustomTransition/README.md
@@ -39,7 +39,7 @@ Pre-requisites
 Screenshots
 -------------
 
-<img src="screenshots/main.png" height="400" alt="Screenshot"/> 
+<img src="screenshots/capture.gif" height="400" alt="Screenshot"/> 
 
 Getting Started
 ---------------
diff --git a/CustomTransition/gradle.properties b/CustomTransition/gradle.properties
index 0bc4294e..5fcef584 100644
--- a/CustomTransition/gradle.properties
+++ b/CustomTransition/gradle.properties
@@ -17,4 +17,6 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
 
diff --git a/CustomTransition/gradle/wrapper/gradle-wrapper.properties b/CustomTransition/gradle/wrapper/gradle-wrapper.properties
index 1f3fdbc5..6f9483c3 100644
--- a/CustomTransition/gradle/wrapper/gradle-wrapper.properties
+++ b/CustomTransition/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+<<<<<<< HEAD
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+=======
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+>>>>>>> remotes/upstream/main
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/CustomTransition/screenshots/capture.gif b/CustomTransition/screenshots/capture.gif
new file mode 100644
index 00000000..3094d2e9
Binary files /dev/null and b/CustomTransition/screenshots/capture.gif differ
diff --git a/DrawableAnimations/app/build.gradle b/DrawableAnimations/app/build.gradle
index 53753ca9..595daec6 100644
--- a/DrawableAnimations/app/build.gradle
+++ b/DrawableAnimations/app/build.gradle
@@ -18,13 +18,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '29.0.3'
+    compileSdkVersion 30
+    // buildToolsVersion '29.0.3'
 
     defaultConfig {
         applicationId 'com.example.android.drawableanimations'
-        minSdkVersion 14
-        targetSdkVersion 29
+        minSdkVersion 26
+        targetSdkVersion 30
         versionCode 1
         versionName '1.0'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
diff --git a/DrawableAnimations/app/src/main/java/com/example/android/drawableanimations/ViewBindingDelegates.kt b/DrawableAnimations/app/src/main/java/com/example/android/drawableanimations/ViewBindingDelegates.kt
index b5220658..d6b9d046 100644
--- a/DrawableAnimations/app/src/main/java/com/example/android/drawableanimations/ViewBindingDelegates.kt
+++ b/DrawableAnimations/app/src/main/java/com/example/android/drawableanimations/ViewBindingDelegates.kt
@@ -27,7 +27,7 @@ import androidx.viewbinding.ViewBinding
  * [Fragment.onViewCreated].
  *
  * ```
- *     private val binding by dataBindings(HomeFragmentBinding::bind)
+ *     private val binding by viewBindings(HomeFragmentBinding::bind)
  *
  *     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
  *         binding.someView.someField = ...
diff --git a/DrawableAnimations/app/src/main/java/com/example/android/drawableanimations/ui/home/HomeFragment.kt b/DrawableAnimations/app/src/main/java/com/example/android/drawableanimations/ui/home/HomeFragment.kt
index 3ac7f753..8e29e6d7 100644
--- a/DrawableAnimations/app/src/main/java/com/example/android/drawableanimations/ui/home/HomeFragment.kt
+++ b/DrawableAnimations/app/src/main/java/com/example/android/drawableanimations/ui/home/HomeFragment.kt
@@ -33,7 +33,7 @@ class HomeFragment : Fragment(R.layout.home_fragment) {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         val adapter = DemoListAdapter { demo ->
-            activity?.let { activity ->
+            requireActivity().let { activity ->
                 activity.supportFragmentManager.commit {
                     replace(R.id.main, demo.createFragment())
                     addToBackStack(null)
@@ -50,6 +50,6 @@ class HomeFragment : Fragment(R.layout.home_fragment) {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        activity?.setTitle(R.string.app_name)
+        requireActivity().setTitle(R.string.app_name)
     }
 }
diff --git a/DrawableAnimations/build.gradle b/DrawableAnimations/build.gradle
index dfa80d05..aa0951a9 100644
--- a/DrawableAnimations/build.gradle
+++ b/DrawableAnimations/build.gradle
@@ -21,7 +21,11 @@ buildscript {
         mavenCentral()
     }
     dependencies {
+<<<<<<< HEAD
+        classpath 'com.android.tools.build:gradle:7.0.1'
+=======
         classpath 'com.android.tools.build:gradle:4.2.2'
+>>>>>>> remotes/upstream/main
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/DrawableAnimations/gradle/wrapper/gradle-wrapper.properties b/DrawableAnimations/gradle/wrapper/gradle-wrapper.properties
index 7fb21260..d5bd6246 100644
--- a/DrawableAnimations/gradle/wrapper/gradle-wrapper.properties
+++ b/DrawableAnimations/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,8 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+<<<<<<< HEAD
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+=======
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+>>>>>>> remotes/upstream/main
diff --git a/Interpolator/Application/build.gradle b/Interpolator/Application/build.gradle
index 9d612591..929539f5 100644
--- a/Interpolator/Application/build.gradle
+++ b/Interpolator/Application/build.gradle
@@ -6,7 +6,11 @@ buildscript {
     }
 
     dependencies {
+<<<<<<< HEAD
+        classpath 'com.android.tools.build:gradle:7.0.1'
+=======
         classpath 'com.android.tools.build:gradle:4.2.2'
+>>>>>>> remotes/upstream/main
     }
 }
 
@@ -18,18 +22,12 @@ repositories {
 }
 
 dependencies {
-
-
-        implementation "com.android.support:support-v4:28.0.0"
-        implementation "com.android.support:support-v13:28.0.0"
-        implementation "com.android.support:cardview-v7:28.0.0"
-        implementation "com.android.support:appcompat-v7:28.0.0"
-
-
-
-
-
-
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation "androidx.cardview:cardview:1.0.0"
+//        implementation "com.android.support:support-v4:28.0.0"
+//        implementation "com.android.support:support-v13:28.0.0"
+//        implementation "com.android.support:cardview-v7:28.0.0"
+//        implementation "com.android.support:appcompat-v7:28.0.0"
 }
 
 // The sample build uses multiple directories to
diff --git a/Interpolator/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/Interpolator/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
index 3228927b..d1974d70 100644
--- a/Interpolator/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
+++ b/Interpolator/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
@@ -17,7 +17,8 @@
 package com.example.android.common.activities;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+
+import androidx.fragment.app.FragmentActivity;
 
 import com.example.android.common.logger.Log;
 import com.example.android.common.logger.LogWrapper;
diff --git a/Interpolator/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/Interpolator/Application/src/main/java/com/example/android/common/logger/LogFragment.java
index b302acd4..5695d9f7 100644
--- a/Interpolator/Application/src/main/java/com/example/android/common/logger/LogFragment.java
+++ b/Interpolator/Application/src/main/java/com/example/android/common/logger/LogFragment.java
@@ -33,7 +33,6 @@
 
 import android.graphics.Typeface;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.Gravity;
@@ -42,6 +41,8 @@
 import android.view.ViewGroup;
 import android.widget.ScrollView;
 
+import androidx.fragment.app.Fragment;
+
 /**
  * Simple fraggment which contains a LogView and uses is to output log data it receives
  * through the LogNode interface.
diff --git a/Interpolator/Application/src/main/java/com/example/android/interpolator/InterpolatorFragment.java b/Interpolator/Application/src/main/java/com/example/android/interpolator/InterpolatorFragment.java
index dfa5c6ce..72dede30 100644
--- a/Interpolator/Application/src/main/java/com/example/android/interpolator/InterpolatorFragment.java
+++ b/Interpolator/Application/src/main/java/com/example/android/interpolator/InterpolatorFragment.java
@@ -20,8 +20,6 @@
 import android.annotation.SuppressLint;
 import android.graphics.Path;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -32,6 +30,9 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
 import com.example.android.common.logger.Log;
 
 /**
diff --git a/Interpolator/Application/src/main/java/com/example/android/interpolator/MainActivity.java b/Interpolator/Application/src/main/java/com/example/android/interpolator/MainActivity.java
index 925aec77..59d4380c 100644
--- a/Interpolator/Application/src/main/java/com/example/android/interpolator/MainActivity.java
+++ b/Interpolator/Application/src/main/java/com/example/android/interpolator/MainActivity.java
@@ -18,11 +18,12 @@
 package com.example.android.interpolator;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ViewAnimator;
 
+import androidx.fragment.app.FragmentTransaction;
+
 import com.example.android.common.activities.SampleActivityBase;
 import com.example.android.common.logger.Log;
 import com.example.android.common.logger.LogFragment;
diff --git a/Interpolator/README.md b/Interpolator/README.md
index f0aaffb1..4e32c682 100644
--- a/Interpolator/README.md
+++ b/Interpolator/README.md
@@ -30,7 +30,7 @@ Pre-requisites
 Screenshots
 -------------
 
-<img src="screenshots/before.png" height="400" alt="Screenshot"/> <img src="screenshots/after.png" height="400" alt="Screenshot"/> 
+<img src="screenshots/capture.gif" height="400" alt="Screenshot"/>
 
 Getting Started
 ---------------
diff --git a/Interpolator/gradle.properties b/Interpolator/gradle.properties
index 0bc4294e..5fcef584 100644
--- a/Interpolator/gradle.properties
+++ b/Interpolator/gradle.properties
@@ -17,4 +17,6 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
 
diff --git a/Interpolator/gradle/wrapper/gradle-wrapper.properties b/Interpolator/gradle/wrapper/gradle-wrapper.properties
index 1f3fdbc5..6f9483c3 100644
--- a/Interpolator/gradle/wrapper/gradle-wrapper.properties
+++ b/Interpolator/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+<<<<<<< HEAD
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+=======
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+>>>>>>> remotes/upstream/main
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Interpolator/screenshots/capture.gif b/Interpolator/screenshots/capture.gif
new file mode 100644
index 00000000..fd27bbc8
Binary files /dev/null and b/Interpolator/screenshots/capture.gif differ
diff --git a/Motion/.idea/misc.xml b/Motion/.idea/misc.xml
index feb35717..fc70e2ef 100644
--- a/Motion/.idea/misc.xml
+++ b/Motion/.idea/misc.xml
@@ -3,12 +3,21 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+<<<<<<< HEAD
+        <entry key="app/src/main/res/layout/fade_through_activity.xml" value="0.14969604863221886" />
+      </map>
+    </option>
+  </component>
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+=======
         <entry key="app/src/main/res/layout/container_transform_activity.xml" value="0.19537037037037036" />
         <entry key="app/src/main/res/layout/demo_item.xml" value="0.2074074074074074" />
       </map>
     </option>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+>>>>>>> remotes/upstream/main
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/Motion/app/build.gradle b/Motion/app/build.gradle
index 3455f8e9..4a6b8ba7 100644
--- a/Motion/app/build.gradle
+++ b/Motion/app/build.gradle
@@ -23,7 +23,7 @@ android {
 
     defaultConfig {
         applicationId 'com.example.android.motion'
-        minSdkVersion 14
+        minSdkVersion 26
         targetSdkVersion 30
         versionCode 1
         versionName '1.0'
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/containertransform/CheeseCardFragment.kt b/Motion/app/src/main/java/com/example/android/motion/demo/containertransform/CheeseCardFragment.kt
index d49e3c20..5f636ea1 100644
--- a/Motion/app/src/main/java/com/example/android/motion/demo/containertransform/CheeseCardFragment.kt
+++ b/Motion/app/src/main/java/com/example/android/motion/demo/containertransform/CheeseCardFragment.kt
@@ -95,6 +95,7 @@ class CheeseCardFragment : Fragment() {
             image.setImageResource(cheese.image)
         }
 
+        // Navigation Graphを使った場合、FragmentNavigatorExtrasを使用してShared Elementのアニメーションを実現する
         card.setOnClickListener { v ->
             val cheese = viewModel.cheese.value ?: return@setOnClickListener
             v.findNavController().navigate(
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/dissolve/Dissolve.kt b/Motion/app/src/main/java/com/example/android/motion/demo/dissolve/Dissolve.kt
index 007a1bff..c4c8c703 100644
--- a/Motion/app/src/main/java/com/example/android/motion/demo/dissolve/Dissolve.kt
+++ b/Motion/app/src/main/java/com/example/android/motion/demo/dissolve/Dissolve.kt
@@ -51,10 +51,12 @@ class Dissolve : Transition() {
         private val SUPPORTS_VIEW_OVERLAY = Build.VERSION.SDK_INT >= 18
     }
 
+    // 現在の画面の状態をスクリーンショットを撮って記録する
     override fun captureStartValues(transitionValues: TransitionValues) {
         captureValues(transitionValues)
     }
 
+    // 画面が変更された後の状態を記録する
     override fun captureEndValues(transitionValues: TransitionValues) {
         captureValues(transitionValues)
     }
@@ -79,7 +81,7 @@ class Dissolve : Transition() {
 
         // No need to animate if the start and the end look identical.
         if (startBitmap.sameAs(endBitmap)) {
-            return null
+            return null // 画面が変わっていない場合はnullを返す
         }
 
         val view = endValues.view
@@ -90,7 +92,7 @@ class Dissolve : Transition() {
         // Use ViewOverlay to show the start bitmap on top of the view that is currently showing the
         // end state. This allows us to overlap the start and end states during the animation.
         val overlay = view.overlay
-        overlay.add(startDrawable)
+        overlay.add(startDrawable) // viewを重ねる
 
         // Fade out the start bitmap.
         return ObjectAnimator
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/oscillation/CheeseAdapter.kt b/Motion/app/src/main/java/com/example/android/motion/demo/oscillation/CheeseAdapter.kt
index fc447c18..6b4150a3 100644
--- a/Motion/app/src/main/java/com/example/android/motion/demo/oscillation/CheeseAdapter.kt
+++ b/Motion/app/src/main/java/com/example/android/motion/demo/oscillation/CheeseAdapter.kt
@@ -146,10 +146,10 @@ internal class CheeseViewHolder(
      */
     val rotation: SpringAnimation = SpringAnimation(itemView, SpringAnimation.ROTATION)
         .setSpring(
-            SpringForce()
-                .setFinalPosition(0f)
+            SpringForce() // バネの強さを設定
+                .setFinalPosition(0f) // 最終的に元の位置に戻る
                 .setDampingRatio(SpringForce.DAMPING_RATIO_HIGH_BOUNCY)
-                .setStiffness(SpringForce.STIFFNESS_LOW)
+                .setStiffness(SpringForce.STIFFNESS_LOW) // どのくらいのスピードで戻るか
         )
         .addUpdateListener { _, _, velocity ->
             currentVelocity = velocity
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/sharedelement/CheeseDetailFragment.kt b/Motion/app/src/main/java/com/example/android/motion/demo/sharedelement/CheeseDetailFragment.kt
index 790f08a7..4b782f97 100644
--- a/Motion/app/src/main/java/com/example/android/motion/demo/sharedelement/CheeseDetailFragment.kt
+++ b/Motion/app/src/main/java/com/example/android/motion/demo/sharedelement/CheeseDetailFragment.kt
@@ -84,9 +84,9 @@ class CheeseDetailFragment : Fragment() {
             this.duration = duration
             interpolator = FAST_OUT_SLOW_IN
             this += SharedFade()
-            this += ChangeImageTransform()
-            this += ChangeBounds()
-            this += ChangeTransform()
+            this += ChangeImageTransform() // ImageViewの縦横比率を変えているのでそれをスムーズに見せるために使っている
+            this += ChangeBounds() // Viewのサイズを変更
+            this += ChangeTransform() // Viewの位置とViewのヒエラルキーを変えている
         }
     }
 
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/sharedelement/CheeseGridFragment.kt b/Motion/app/src/main/java/com/example/android/motion/demo/sharedelement/CheeseGridFragment.kt
index acc1f84d..7efcc8a8 100644
--- a/Motion/app/src/main/java/com/example/android/motion/demo/sharedelement/CheeseGridFragment.kt
+++ b/Motion/app/src/main/java/com/example/android/motion/demo/sharedelement/CheeseGridFragment.kt
@@ -66,7 +66,7 @@ class CheeseGridFragment : Fragment() {
                 addTarget(R.id.app_bar)
             }
             // The grid items.
-            this += Explode().apply {
+            this += Explode().apply { // 外に開いていくようなエフェクトをかける場合は、Explodeを使って適用できる
                 mode = Explode.MODE_OUT
                 excludeTarget(R.id.app_bar, true)
             }
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/stagger/Stagger.kt b/Motion/app/src/main/java/com/example/android/motion/demo/stagger/Stagger.kt
index 64cfb775..db5cfa1f 100644
--- a/Motion/app/src/main/java/com/example/android/motion/demo/stagger/Stagger.kt
+++ b/Motion/app/src/main/java/com/example/android/motion/demo/stagger/Stagger.kt
@@ -39,8 +39,9 @@ class Stagger : Fade(IN) {
         // This duration is for a single item. See the comment below about propagation.
         duration = LARGE_EXPAND_DURATION / 2
         interpolator = LINEAR_OUT_SLOW_IN
+        // 一つ一つの効果が伝播していく表現をPropagationを使って実装している
         propagation = SidePropagation().apply {
-            setSide(Gravity.BOTTOM)
+            setSide(Gravity.BOTTOM) // 下に向かって伝播する
             // We want the stagger effect to take as long as the duration of a single item.
             // In other words, the last item starts to fade in around the time when the first item
             // finishes animating. The overall animation will take about twice the duration of one
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/stagger/StaggerActivity.kt b/Motion/app/src/main/java/com/example/android/motion/demo/stagger/StaggerActivity.kt
index cb53623b..5c0c9e44 100644
--- a/Motion/app/src/main/java/com/example/android/motion/demo/stagger/StaggerActivity.kt
+++ b/Motion/app/src/main/java/com/example/android/motion/demo/stagger/StaggerActivity.kt
@@ -70,9 +70,10 @@ class StaggerActivity : AppCompatActivity() {
         val stagger = Stagger()
 
         viewModel.cheeses.observe(this) { cheeses ->
-            // Delay the stagger effect until the list is updated.
-            TransitionManager.beginDelayedTransition(list, stagger)
-            adapter.submitList(cheeses)
+            adapter.submitList(cheeses){
+                // Delay the stagger effect until the list is updated.
+                TransitionManager.beginDelayedTransition(list, stagger)
+            }
         }
     }
 
diff --git a/OurStreets/build.gradle b/OurStreets/build.gradle
index 2d45cf89..f60ac6be 100644
--- a/OurStreets/build.gradle
+++ b/OurStreets/build.gradle
@@ -22,7 +22,11 @@ buildscript {
         mavenCentral()
     }
     dependencies {
+<<<<<<< HEAD
+        classpath 'com.android.tools.build:gradle:7.0.1'
+=======
         classpath 'com.android.tools.build:gradle:4.2.2'
+>>>>>>> remotes/upstream/main
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/OurStreets/gradle/wrapper/gradle-wrapper.properties b/OurStreets/gradle/wrapper/gradle-wrapper.properties
index 4cd90227..57d33f83 100644
--- a/OurStreets/gradle/wrapper/gradle-wrapper.properties
+++ b/OurStreets/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,8 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+<<<<<<< HEAD
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+=======
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+>>>>>>> remotes/upstream/main
diff --git a/RevealEffectBasic/Application/build.gradle b/RevealEffectBasic/Application/build.gradle
index 9d612591..2b358e96 100644
--- a/RevealEffectBasic/Application/build.gradle
+++ b/RevealEffectBasic/Application/build.gradle
@@ -6,7 +6,11 @@ buildscript {
     }
 
     dependencies {
+<<<<<<< HEAD
+        classpath 'com.android.tools.build:gradle:7.0.1'
+=======
         classpath 'com.android.tools.build:gradle:4.2.2'
+>>>>>>> remotes/upstream/main
     }
 }
 
@@ -18,18 +22,12 @@ repositories {
 }
 
 dependencies {
-
-
-        implementation "com.android.support:support-v4:28.0.0"
-        implementation "com.android.support:support-v13:28.0.0"
-        implementation "com.android.support:cardview-v7:28.0.0"
-        implementation "com.android.support:appcompat-v7:28.0.0"
-
-
-
-
-
-
+    implementation "androidx.appcompat:appcompat:1.1.0"
+    implementation "androidx.cardview:cardview:1.0.0"
+//        implementation "com.android.support:support-v4:28.0.0"
+//        implementation "com.android.support:support-v13:28.0.0"
+//        implementation "com.android.support:cardview-v7:28.0.0"
+//        implementation "com.android.support:appcompat-v7:28.0.0"
 }
 
 // The sample build uses multiple directories to
@@ -41,11 +39,11 @@ List<String> dirs = [
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 28
+        minSdkVersion 26
+        targetSdkVersion 30
     }
 
     compileOptions {
diff --git a/RevealEffectBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/RevealEffectBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
index 3228927b..d1974d70 100644
--- a/RevealEffectBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
+++ b/RevealEffectBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
@@ -17,7 +17,8 @@
 package com.example.android.common.activities;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+
+import androidx.fragment.app.FragmentActivity;
 
 import com.example.android.common.logger.Log;
 import com.example.android.common.logger.LogWrapper;
diff --git a/RevealEffectBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/RevealEffectBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java
index b302acd4..5695d9f7 100644
--- a/RevealEffectBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java
+++ b/RevealEffectBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java
@@ -33,7 +33,6 @@
 
 import android.graphics.Typeface;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.Gravity;
@@ -42,6 +41,8 @@
 import android.view.ViewGroup;
 import android.widget.ScrollView;
 
+import androidx.fragment.app.Fragment;
+
 /**
  * Simple fraggment which contains a LogView and uses is to output log data it receives
  * through the LogNode interface.
diff --git a/RevealEffectBasic/Application/src/main/java/com/example/android/revealeffectbasic/MainActivity.java b/RevealEffectBasic/Application/src/main/java/com/example/android/revealeffectbasic/MainActivity.java
index 6d7188e6..d2fd7be1 100644
--- a/RevealEffectBasic/Application/src/main/java/com/example/android/revealeffectbasic/MainActivity.java
+++ b/RevealEffectBasic/Application/src/main/java/com/example/android/revealeffectbasic/MainActivity.java
@@ -18,11 +18,12 @@
 package com.example.android.revealeffectbasic;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ViewAnimator;
 
+import androidx.fragment.app.FragmentTransaction;
+
 import com.example.android.common.activities.SampleActivityBase;
 import com.example.android.common.logger.Log;
 import com.example.android.common.logger.LogFragment;
diff --git a/RevealEffectBasic/Application/src/main/java/com/example/android/revealeffectbasic/RevealEffectBasicFragment.java b/RevealEffectBasic/Application/src/main/java/com/example/android/revealeffectbasic/RevealEffectBasicFragment.java
index a47def43..4fe396c8 100644
--- a/RevealEffectBasic/Application/src/main/java/com/example/android/revealeffectbasic/RevealEffectBasicFragment.java
+++ b/RevealEffectBasic/Application/src/main/java/com/example/android/revealeffectbasic/RevealEffectBasicFragment.java
@@ -17,14 +17,15 @@
 
 import android.animation.Animator;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewAnimationUtils;
 import android.view.ViewGroup;
 import android.view.animation.AccelerateDecelerateInterpolator;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
 import com.example.android.common.logger.Log;
 
 /**
diff --git a/RevealEffectBasic/README.md b/RevealEffectBasic/README.md
index fa222b71..82bbf616 100644
--- a/RevealEffectBasic/README.md
+++ b/RevealEffectBasic/README.md
@@ -34,7 +34,7 @@ Pre-requisites
 Screenshots
 -------------
 
-<img src="screenshots/1-main.png" height="400" alt="Screenshot"/> 
+<img src="screenshots/capture.gif" height="400" alt="Screenshot"/> 
 
 Getting Started
 ---------------
diff --git a/RevealEffectBasic/gradle.properties b/RevealEffectBasic/gradle.properties
index 0bc4294e..4c43c852 100644
--- a/RevealEffectBasic/gradle.properties
+++ b/RevealEffectBasic/gradle.properties
@@ -17,4 +17,5 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/RevealEffectBasic/gradle/wrapper/gradle-wrapper.properties b/RevealEffectBasic/gradle/wrapper/gradle-wrapper.properties
index 1f3fdbc5..6f9483c3 100644
--- a/RevealEffectBasic/gradle/wrapper/gradle-wrapper.properties
+++ b/RevealEffectBasic/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+<<<<<<< HEAD
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+=======
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+>>>>>>> remotes/upstream/main
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/RevealEffectBasic/screenshots/capture.gif b/RevealEffectBasic/screenshots/capture.gif
new file mode 100644
index 00000000..3b7022dc
Binary files /dev/null and b/RevealEffectBasic/screenshots/capture.gif differ
diff --git a/Unsplash/build.gradle b/Unsplash/build.gradle
index bee4ccb1..1211a7fa 100644
--- a/Unsplash/build.gradle
+++ b/Unsplash/build.gradle
@@ -22,7 +22,11 @@ buildscript {
         mavenCentral()
     }
     dependencies {
+<<<<<<< HEAD
+        classpath 'com.android.tools.build:gradle:7.0.1'
+=======
         classpath 'com.android.tools.build:gradle:4.2.2'
+>>>>>>> remotes/upstream/main
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/Unsplash/gradle/wrapper/gradle-wrapper.properties b/Unsplash/gradle/wrapper/gradle-wrapper.properties
index 18becb4c..c6594b76 100644
--- a/Unsplash/gradle/wrapper/gradle-wrapper.properties
+++ b/Unsplash/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,8 @@ distributionBase=GRADLE_USER_HOME
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
+<<<<<<< HEAD
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+=======
 zipStoreBase=GRADLE_USER_HOME
+>>>>>>> remotes/upstream/main