Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 266ca4d5 authored by Chelsea Hao's avatar Chelsea Hao Committed by Android (Google) Code Review
Browse files

Merge "Create activity for BluetoothDashboardFragment." into main

parents 65372dac 682a8315

AndroidManifest.xml

+12 −0
Original line number Diff line number Diff line
@@ -5192,6 +5192,18 @@ 
            android:theme="@style/Theme.SpaLib.Dialog">

        </activity>



        <activity android:name="Settings$BluetoothDashboardActivity"

            android:label="@string/bluetooth_settings_title"

            android:permission="android.permission.BLUETOOTH_CONNECT"

            android:exported="true">

            <intent-filter>

                <action android:name="android.settings.BLUETOOTH_DASHBOARD_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.connecteddevice.BluetoothDashboardFragment"/>

        </activity>



        <activity

            android:name="com.android.settings.connecteddevice.audiosharing.AudioSharingActivity"

            android:label="@string/audio_sharing_title"

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ public class Settings extends SettingsActivity { 


    public static class MemtagPageActivity extends SettingsActivity { /* empty */}

    public static class BluetoothSettingsActivity extends SettingsActivity { /* empty */ }

    public static class BluetoothDashboardActivity extends SettingsActivity { /* empty */ }

    public static class CreateShortcutActivity extends SettingsActivity { /* empty */ }

    public static class FaceSettingsActivity extends SettingsActivity { /* empty */ }

    /** Container for {@link FaceSettings} to use with a pre-defined task affinity. */

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ import com.android.settings.bluetooth.BluetoothPairingDetail; 
import com.android.settings.bugreporthandler.BugReportHandlerPicker;

import com.android.settings.communal.CommunalDashboardFragment;

import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;

import com.android.settings.connecteddevice.BluetoothDashboardFragment;

import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;

import com.android.settings.connecteddevice.NfcAndPaymentFragment;

import com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment;
@@ -213,6 +214,7 @@ public class SettingsGateway { 
            AdvancedConnectedDeviceDashboardFragment.class.getName(),

            CreateShortcut.class.getName(),

            BluetoothPairingDetail.class.getName(),

            BluetoothDashboardFragment.class.getName(),

            WifiNetworkDetailsFragment.class.getName(),

            ConfigureWifiSettings.class.getName(),

            SavedAccessPointsWifiSettings2.class.getName(),