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

Commit 8d62516e authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Misc fixes for notification" into oc-dev 

am: e3f322df

Change-Id: I0847813623ad35b38eafc73a69f02d45208e8d32
parents a09c96c1 e3f322df

res/layout/preference_footer.xml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
        android:gravity="start|top"

        android:orientation="horizontal"

        android:paddingEnd="12dp"

        android:paddingTop="20dp"

        android:paddingTop="16dp"

        android:paddingBottom="4dp">

        <ImageView

            android:id="@android:id/icon"

src/com/android/settings/notification/AppNotificationSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public class AppNotificationSettings extends NotificationSettingsBase { 
                .setLabel(mAppRow.label)

                .setPackageName(mAppRow.pkg)

                .setUid(mAppRow.uid)

                .setButtonActions(AppHeaderController.ActionType.ACTION_APP_INFO,

                .setButtonActions(AppHeaderController.ActionType.ACTION_NONE,

                        AppHeaderController.ActionType.ACTION_NOTIF_PREFERENCE)

                .done(activity, getPrefContext());

        pref.setKey(KEY_HEADER);

tests/app/src/com/android/settings/notification/AppNotificationSettingsTest.java

0 → 100644
+65 −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.notification;



import android.app.Instrumentation;

import android.content.Context;

import android.content.Intent;

import android.provider.Settings;

import android.support.test.InstrumentationRegistry;

import android.support.test.espresso.matcher.ViewMatchers;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;



import com.android.settings.R;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;



import static android.support.test.espresso.Espresso.onView;

import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;

import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;

import static android.support.test.espresso.matcher.ViewMatchers.withId;

import static org.hamcrest.Matchers.allOf;



@RunWith(AndroidJUnit4.class)

@SmallTest

public class AppNotificationSettingsTest {



    private Context mTargetContext;

    private Instrumentation mInstrumentation;



    @Before

    public void setUp() {

        mInstrumentation = InstrumentationRegistry.getInstrumentation();

        mTargetContext = mInstrumentation.getTargetContext();

    }



    @Test

    public void launchNotificationSetting_shouldNotHaveAppInfoLink() {

        final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)

                .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName());



        mInstrumentation.startActivitySync(intent);



        onView(allOf(withId(R.id.left_button),

                withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))

                .check(doesNotExist());

    }



}