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

Merge "Fix fingerprint screens from "Anything else" screen not applying Stencil theme" into qt-dev

Browse Source 
am: 6b5d0230b4

Change-Id: Ifac076a03821ebcf85d2742d47426f65a6100cf7
This commit is contained in:
Cn Chen
2019-04-08 21:12:12 -07:00
committed by android-build-merger
parent e0bc974553 6b5d0230b4
commit cbd00c32c9
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.google.android.setupcompat.util.WizardManagerHelper; import com.google.android.setupcompat.util.WizardManagerHelper;
@@ -452,6 +453,7 @@ public final class ChooseLockSettingsHelper {
} }
private void copyInternalExtras(Intent inIntent, Intent outIntent) { private void copyInternalExtras(Intent inIntent, Intent outIntent) {
SetupWizardUtils.copySetupExtras(inIntent, outIntent);
String theme = inIntent.getStringExtra(WizardManagerHelper.EXTRA_THEME); String theme = inIntent.getStringExtra(WizardManagerHelper.EXTRA_THEME);
if (theme != null) { if (theme != null) {
outIntent.putExtra(WizardManagerHelper.EXTRA_THEME, theme); outIntent.putExtra(WizardManagerHelper.EXTRA_THEME, theme);