Merge "Clean up task affinity."

            android:label="@string/zen_mode_settings_title"

            android:icon="@drawable/ic_notifications"

            android:exported="true"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

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

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

            android:label="@string/night_display_title"

            android:enabled="@*android:bool/config_nightDisplayAvailable"

            android:icon="@drawable/ic_settings_night_display"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

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

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

import com.android.settingslib.testutils.FragmentTestUtils;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Answers;

    }

    @Test

    @Ignore

    public void deviceNameDisplayIsCorrect() {

        String deviceName = "ABC Corp Headphones";

        AlertDialog dialog = startDialog(deviceName);

    }

    @Test

    @Ignore

    public void deviceNameEditSucceeds() {

        String deviceNameInitial = "ABC Corp Headphones";

        String deviceNameModified = "My Headphones";

    }

    @Test

    @Ignore

    public void deviceNameEditThenCancelDoesntRename() {

        String deviceNameInitial = "ABC Corp Headphones";

        String deviceNameModified = "My Headphones";