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

Merge "Add WIFI_SCANNING_SETTINGS action to Settings" into sc-qpr1-dev am: 28b7d115de

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

Change-Id: I76f4ca5b2e6908de3b0a32848c1af479f45c4688
This commit is contained in:
TreeHugger Robot
2021-10-14 17:06:06 +00:00
committed by Automerger Merge Worker
parent 5a5afba75b 28b7d115de
commit f9dcd96f2e
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
AndroidManifest.xml
View File

@@ -1397,6 +1397,23 @@
android:value="true" />
</activity>
<activity
android:name="Settings$WifiScanningSettingsActivity"
android:label="@string/location_scanning_wifi_always_scanning_title"
android:icon="@drawable/ic_homepage_location"
android:exported="true"
android:permission="android.permission.CHANGE_WIFI_STATE"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter android:priority="1">
<action android:name="android.settings.WIFI_SCANNING_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.location.WifiScanningFragment" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>
<activity
android:name=".Settings$SecurityDashboardActivity"
android:label="@string/security_settings_title"

1
src/com/android/settings/Settings.java
View File

@@ -166,6 +166,7 @@ public class Settings extends SettingsActivity {
public static class AppUsageAccessSettingsActivity extends SettingsActivity { /* empty */ }
public static class LocationSettingsActivity extends SettingsActivity { /* empty */ }
public static class ScanningSettingsActivity extends SettingsActivity { /* empty */ }
public static class WifiScanningSettingsActivity extends SettingsActivity { /* empty */ }
public static class PrivacyDashboardActivity extends SettingsActivity { /* empty */ }
public static class PrivacySettingsActivity extends SettingsActivity { /* empty */ }
public static class FactoryResetActivity extends SettingsActivity {

2
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -112,6 +112,7 @@ import com.android.settings.language.LanguageAndInputSettings;
import com.android.settings.localepicker.LocaleListEditor;
import com.android.settings.location.LocationServices;
import com.android.settings.location.LocationSettings;
import com.android.settings.location.WifiScanningFragment;
import com.android.settings.network.MobileNetworkListFragment;
import com.android.settings.network.NetworkDashboardFragment;
import com.android.settings.network.NetworkProviderSettings;
@@ -201,6 +202,7 @@ public class SettingsGateway {
ProcessStatsUi.class.getName(),
NotificationStation.class.getName(),
LocationSettings.class.getName(),
WifiScanningFragment.class.getName(),
PrivacyDashboardFragment.class.getName(),
LocationServices.class.getName(),
SecuritySettings.class.getName(),