diff options
Diffstat (limited to 'src/com/android/settings')
3 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java index b63bd7d..c885b02 100644 --- a/src/com/android/settings/applications/AppLaunchSettings.java +++ b/src/com/android/settings/applications/AppLaunchSettings.java @@ -39,6 +39,7 @@ import com.android.settings.Utils; import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED; import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK; import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS; +import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK; import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER; import java.util.List; @@ -93,7 +94,7 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe mAppLinkState.addItem(R.string.app_link_open_always, INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS); mAppLinkState.addItem(R.string.app_link_open_ask, - INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK); + INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK); mAppLinkState.addItem(R.string.app_link_open_never, INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER); @@ -105,7 +106,7 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe final int state = mPm.getIntentVerificationStatus(mPackageName, UserHandle.myUserId()); mAppLinkState.setSelectedValue( (state == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED) - ? INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK + ? INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK : state); // Set the callback only after setting the initial selected item diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java index 4f9b33b..779026b 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java @@ -354,7 +354,9 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { // Only offer to migrate when not current storage final VolumeInfo privateVol = getActivity().getPackageManager() .getPrimaryStorageCurrentVolume(); - migrate.setVisible(!Objects.equals(mVolume, privateVol)); + migrate.setVisible((privateVol != null) + && (privateVol.getType() == VolumeInfo.TYPE_PRIVATE) + && !Objects.equals(mVolume, privateVol)); } @Override diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java index 1a5a70c..6f89ff5 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java +++ b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java @@ -153,7 +153,7 @@ public class StorageWizardFormatProgress extends StorageWizardBase { // storage or slower. if (Float.isNaN(pct) || pct < 0.25) { final SlowWarningFragment dialog = new SlowWarningFragment(); - dialog.show(activity.getFragmentManager(), TAG_SLOW_WARNING); + dialog.showAllowingStateLoss(activity.getFragmentManager(), TAG_SLOW_WARNING); } else { activity.onFormatFinished(); } |