openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 403c51aa98)

Bug: 123762998
This commit is contained in:
Aurimas Liutikas 2019-01-30 22:02:00 -08:00 committed by Hyunyoung Song
parent 985b5399ed
commit 60041a7024
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SecondaryDisplayLauncher/Android.mk
View File

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

6
SecondaryDisplayLauncher/res/layout/app_picker_layout.xml
View File

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

4
SecondaryDisplayLauncher/src/com/android/launcher3/SecondaryDisplayLauncher.java
View File

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