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

Commit 578d0e8e authored by Daniel Nishi's avatar Daniel Nishi Committed by Android (Google) Code Review
Browse files

Merge "Add an intent for the advanced connected devices."

parents aaf307e7 232ebf1c

AndroidManifest.xml

+19 −0
Original line number Diff line number Diff line
@@ -3311,6 +3311,25 @@ 
            </intent-filter>

        </activity>



        <activity android:name="Settings$AdvancedConnectedDeviceActivity"

                  android:label="@string/connected_device_connections_title"

                  android:taskAffinity="com.android.settings"

                  android:parentActivityName="Settings$ConnectedDeviceDashboardActivity"

                  android:enabled="false">

            <intent-filter android:priority="1">

                <action android:name="com.android.settings.ADVANCED_CONNECTED_DEVICE_SETTINGS" />

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

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

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

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

                       android:value="true" />

        </activity>



        <provider android:name=".slices.SettingsSliceProvider"

                  android:authorities="com.android.settings.slices"

                  android:exported="true">

src/com/android/settings/Settings.java

+5 −0
Original line number Diff line number Diff line
@@ -178,5 +178,10 @@ public class Settings extends SettingsActivity { 
    public static class StorageDashboardActivity extends SettingsActivity {}

    public static class UserAndAccountDashboardActivity extends SettingsActivity {}

    public static class SystemDashboardActivity extends SettingsActivity {}

    public static class AdvancedConnectedDeviceActivity extends SettingsActivity {

        public static final boolean isEnabled() {

            return FeatureFlagUtils.isEnabled(null /* context */, CONNECTED_DEVICE_V2);

        }

    }



}

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

+3 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import com.android.settings.applications.assist.ManageAssist; 
import com.android.settings.applications.manageapplications.ManageApplications;

import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment;

import com.android.settings.bluetooth.BluetoothSettings;

import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;

import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;

import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragmentOld;

import com.android.settings.datausage.DataPlanUsageSummary;
@@ -254,7 +255,8 @@ public class SettingsGateway { 
            LockscreenDashboardFragment.class.getName(),

            BluetoothDeviceDetailsFragment.class.getName(),

            DataUsageList.class.getName(),

            DirectoryAccessDetails.class.getName()

            DirectoryAccessDetails.class.getName(),

            AdvancedConnectedDeviceDashboardFragment.class.getName()

    };



    public static final String[] SETTINGS_FOR_RESTRICTED = {