From 5d811c40d3d1cdb5dfa8eada42329f612d8fbff9 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Fri, 16 Jun 2017 11:57:14 -0700 Subject: [PATCH] Hide app info button from app notification settings header Change-Id: I10803e78fe4f30c2d84ec795c343ed660aab7762 Bug: 62708686 Test: visual and runtest --path AppNotificationSettingsTest.java --- .../notification/AppNotificationSettings.java | 2 +- .../AppNotificationSettingsTest.java | 63 +++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 tests/app/src/com/android/settings/notification/AppNotificationSettingsTest.java diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java index db060b6ee95..deb5c4d2a64 100644 --- a/src/com/android/settings/notification/AppNotificationSettings.java +++ b/src/com/android/settings/notification/AppNotificationSettings.java @@ -137,7 +137,7 @@ public class AppNotificationSettings extends NotificationSettingsBase { .setLabel(mAppRow.label) .setPackageName(mAppRow.pkg) .setUid(mAppRow.uid) - .setButtonActions(EntityHeaderController.ActionType.ACTION_APP_INFO, + .setButtonActions(EntityHeaderController.ActionType.ACTION_NONE, EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE) .done(activity, getPrefContext()); pref.setKey(KEY_HEADER); diff --git a/tests/app/src/com/android/settings/notification/AppNotificationSettingsTest.java b/tests/app/src/com/android/settings/notification/AppNotificationSettingsTest.java new file mode 100644 index 00000000000..22e98c71e5e --- /dev/null +++ b/tests/app/src/com/android/settings/notification/AppNotificationSettingsTest.java @@ -0,0 +1,63 @@ +/* + * 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 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(android.R.id.button1), + withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) + .check(doesNotExist()); + } + +}