PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-31 22:47:41 +00:00
committed by Android (Google) Code Review
parent f5826ce175 403c51aa98
commit 35cc388776
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SecondaryDisplayLauncher/Android.mk
+1 -1
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
SecondaryDisplayLauncher/res/layout/app_picker_layout.xml
+3 -3
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"
SecondaryDisplayLauncher/src/com/android/launcher3/SecondaryDisplayLauncher.java
+2 -2
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;