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

Commit e99586cf authored by Evan Laird's avatar Evan Laird Committed by android-build-merger
Browse files

Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev

am: a9e2d970

Change-Id: I596d700d10a29640344d4554824a29eb21e71cf1
parents 821967ec a9e2d970
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -2474,7 +2474,7 @@
                <category android:name="com.android.settings.SHORTCUT" />
            </intent-filter>
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.DreamSettings" />
                android:value="com.android.settings.dream.DreamSettings" />
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                android:value="true" />
        </activity>
+39 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2017 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.android.settings.dream;

import android.content.Context;
import android.content.Intent;
import android.provider.Settings;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;

@RunWith(AndroidJUnit4.class)
@SmallTest
public class DreamSettingsLaunchTest {

    @Test
    public void launchFromIntent_doesNotCrash() {
        final Context context = InstrumentationRegistry.getTargetContext();
        Intent intent = new Intent(Settings.ACTION_DREAM_SETTINGS);

        context.startActivity(intent);
    }
}