diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-02-01 21:38:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-02-01 21:38:07 +0000 |
| commit | 2c9856febf134ad9a2a59702330e18675819c495 (patch) | |
| tree | 8e0c76792f46940b3bfb5baafb640d9fdf306375 | |
| parent | bc374ef4233d8a567bb8061582302f579cdd261a (diff) | |
| parent | 60041a70240f32881b73bf32fdcd770870ce948d (diff) | |
| download | android_packages_apps_Trebuchet-2c9856febf134ad9a2a59702330e18675819c495.tar.gz android_packages_apps_Trebuchet-2c9856febf134ad9a2a59702330e18675819c495.tar.bz2 android_packages_apps_Trebuchet-2c9856febf134ad9a2a59702330e18675819c495.zip | |
Merge "Migrate away from temporary androidx.design_design target." into ub-launcher3-master
3 files changed, 6 insertions, 6 deletions
diff --git a/SecondaryDisplayLauncher/Android.mk b/SecondaryDisplayLauncher/Android.mk index 4fb5eba17..7f305bba5 100644 --- a/SecondaryDisplayLauncher/Android.mk +++ b/SecondaryDisplayLauncher/Android.mk @@ -21,7 +21,7 @@ LOCAL_USE_AAPT2 := true LOCAL_AAPT2_ONLY := true LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_ANDROID_LIBRARIES := androidx.design_design +LOCAL_STATIC_ANDROID_LIBRARIES := com.google.android.material_material LOCAL_STATIC_JAVA_LIBRARIES := LauncherPluginLib diff --git a/SecondaryDisplayLauncher/res/layout/app_picker_layout.xml b/SecondaryDisplayLauncher/res/layout/app_picker_layout.xml index fbaeac460..20f85b16a 100644 --- a/SecondaryDisplayLauncher/res/layout/app_picker_layout.xml +++ b/SecondaryDisplayLauncher/res/layout/app_picker_layout.xml @@ -20,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <android.support.design.circularreveal.cardview.CircularRevealCardView + <com.google.android.material.circularreveal.cardview.CircularRevealCardView android:id="@+id/FloatingSheet" android:layout_width="match_parent" android:layout_height="match_parent" @@ -35,9 +35,9 @@ android:verticalSpacing="@dimen/app_list_horizontal_spacing" android:horizontalSpacing="@dimen/app_list_vertical_spacing" android:numColumns="auto_fit" /> - </android.support.design.circularreveal.cardview.CircularRevealCardView> + </com.google.android.material.circularreveal.cardview.CircularRevealCardView> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/FloatingActionButton" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/SecondaryDisplayLauncher/src/com/android/launcher3/SecondaryDisplayLauncher.java b/SecondaryDisplayLauncher/src/com/android/launcher3/SecondaryDisplayLauncher.java index 5e8b40246..12fa46bf4 100644 --- a/SecondaryDisplayLauncher/src/com/android/launcher3/SecondaryDisplayLauncher.java +++ b/SecondaryDisplayLauncher/src/com/android/launcher3/SecondaryDisplayLauncher.java @@ -26,8 +26,8 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Configuration; import android.os.Bundle; -import android.support.design.circularreveal.cardview.CircularRevealCardView; -import android.support.design.widget.FloatingActionButton; +import com.google.android.material.circularreveal.cardview.CircularRevealCardView; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; |