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

Merge "[Settings] Expose Bluetooth Pairing settings page" into sc-v2-dev am: f6354d8af7 am: 435f0ac1f8

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

Change-Id: I22e89ab902d4877e4b748da4a25423182e44eabb
This commit is contained in:
Lucas Dupin
2021-12-07 18:03:56 +00:00
committed by Automerger Merge Worker
parent e4cdb4eeaa 435f0ac1f8
commit 0b97fbff64
3 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
AndroidManifest.xml
View File

@@ -1268,6 +1268,23 @@
android:value="true" />
</activity>
<activity
android:name=".Settings$BlueToothPairingActivity"
android:label="@string/bluetooth_pairing_page_title"
android:permission="android.permission.BLUETOOTH_SCAN"
android:exported="true">
<intent-filter android:priority="1">
<action android:name="android.settings.BLUETOOTH_PAIRING_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.bluetooth.BluetoothPairingDetail" />
<meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
android:value="@string/menu_key_connected_devices"/>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>
<activity
android:name="SettingsLicenseActivity"
android:label="@string/settings_license_activity_title"

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

@@ -123,6 +123,8 @@ public class Settings extends SettingsActivity {
public static class AccessibilityDaltonizerSettingsActivity extends SettingsActivity { /* empty */ }
/** Activity for lockscreen settings. */
public static class LockScreenSettingsActivity extends SettingsActivity { /* empty */ }
/** Activity for bluetooth pairing settings. */
public static class BlueToothPairingActivity extends SettingsActivity { /* empty */ }
/** Activity for Reduce Bright Colors. */
public static class ReduceBrightColorsSettingsActivity extends SettingsActivity { /* empty */ }
/** Activity for the security dashboard. */

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

@@ -68,6 +68,7 @@ import com.android.settings.biometrics.combination.CombinedBiometricSettings;
import com.android.settings.biometrics.face.FaceSettings;
import com.android.settings.biometrics.fingerprint.FingerprintSettings;
import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment;
import com.android.settings.bluetooth.BluetoothPairingDetail;
import com.android.settings.bugreporthandler.BugReportHandlerPicker;
import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;
import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
@@ -178,6 +179,7 @@ public class SettingsGateway {
public static final String[] ENTRY_FRAGMENTS = {
AdvancedConnectedDeviceDashboardFragment.class.getName(),
CreateShortcut.class.getName(),
BluetoothPairingDetail.class.getName(),
WifiSettings.class.getName(),
WifiNetworkDetailsFragment.class.getName(),
ConfigureWifiSettings.class.getName(),