diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2019-01-30 22:02:00 -0800 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2019-02-01 21:29:44 +0000 |
| commit | 60041a70240f32881b73bf32fdcd770870ce948d (patch) | |
| tree | f89dabe30e297b22323a3e6e852a824ac0475fe8 /SecondaryDisplayLauncher | |
| parent | 985b5399ed852304812e9df6ee49a97b13ae61de (diff) | |
| download | android_packages_apps_Trebuchet-60041a70240f32881b73bf32fdcd770870ce948d.tar.gz android_packages_apps_Trebuchet-60041a70240f32881b73bf32fdcd770870ce948d.tar.bz2 android_packages_apps_Trebuchet-60041a70240f32881b73bf32fdcd770870ce948d.zip | |
Migrate away from temporary androidx.design_design target.
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.
Exempt-From-Owner-Approval: Large scale refactor
Test: make -j SecondaryDisplayLauncherLib
Change-Id: If183dd35a1d197c4a9a8225a021e36c4f1662587
(cherry picked from commit 403c51aa981cc7c7094319a9fb06873e2893e0f5)
Bug: 123762998
Diffstat (limited to 'SecondaryDisplayLauncher')
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; |