diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-01-31 22:47:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-01-31 22:47:38 +0000 |
| commit | 75f22c5310ad06fe6222f624096fe4751d36f456 (patch) | |
| tree | 2b7ebe4e46f0522c97160677926075193b506594 | |
| parent | 61b0144879aac5608718f1618da637961d451824 (diff) | |
| parent | 00061160bc5798b1f59f41a4b6752b480c24f3db (diff) | |
| download | android_packages_wallpapers_LivePicker-75f22c5310ad06fe6222f624096fe4751d36f456.tar.gz android_packages_wallpapers_LivePicker-75f22c5310ad06fe6222f624096fe4751d36f456.tar.bz2 android_packages_wallpapers_LivePicker-75f22c5310ad06fe6222f624096fe4751d36f456.zip | |
Merge "Migrate away from temporary androidx.design_design target."
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | proguard.flags | 2 | ||||
| -rw-r--r-- | res/layout/live_wallpaper_preview.xml | 2 | ||||
| -rw-r--r-- | src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -36,7 +36,7 @@ android_app { "androidx.legacy_legacy-support-core-utils", "androidx.legacy_legacy-support-core-ui", "androidx.fragment_fragment", - "androidx.design_design", + "com.google.android.material_material", "androidx.transition_transition", "androidx.recyclerview_recyclerview", "androidx.slice_slice-core", diff --git a/proguard.flags b/proguard.flags index cddd821..ed626e2 100644 --- a/proguard.flags +++ b/proguard.flags @@ -8,4 +8,4 @@ } -keep class androidx.coordinatorlayout.widget.CoordinatorLayout --keep class android.support.design.widget.BottomSheetBehavior
\ No newline at end of file +-keep class com.google.android.material.bottomsheet.BottomSheetBehavior
\ No newline at end of file diff --git a/res/layout/live_wallpaper_preview.xml b/res/layout/live_wallpaper_preview.xml index ca6af3e..3bef894 100644 --- a/res/layout/live_wallpaper_preview.xml +++ b/res/layout/live_wallpaper_preview.xml @@ -48,7 +48,7 @@ android:background="@color/translucent_black" android:orientation="vertical"> - <android.support.design.widget.TabLayout + <com.google.android.material.tabs.TabLayout android:id="@+id/tablayout" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java index 3e95643..095c8e1 100644 --- a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java +++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java @@ -43,7 +43,7 @@ import android.service.wallpaper.IWallpaperEngine; import android.service.wallpaper.IWallpaperService; import android.service.wallpaper.WallpaperService; import android.service.wallpaper.WallpaperSettingsActivity; -import android.support.design.widget.TabLayout; +import com.google.android.material.tabs.TabLayout; import android.text.TextUtils; import android.util.Log; import android.util.Pair; |