Add an intent for the advanced connected devices.

This allows us to intent into it for setting specific advanced settings.

Bug: 66679618
Test: BT notification punts to correct screen

Change-Id: I6ff4fbcea2ebf563d634419eac0713365061f88d
This commit is contained in:
Daniel Nishi
2018-01-19 14:11:20 -08:00
parent a9f6d41635
commit 232ebf1ca7
3 changed files with 27 additions and 1 deletions

View File

@@ -3311,6 +3311,25 @@
</intent-filter> </intent-filter>
</activity> </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" <provider android:name=".slices.SettingsSliceProvider"
android:authorities="com.android.settings.slices" android:authorities="com.android.settings.slices"
android:exported="true"> android:exported="true">

View File

@@ -178,5 +178,10 @@ public class Settings extends SettingsActivity {
public static class StorageDashboardActivity extends SettingsActivity {} public static class StorageDashboardActivity extends SettingsActivity {}
public static class UserAndAccountDashboardActivity extends SettingsActivity {} public static class UserAndAccountDashboardActivity extends SettingsActivity {}
public static class SystemDashboardActivity 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);
}
}
} }

View File

@@ -57,6 +57,7 @@ import com.android.settings.applications.assist.ManageAssist;
import com.android.settings.applications.manageapplications.ManageApplications; import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment; import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment;
import com.android.settings.bluetooth.BluetoothSettings; import com.android.settings.bluetooth.BluetoothSettings;
import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;
import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment; import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragmentOld; import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragmentOld;
import com.android.settings.datausage.DataPlanUsageSummary; import com.android.settings.datausage.DataPlanUsageSummary;
@@ -254,7 +255,8 @@ public class SettingsGateway {
LockscreenDashboardFragment.class.getName(), LockscreenDashboardFragment.class.getName(),
BluetoothDeviceDetailsFragment.class.getName(), BluetoothDeviceDetailsFragment.class.getName(),
DataUsageList.class.getName(), DataUsageList.class.getName(),
DirectoryAccessDetails.class.getName() DirectoryAccessDetails.class.getName(),
AdvancedConnectedDeviceDashboardFragment.class.getName()
}; };
public static final String[] SETTINGS_FOR_RESTRICTED = { public static final String[] SETTINGS_FOR_RESTRICTED = {