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

Merge "Redesign homepage IA icon" into sc-dev

Browse Source
This commit is contained in:
Jason Chiu
2021-05-13 02:59:29 +00:00
committed by Android (Google) Code Review
parent e5052a7b52 7d9dceadb7
commit cb88a7e24d
31 changed files with 112 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
View File

@@ -48,7 +48,6 @@ import androidx.preference.SwitchPreference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.homepage.HomepagePreference;
import com.android.settings.slices.BlockingSlicePrefController;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.widget.PrimarySwitchPreference;
@@ -56,7 +55,6 @@ import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import com.android.settingslib.drawer.ActivityTile;
import com.android.settingslib.drawer.CategoryKey;
import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.ProviderTile;
@@ -337,16 +335,6 @@ public class DashboardFragmentTest {
assertThat(pref).isInstanceOf(PrimarySwitchPreference.class);
}
@Test
public void createPreference_isHomepageTile_returnHomepagePreference() {
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true);
mActivityTile.setCategory(CategoryKey.CATEGORY_HOMEPAGE);
final Preference pref = mTestFragment.createPreference(mActivityTile);
assertThat(pref).isInstanceOf(HomepagePreference.class);
}
@Test
public void isFeatureFlagAndIsParalleled_runParalleledUpdatePreferenceStates() {
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.CONTROLLER_ENHANCEMENT, true);
@@ -472,7 +460,7 @@ public class DashboardFragmentTest {
return mIsParalleled;
}
public void setUsingControllerEnhancement(boolean isParalleled) {
void setUsingControllerEnhancement(boolean isParalleled) {
mIsParalleled = isParalleled;
}
}

32
tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java
View File

@@ -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());
}
}