Merge "Increase app icon size from 24dp to 32dp."

This commit is contained in:
TreeHugger Robot
2018-02-06 00:15:42 +00:00
committed by Android (Google) Code Review
2 changed files with 11 additions and 1 deletions

View File

@@ -22,7 +22,7 @@
<dimen name="action_bar_switch_padding">16dip</dimen> <dimen name="action_bar_switch_padding">16dip</dimen>
<dimen name="app_icon_size">40dip</dimen> <dimen name="app_icon_size">40dip</dimen>
<dimen name="secondary_app_icon_size">24dp</dimen> <dimen name="secondary_app_icon_size">32dp</dimen>
<dimen name="min_tap_target_size">48dp</dimen> <dimen name="min_tap_target_size">48dp</dimen>
<dimen name="screen_margin_sides">64dip</dimen> <dimen name="screen_margin_sides">64dip</dimen>
<dimen name="screen_margin_top">72dip</dimen> <dimen name="screen_margin_top">72dip</dimen>

View File

@@ -36,6 +36,8 @@ import org.robolectric.annotation.Config;
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppPreferenceTest { public class AppPreferenceTest {
private static final int EXPECTED_APP_ICON_SIZE_DP = 32;
private Context mContext; private Context mContext;
private View mRootView; private View mRootView;
private AppPreference mPref; private AppPreference mPref;
@@ -75,4 +77,12 @@ public class AppPreferenceTest {
assertThat(mHolder.findViewById(R.id.summary_container).getVisibility()) assertThat(mHolder.findViewById(R.id.summary_container).getVisibility())
.isEqualTo(View.GONE); .isEqualTo(View.GONE);
} }
@Test
public void foobar_testName() {
// Can't use isEquals() to compare float. Use isWithIn().of() instead.
assertThat(mContext.getResources().getDimension(R.dimen.secondary_app_icon_size))
.isWithin(0.01f)
.of(EXPECTED_APP_ICON_SIZE_DP);
}
} }