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

migrate new setupcompat and setupdesign to SetupChooseLockGeneric

Browse Source 
Test: cd tests/robotests && mma
Bug: 117080118
Change-Id: I6a29ef5294040d353ee1a0f2bf9ce69de7de9094
This commit is contained in:
cnchen
2018-12-05 17:57:16 +08:00
committed by Cn Chen
parent 32ee158e2a
commit 0725bea86e
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@@ -30,6 +30,8 @@ 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.android.setupwizardlib.GlifPreferenceLayout; import com.google.android.setupdesign.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.android.setupwizardlib.DividerItemDecoration; import com.google.android.setupdesign.DividerItemDecoration;
public class SettingsDividerItemDecoration extends DividerItemDecoration { public class SettingsDividerItemDecoration extends DividerItemDecoration {