PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide spannable link if it's not actionable

Browse Source 
Created a new constructor that detects if intent is actionable and set a
flag in LinkInfo.

In fragments, first check if linkInfo is actionable, if not, don't do
anything with it.

Change-Id: Ibda12ecac2545d696acc7c197fc315e423b984aa
Fixes: 74726487
Test: make RunSettingsRoboTests -j
This commit is contained in:
Fan Zhang
2018-03-20 18:07:31 -07:00
parent b5241a117f
commit 1ee2a88fd7
5 changed files with 117 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogFragmentTest.java
View File

@@ -29,14 +29,17 @@ import android.widget.Button;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowHelpUtils;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowHelpUtils.class)
public class PrivateDnsModeDialogFragmentTest {
private static final String HOST_NAME = "192.168.1.1";

60
tests/robotests/src/com/android/settings/utils/AnnotationSpanTest.java Normal file
View File

@@ -0,0 +1,60 @@
/*
* Copyright (C) 2018 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.utils;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ResolveInfo;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
import org.robolectric.shadows.ShadowPackageManager;
@RunWith(SettingsRobolectricTestRunner.class)
public class AnnotationSpanTest {
private Intent mTestIntent;
private Context mContext;
private ShadowPackageManager mPackageManager;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
mTestIntent = new Intent("test_action");
}
@Test
public void newLinkInfo_validIntent_isActionable() {
mPackageManager.addResolveInfoForIntent(mTestIntent, new ResolveInfo());
assertThat(new AnnotationSpan.LinkInfo(mContext, "annotation", mTestIntent).isActionable())
.isTrue();
}
@Test
public void newLinkInfo_invalidIntent_isNotActionable() {
assertThat(new AnnotationSpan.LinkInfo(mContext, "annotation", mTestIntent).isActionable())
.isFalse();
}
}