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

Revert "migrate new setupcompat and setupdesign to SetupChooseLockGeneric"

Browse Source 
This reverts commit 0725bea86e.

Reason for revert: Settings crash
Bug: 120754151
Change-Id: I52f258f7f12d21b8dd16220ba11e50768d0802ee
This commit is contained in:
Cn Chen
2018-12-10 07:05:24 +00:00
parent 0725bea86e
commit f63eee9f0a
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@@ -30,8 +30,6 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
androidx.preference_preference \ androidx.preference_preference \
androidx.recyclerview_recyclerview \ androidx.recyclerview_recyclerview \
com.google.android.material_material \ com.google.android.material_material \
setupcompat \
setupdesign
LOCAL_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := \
telephony-common \ telephony-common \

2
src/com/android/settings/password/SetupChooseLockGeneric.java
View File

@@ -38,7 +38,7 @@ import com.android.settings.SetupEncryptionInterstitial;
import com.android.settings.SetupWizardUtils; import com.android.settings.SetupWizardUtils;
import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor; import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor;
import com.android.settings.utils.SettingsDividerItemDecoration; 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 * Setup Wizard's version of ChooseLockGeneric screen. It inherits the logic and basic structure

2
src/com/android/settings/utils/SettingsDividerItemDecoration.java
View File

@@ -21,7 +21,7 @@ import android.content.Context;
import androidx.preference.PreferenceViewHolder; import androidx.preference.PreferenceViewHolder;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.google.android.setupdesign.DividerItemDecoration; import com.android.setupwizardlib.DividerItemDecoration;
public class SettingsDividerItemDecoration extends DividerItemDecoration { public class SettingsDividerItemDecoration extends DividerItemDecoration {