diff options
9 files changed, 35 insertions, 29 deletions
diff --git a/tests/JankBench/Android.mk b/tests/JankBench/Android.mk index 75282ba9a88c..89c21b7fb605 100644 --- a/tests/JankBench/Android.mk +++ b/tests/JankBench/Android.mk @@ -19,7 +19,7 @@ LOCAL_RESOURCE_DIR := \ LOCAL_STATIC_ANDROID_LIBRARIES := \ - androidx.design_design \ + com.google.android.material_material \ androidx.legacy_legacy-support-v4 \ androidx.appcompat_appcompat \ androidx.cardview_cardview \ diff --git a/tests/JankBench/app/src/main/java/com/android/benchmark/app/HomeActivity.java b/tests/JankBench/app/src/main/java/com/android/benchmark/app/HomeActivity.java index 47db6020b36f..4de51fb57308 100644 --- a/tests/JankBench/app/src/main/java/com/android/benchmark/app/HomeActivity.java +++ b/tests/JankBench/app/src/main/java/com/android/benchmark/app/HomeActivity.java @@ -19,22 +19,24 @@ package com.android.benchmark.app; import android.content.Intent; import android.os.AsyncTask; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; -import android.view.View; import android.view.Menu; import android.view.MenuItem; +import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.ExpandableListView; import android.widget.Toast; -import com.android.benchmark.registry.BenchmarkRegistry; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + import com.android.benchmark.R; +import com.android.benchmark.registry.BenchmarkRegistry; import com.android.benchmark.results.GlobalResultsStore; +import com.google.android.material.floatingactionbutton.FloatingActionButton; + import java.io.IOException; import java.util.LinkedList; import java.util.Queue; diff --git a/tests/JankBench/app/src/main/res/layout/activity_home.xml b/tests/JankBench/app/src/main/res/layout/activity_home.xml index fb3074742f5c..160d9d7cd41e 100644 --- a/tests/JankBench/app/src/main/res/layout/activity_home.xml +++ b/tests/JankBench/app/src/main/res/layout/activity_home.xml @@ -23,7 +23,7 @@ android:fitsSystemWindows="true" tools:context=".app.HomeActivity"> - <android.support.design.widget.AppBarLayout + <com.google.android.material.appbar.AppBarLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:theme="@style/AppTheme.AppBarOverlay"> @@ -35,7 +35,7 @@ android:background="?attr/colorPrimary" app:popupTheme="@style/AppTheme.PopupOverlay" /> - </android.support.design.widget.AppBarLayout> + </com.google.android.material.appbar.AppBarLayout> <include layout="@layout/content_main" /> diff --git a/tests/JankBench/app/src/main/res/layout/fragment_dashboard.xml b/tests/JankBench/app/src/main/res/layout/fragment_dashboard.xml index 3c72dc96a8d9..2f4813f7e48d 100644 --- a/tests/JankBench/app/src/main/res/layout/fragment_dashboard.xml +++ b/tests/JankBench/app/src/main/res/layout/fragment_dashboard.xml @@ -22,14 +22,14 @@ android:layout_height="fill_parent" android:fitsSystemWindows="true"> - <android.support.design.widget.AppBarLayout + <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar" android:layout_width="match_parent" android:layout_height="@dimen/detail_backdrop_height" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" android:fitsSystemWindows="true"> - <android.support.design.widget.CollapsingToolbarLayout + <com.google.android.material.appbar.CollapsingToolbarLayout android:id="@+id/collapsing_toolbar" android:layout_width="match_parent" android:layout_height="match_parent" @@ -55,9 +55,9 @@ android:fitsSystemWindows="true" app:layout_collapseMode="parallax" /> - </android.support.design.widget.CollapsingToolbarLayout> + </com.google.android.material.appbar.CollapsingToolbarLayout> - </android.support.design.widget.AppBarLayout> + </com.google.android.material.appbar.AppBarLayout> <androidx.core.widget.NestedScrollView android:layout_width="match_parent" @@ -78,7 +78,7 @@ </androidx.core.widget.NestedScrollView> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/start_button" android:layout_height="wrap_content" android:layout_width="wrap_content" diff --git a/tests/UiBench/Android.mk b/tests/UiBench/Android.mk index 6ec0fbbb5ed9..608bf2f226f5 100644 --- a/tests/UiBench/Android.mk +++ b/tests/UiBench/Android.mk @@ -15,7 +15,7 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_USE_AAPT2 := true LOCAL_STATIC_ANDROID_LIBRARIES := \ - androidx.design_design \ + com.google.android.material_material \ androidx.legacy_legacy-support-v4 \ androidx.appcompat_appcompat \ androidx.cardview_cardview \ diff --git a/tests/UiBench/res/layout/activity_navigation_drawer.xml b/tests/UiBench/res/layout/activity_navigation_drawer.xml index 282fb7870526..383432acf152 100644 --- a/tests/UiBench/res/layout/activity_navigation_drawer.xml +++ b/tests/UiBench/res/layout/activity_navigation_drawer.xml @@ -27,7 +27,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - <android.support.design.widget.NavigationView + <com.google.android.material.navigation.NavigationView android:id="@+id/nav_view" android:layout_width="wrap_content" android:layout_height="match_parent" diff --git a/tests/UiBench/res/layout/app_bar_navigation_drawer.xml b/tests/UiBench/res/layout/app_bar_navigation_drawer.xml index b9791341a40b..cf209aca9abd 100644 --- a/tests/UiBench/res/layout/app_bar_navigation_drawer.xml +++ b/tests/UiBench/res/layout/app_bar_navigation_drawer.xml @@ -21,7 +21,7 @@ android:layout_height="match_parent" android:fitsSystemWindows="true"> - <android.support.design.widget.AppBarLayout + <com.google.android.material.appbar.AppBarLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> @@ -31,6 +31,6 @@ android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" android:background="?attr/colorPrimary"/> - </android.support.design.widget.AppBarLayout> + </com.google.android.material.appbar.AppBarLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/tests/UiBench/src/com/android/test/uibench/ClippedListActivity.java b/tests/UiBench/src/com/android/test/uibench/ClippedListActivity.java index 6e24ce1de3aa..2bf6040351b8 100644 --- a/tests/UiBench/src/com/android/test/uibench/ClippedListActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/ClippedListActivity.java @@ -16,18 +16,20 @@ package com.android.test.uibench; import android.os.Bundle; -import android.support.design.widget.NavigationView; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.ListFragment; -import androidx.core.view.GravityCompat; -import androidx.drawerlayout.widget.DrawerLayout; -import androidx.appcompat.app.ActionBarDrawerToggle; -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import android.widget.ArrayAdapter; import android.widget.ListAdapter; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.ListFragment; + +import com.google.android.material.navigation.NavigationView; + public class ClippedListActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener { diff --git a/tests/UiBench/src/com/android/test/uibench/NavigationDrawerActivity.java b/tests/UiBench/src/com/android/test/uibench/NavigationDrawerActivity.java index 6a7761ceaae0..77845391cb47 100644 --- a/tests/UiBench/src/com/android/test/uibench/NavigationDrawerActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/NavigationDrawerActivity.java @@ -16,13 +16,15 @@ package com.android.test.uibench; import android.os.Bundle; -import android.support.design.widget.NavigationView; -import androidx.core.view.GravityCompat; -import androidx.drawerlayout.widget.DrawerLayout; +import android.view.MenuItem; + import androidx.appcompat.app.ActionBarDrawerToggle; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; -import android.view.MenuItem; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; + +import com.google.android.material.navigation.NavigationView; public class NavigationDrawerActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener { |