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

Merge "Fix a crash due to absence of no-arg fragment init" into udc-dev

Browse Source
This commit is contained in:
Neil Fuller
2023-03-14 09:50:45 +00:00
committed by Android (Google) Code Review
parent db7e7d0920 7ddbef73f0
commit 3e34c99502
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
View File

@@ -77,7 +77,7 @@ public class LocationTimeZoneDetectionPreferenceController
boolean isLocationEnabled =
timeZoneCapabilitiesAndConfig.getCapabilities().isUseLocationEnabled();
if (isChecked && !isLocationEnabled) {
new LocationToggleDisabledDialogFragment(mContext)
new LocationToggleDisabledDialogFragment()
.show(mFragment.getFragmentManager(), TAG);
// Toggle status is not updated.
return false;

9
src/com/android/settings/datetime/LocationToggleDisabledDialogFragment.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.datetime;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.provider.Settings;
@@ -32,11 +31,7 @@ import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
*/
public class LocationToggleDisabledDialogFragment extends InstrumentedDialogFragment {
private final Context mContext;
public LocationToggleDisabledDialogFragment(Context context) {
mContext = context;
}
public LocationToggleDisabledDialogFragment() {}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -48,7 +43,7 @@ public class LocationToggleDisabledDialogFragment extends InstrumentedDialogFrag
R.string.location_time_zone_detection_location_is_off_dialog_ok_button,
(dialog, which) -> {
Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
mContext.startActivity(intent);
getContext().startActivity(intent);
})
.setNegativeButton(
R.string.location_time_zone_detection_location_is_off_dialog_cancel_button,