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

SUW - Apply theme to FRP PIN pages

Browse Source 
It is safe to always attempt to copy SUW intent extras, as they will
only be applied if they exist.

Fixes: 171950236
Fixes: 181212237
Fixes: 183711331
Test: SUW FRP verify, settings confirm existing PIN
Change-Id: I6d35683abdc864aea7b1ed0190d6776a75b3e116
This commit is contained in:
Matt Pietal
2021-04-28 10:01:54 -04:00
parent d3de9a1352
commit 558ace6aca
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -359,21 +359,22 @@ public final class ChooseLockSettingsHelper {
requestGatekeeperPasswordHandle); requestGatekeeperPasswordHandle);
intent.setClassName(SETTINGS_PACKAGE_NAME, activityClass.getName()); intent.setClassName(SETTINGS_PACKAGE_NAME, activityClass.getName());
Intent inIntent = mFragment != null ? mFragment.getActivity().getIntent() :
mActivity.getIntent();
copyInternalExtras(inIntent, intent);
if (external) { if (external) {
intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
copyOptionalExtras(inIntent, intent);
if (mFragment != null) { if (mFragment != null) {
copyOptionalExtras(mFragment.getActivity().getIntent(), intent);
mFragment.startActivity(intent); mFragment.startActivity(intent);
} else { } else {
copyOptionalExtras(mActivity.getIntent(), intent);
mActivity.startActivity(intent); mActivity.startActivity(intent);
} }
} else { } else {
if (mFragment != null) { if (mFragment != null) {
copyInternalExtras(mFragment.getActivity().getIntent(), intent);
mFragment.startActivityForResult(intent, request); mFragment.startActivityForResult(intent, request);
} else { } else {
copyInternalExtras(mActivity.getIntent(), intent);
mActivity.startActivityForResult(intent, request); mActivity.startActivityForResult(intent, request);
} }
} }

3
src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
View File

@@ -30,6 +30,8 @@ import com.android.settings.SettingsActivity;
import com.android.settings.SetupWizardUtils; import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.google.android.setupdesign.util.ThemeHelper;
public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivity { public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivity {
private static final String STATE_IS_KEYGUARD_LOCKED = "STATE_IS_KEYGUARD_LOCKED"; private static final String STATE_IS_KEYGUARD_LOCKED = "STATE_IS_KEYGUARD_LOCKED";
@@ -74,6 +76,7 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
setTheme(SetupWizardUtils.getTheme(this, getIntent())); setTheme(SetupWizardUtils.getTheme(this, getIntent()));
mConfirmCredentialTheme = ConfirmCredentialTheme.NORMAL; mConfirmCredentialTheme = ConfirmCredentialTheme.NORMAL;
} }
ThemeHelper.trySetDynamicColor(this);
super.onCreate(savedState); super.onCreate(savedState);
if (mConfirmCredentialTheme == ConfirmCredentialTheme.NORMAL) { if (mConfirmCredentialTheme == ConfirmCredentialTheme.NORMAL) {