LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate away from temporary androidx.design_design target.

Browse Source 
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.

Test: make -j IntentPlayground MultiDisplay
Change-Id: I0e9dabb222e19530c3a558cf4fce4d54e81f8e47
This commit is contained in:
Aurimas Liutikas
2019-01-30 22:40:04 -08:00
parent 07f021dc6a
commit a955aae5ab
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/IntentPlayground/Android.mk
View File

@@ -9,7 +9,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_STATIC_ANDROID_LIBRARIES := \ LOCAL_STATIC_ANDROID_LIBRARIES := \
androidx.design_design \ com.google.android.material_material \
androidx.appcompat_appcompat \ androidx.appcompat_appcompat \
androidx.recyclerview_recyclerview \ androidx.recyclerview_recyclerview \
androidx.lifecycle_lifecycle-livedata \ androidx.lifecycle_lifecycle-livedata \

2
samples/IntentPlayground/res/layout/activity_main.xml
View File

@@ -49,7 +49,7 @@
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</LinearLayout> </LinearLayout>
<android.support.design.widget.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/launch_fab" android:id="@+id/launch_fab"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
samples/IntentPlayground/src/com/example/android/intentplayground/BaseActivity.java
View File

@@ -22,7 +22,7 @@ import android.app.Activity;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.FloatingActionButton; import com.google.android.material.floatingactionbutton.FloatingActionButton;
import android.util.Log; import android.util.Log;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;

2
samples/MultiDisplay/Android.mk
View File

@@ -23,7 +23,7 @@ LOCAL_MODULE_TAGS := samples
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_ANDROID_LIBRARIES += \ LOCAL_STATIC_ANDROID_LIBRARIES += \
androidx.design_design \ com.google.android.material_material \
androidx.lifecycle_lifecycle-livedata \ androidx.lifecycle_lifecycle-livedata \
androidx.lifecycle_lifecycle-viewmodel androidx.lifecycle_lifecycle-viewmodel

6
samples/MultiDisplay/res/layout/app_picker_layout.xml
View File

@@ -20,7 +20,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="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:id="@+id/FloatingSheet"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -70,9 +70,9 @@
android:horizontalSpacing="@dimen/app_list_vertical_spacing" android:horizontalSpacing="@dimen/app_list_vertical_spacing"
android:numColumns="auto_fit" /> android:numColumns="auto_fit" />
</LinearLayout> </LinearLayout>
</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:id="@+id/FloatingActionButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

4
samples/MultiDisplay/src/com/example/android/multidisplay/launcher/LauncherActivity.java
View File

@@ -29,8 +29,8 @@ import android.content.res.Configuration;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.hardware.display.DisplayManager; import android.hardware.display.DisplayManager;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.circularreveal.cardview.CircularRevealCardView; import com.google.android.material.circularreveal.cardview.CircularRevealCardView;
import android.support.design.widget.FloatingActionButton; import com.google.android.material.floatingactionbutton.FloatingActionButton;
import android.view.Display; import android.view.Display;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;