Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate away from temporary androidx.design_design target.

Browse Source 
androidx.design_design was a target created temporarily while
the com.google.android.material_material was being added.
This migrated to the final material design class packages.

Test: make -j UiBench JankBench
Change-Id: I86540efbe706049fd05938eec0634ba63971b45a
This commit is contained in:
Aurimas Liutikas
2019-01-30 22:08:37 -08:00
parent 447919d2e5
commit d113f94efd
9 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/JankBench/Android.mk
View File

@@ -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 \

12
tests/JankBench/app/src/main/java/com/android/benchmark/app/HomeActivity.java
View File

@@ -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;

4
tests/JankBench/app/src/main/res/layout/activity_home.xml
View File

@@ -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" />

10
tests/JankBench/app/src/main/res/layout/fragment_dashboard.xml
View File

@@ -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"

2
tests/UiBench/Android.mk
View File

@@ -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 \

2
tests/UiBench/res/layout/activity_navigation_drawer.xml
View File

@@ -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"

4
tests/UiBench/res/layout/app_bar_navigation_drawer.xml
View File

@@ -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>

18
tests/UiBench/src/com/android/test/uibench/ClippedListActivity.java
View File

@@ -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 {

10
tests/UiBench/src/com/android/test/uibench/NavigationDrawerActivity.java
View File

@@ -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 {