From f63eee9f0ae8b13f12d35b21ef5a111770d318a4 Mon Sep 17 00:00:00 2001
From: Cn Chen <cnchen@google.com>
Date: Mon, 10 Dec 2018 07:05:24 +0000
Subject: [PATCH] Revert "migrate new setupcompat and setupdesign to
 SetupChooseLockGeneric"

This reverts commit 0725bea86e6f7d9de80fad4e3d9c3f6fff338e81.

Reason for revert: Settings crash
Bug: 120754151
Change-Id: I52f258f7f12d21b8dd16220ba11e50768d0802ee
---
 Android.mk                                                      | 2 --
 src/com/android/settings/password/SetupChooseLockGeneric.java   | 2 +-
 .../android/settings/utils/SettingsDividerItemDecoration.java   | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Android.mk b/Android.mk
index 4dedcddb0ea..04749bfa45f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,8 +30,6 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
     androidx.preference_preference \
     androidx.recyclerview_recyclerview \
     com.google.android.material_material \
-    setupcompat \
-    setupdesign
 
 LOCAL_JAVA_LIBRARIES := \
     telephony-common \
diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java
index fcffce4d8ce..76001048ace 100644
--- a/src/com/android/settings/password/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/password/SetupChooseLockGeneric.java
@@ -38,7 +38,7 @@ import com.android.settings.SetupEncryptionInterstitial;
 import com.android.settings.SetupWizardUtils;
 import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor;
 import com.android.settings.utils.SettingsDividerItemDecoration;
-import com.google.android.setupdesign.GlifPreferenceLayout;
+import com.android.setupwizardlib.GlifPreferenceLayout;
 
 /**
  * Setup Wizard's version of ChooseLockGeneric screen. It inherits the logic and basic structure
diff --git a/src/com/android/settings/utils/SettingsDividerItemDecoration.java b/src/com/android/settings/utils/SettingsDividerItemDecoration.java
index 3d9e9019747..85cd9617b98 100644
--- a/src/com/android/settings/utils/SettingsDividerItemDecoration.java
+++ b/src/com/android/settings/utils/SettingsDividerItemDecoration.java
@@ -21,7 +21,7 @@ import android.content.Context;
 import androidx.preference.PreferenceViewHolder;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.google.android.setupdesign.DividerItemDecoration;
+import com.android.setupwizardlib.DividerItemDecoration;
 
 public class SettingsDividerItemDecoration extends DividerItemDecoration {