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

Merge "Update links to Scanning Settings" into sc-dev am: 8d07eeb590

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13991364

Change-Id: I00757cd497f322a174468f10edae756d9840ba6a
This commit is contained in:
Yu-Han Yang
2021-03-30 17:10:04 +00:00
committed by Automerger Merge Worker
parent 439a60643c 8d07eeb590
commit d822c05cdf
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
View File

@@ -23,7 +23,7 @@ import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.location.LocationServices;
import com.android.settings.location.BluetoothScanningFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.utils.AnnotationSpan;
import com.android.settings.widget.SwitchWidgetController;
@@ -100,7 +100,7 @@ public class BluetoothSwitchPreferenceController
public void onClick(View v) {
// send users to scanning settings if they click on the link in the summary text
new SubSettingLauncher(mContext)
.setDestination(LocationServices.class.getName())
.setDestination(BluetoothScanningFragment.class.getName())
.setSourceMetricsCategory(SettingsEnums.BLUETOOTH_FRAGMENT)
.launch();
}
@@ -117,4 +117,4 @@ public class BluetoothSwitchPreferenceController
mFooterPreference.setTitle(R.string.bluetooth_empty_list_bluetooth_off);
}
}
}
}

6
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -63,7 +63,7 @@ import com.android.settings.core.FeatureFlags;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.datausage.DataUsagePreference;
import com.android.settings.datausage.DataUsageUtils;
import com.android.settings.location.LocationServices;
import com.android.settings.location.WifiScanningFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.widget.MainSwitchBarController;
@@ -921,8 +921,8 @@ public class WifiSettings extends RestrictedSettingsFragment
: getText(R.string.wifi_scan_notify_text_scanning_off);
final LinkifyUtils.OnClickListener clickListener =
() -> new SubSettingLauncher(getContext())
.setDestination(LocationServices.class.getName())
.setTitleRes(R.string.location_services_screen_title)
.setDestination(WifiScanningFragment.class.getName())
.setTitleRes(R.string.location_scanning_wifi_always_scanning_title)
.setSourceMetricsCategory(getMetricsCategory())
.launch();
mStatusMessagePreference.setText(title, description, clickListener);