Redesign homepage IA icon
- remove the outer circle of the icons - tint the icons including injected ones Test: robotest, visual Bug: 182870640 Change-Id: If72c37152f4f0d68e25149b11d497eef1c7ece91
This commit is contained in:
@@ -18,14 +18,24 @@ package com.android.settings.homepage;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.anyInt;
|
||||
import static org.mockito.ArgumentMatchers.nullable;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.os.Bundle;
|
||||
import android.util.FeatureFlagUtils;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.FeatureFlags;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -43,6 +53,11 @@ public class TopLevelSettingsTest {
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mSettings = spy(new TopLevelSettings());
|
||||
when(mSettings.getContext()).thenReturn(mContext);
|
||||
final FakeFeatureFactory featureFactory = FakeFeatureFactory.setupForTest();
|
||||
when(featureFactory.dashboardFeatureProvider
|
||||
.getTilesForCategory(nullable(String.class)))
|
||||
.thenReturn(null);
|
||||
mSettings.onAttach(mContext);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -62,4 +77,21 @@ public class TopLevelSettingsTest {
|
||||
assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(
|
||||
R.xml.top_level_settings_grouped);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onCreatePreferences_shouldTintPreferenceIcon() {
|
||||
final Preference preference = new Preference(mContext);
|
||||
preference.setTitle(R.string.network_dashboard_title);
|
||||
final Drawable icon = spy(mContext.getDrawable(R.drawable.ic_settings_wireless));
|
||||
preference.setIcon(icon);
|
||||
final PreferenceScreen screen = spy(new PreferenceScreen(mContext, null /* attrs */));
|
||||
doReturn(1).when(screen).getPreferenceCount();
|
||||
doReturn(preference).when(screen).getPreference(anyInt());
|
||||
doReturn(screen).when(mSettings).getPreferenceScreen();
|
||||
doReturn(0).when(mSettings).getPreferenceScreenResId();
|
||||
|
||||
mSettings.onCreatePreferences(new Bundle(), "rootKey");
|
||||
|
||||
verify(icon).setTint(anyInt());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user