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

Merge "Fix line break in Opening links app list summary."

Browse Source
This commit is contained in:
android-build-team Robot
2018-05-04 02:12:49 +00:00
committed by Android (Google) Code Review
parent 89f4eff417 4db6f3dfb5
commit c83281059a
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/applications/ManageDomainUrls.java
View File

@@ -268,6 +268,7 @@ public class ManageDomainUrls extends SettingsPreferenceFragment
}); });
} }
super.onBindViewHolder(holder); super.onBindViewHolder(holder);
holder.itemView.findViewById(R.id.appendix).setVisibility(View.GONE);
} }
private CharSequence getDomainsSummary(String packageName) { private CharSequence getDomainsSummary(String packageName) {

25
tests/robotests/src/com/android/settings/applications/ManageDomainUrlsTest.java
View File

@@ -17,9 +17,16 @@
package com.android.settings.applications; package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.graphics.drawable.Drawable;
import android.view.View;
import android.widget.ProgressBar;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -54,4 +61,22 @@ public class ManageDomainUrlsTest {
assertThat(pref.getLayoutResource()).isEqualTo(R.layout.preference_app); assertThat(pref.getLayoutResource()).isEqualTo(R.layout.preference_app);
} }
@Test
public void onBindViewHolder_shouldSetAppendixViewToGone() {
mAppEntry.info = new ApplicationInfo();
mAppEntry.info.packageName = "com.android.settings.test";
mAppEntry.icon = mock(Drawable.class);
final ManageDomainUrls.DomainAppPreference pref =
new ManageDomainUrls.DomainAppPreference(mContext, null, mAppEntry);
final View holderView = mock(View.class);
final View appendixView = mock(View.class);
when(holderView.findViewById(R.id.summary_container)).thenReturn(mock(View.class));
when(holderView.findViewById(android.R.id.progress)).thenReturn(mock(ProgressBar.class));
when(holderView.findViewById(R.id.appendix)).thenReturn(appendixView);
pref.onBindViewHolder(PreferenceViewHolder.createInstanceForTests(holderView));
verify(appendixView).setVisibility(View.GONE);
}
} }