From 00061160bc5798b1f59f41a4b6752b480c24f3db Mon Sep 17 00:00:00 2001
From: Aurimas Liutikas <aurimas@google.com>
Date: Wed, 30 Jan 2019 22:29:16 -0800
Subject: 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 LiveWallpapersPicker
Change-Id: I9c17c0e8f20e86adc84575f77a0e9bc12bec7308
---
 Android.bp                                                     | 2 +-
 proguard.flags                                                 | 2 +-
 res/layout/live_wallpaper_preview.xml                          | 2 +-
 src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Android.bp b/Android.bp
index f2af443..502ce49 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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 a410e21..5231927 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;
-- 
cgit v1.2.3