Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c664ade8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Migrate away from temporary androidx.design_design target."

parents 1d1855e0 d113f94e

tests/JankBench/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 \

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

+7 −5
Original line number Diff line number Diff line
@@ -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;

tests/JankBench/app/src/main/res/layout/activity_home.xml

+2 −2
Original line number Diff line number Diff line
@@ -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" />

tests/JankBench/app/src/main/res/layout/fragment_dashboard.xml

+5 −5
Original line number Diff line number Diff line
@@ -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"

tests/UiBench/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 \