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

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

Change-Id: I53ed6d54a6f50da601a2b2eaaaa229ef5fc76562
This commit is contained in:
Lucas Dupin
2021-12-07 17:57:09 +00:00
committed by Automerger Merge Worker
3 changed files with 21 additions and 0 deletions

View File

@@ -1270,6 +1270,23 @@
android:value="true" /> android:value="true" />
</activity> </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 <activity
android:name="SettingsLicenseActivity" android:name="SettingsLicenseActivity"
android:label="@string/settings_license_activity_title" android:label="@string/settings_license_activity_title"

View File

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

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.face.FaceSettings;
import com.android.settings.biometrics.fingerprint.FingerprintSettings; import com.android.settings.biometrics.fingerprint.FingerprintSettings;
import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment; import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment;
import com.android.settings.bluetooth.BluetoothPairingDetail;
import com.android.settings.bugreporthandler.BugReportHandlerPicker; import com.android.settings.bugreporthandler.BugReportHandlerPicker;
import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment; import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;
import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment; import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
@@ -176,6 +177,7 @@ public class SettingsGateway {
public static final String[] ENTRY_FRAGMENTS = { public static final String[] ENTRY_FRAGMENTS = {
AdvancedConnectedDeviceDashboardFragment.class.getName(), AdvancedConnectedDeviceDashboardFragment.class.getName(),
CreateShortcut.class.getName(), CreateShortcut.class.getName(),
BluetoothPairingDetail.class.getName(),
WifiSettings.class.getName(), WifiSettings.class.getName(),
WifiNetworkDetailsFragment.class.getName(), WifiNetworkDetailsFragment.class.getName(),
ConfigureWifiSettings.class.getName(), ConfigureWifiSettings.class.getName(),