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

Merge "Use proper icon size for default app prefs." into pi-dev am: 968dcaf41a

Browse Source 
am: d45b7cbe40

Change-Id: I0f77ebaeb861fd4a15ec31abb1d6728b5dde1788
This commit is contained in:
Fan Zhang
2018-04-09 12:45:56 -07:00
committed by android-build-merger
parent 47a64c8c33 d45b7cbe40
commit c7e36d940d
6 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.accounts;
import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
@@ -42,8 +43,8 @@ public class ProviderPreferenceTest {
public void shouldUseSmallIcon() {
final ProviderPreference providerPreference = new ProviderPreference(
mContext, "account_type", null /* icon */, "provider_name");
final boolean useSmallIcon =
ReflectionHelpers.getField(providerPreference, "mUseSmallIcon");
assertThat(useSmallIcon).isTrue();
final int iconSize =
ReflectionHelpers.getField(providerPreference, "mIconSize");
assertThat(iconSize).isEqualTo(ICON_SIZE_MEDIUM);
}
}

7
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.applications.defaultapps;
import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -27,8 +28,8 @@ import android.support.v7.preference.Preference;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.TwoTargetPreference;
import com.android.settingslib.applications.DefaultAppInfo;
import org.junit.Before;
import org.junit.Test;
@@ -78,13 +79,13 @@ public class DefaultAppPreferenceControllerTest {
}
@Test
public void updateState_twoTargetPref_shouldUseSmallIcon() {
public void updateState_twoTargetPref_shouldUseMediumIcon() {
final TwoTargetPreference pref = mock(TwoTargetPreference.class);
mController = new TestPreferenceController(mContext);
mController.updateState(pref);
verify(pref).setUseSmallIcon(true);
verify(pref).setIconSize(ICON_SIZE_MEDIUM);
}
private static class TestPreferenceController extends DefaultAppPreferenceController {