Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[NavigationBar][NavigationRail] Removed font scaling from NavigationB…
…arView item labels. PiperOrigin-RevId: 426264069
- Loading branch information
1 parent
b4cab87
commit d66676f
Showing
5 changed files
with
250 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
122 changes: 122 additions & 0 deletions
122
lib/javatests/com/google/android/material/resources/MaterialResourcesTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| /* | ||
| * Copyright (C) 2021 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.android.material.resources; | ||
|
|
||
| import com.google.android.material.R; | ||
|
|
||
| import static android.content.Context.WINDOW_SERVICE; | ||
| import static com.google.common.truth.Truth.assertThat; | ||
|
|
||
| import android.content.res.Configuration; | ||
| import androidx.appcompat.app.AppCompatActivity; | ||
| import android.util.DisplayMetrics; | ||
| import android.view.WindowManager; | ||
| import androidx.test.core.app.ApplicationProvider; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.robolectric.Robolectric; | ||
| import org.robolectric.RobolectricTestRunner; | ||
| import org.robolectric.android.controller.ActivityController; | ||
| import org.robolectric.annotation.Config; | ||
| import org.robolectric.annotation.internal.DoNotInstrument; | ||
|
|
||
| @RunWith(RobolectricTestRunner.class) | ||
| @DoNotInstrument | ||
| public class MaterialResourcesTest { | ||
|
|
||
| private ActivityController<AppCompatActivity> activityController; | ||
|
|
||
| @Before | ||
| public void createActivity() { | ||
| ApplicationProvider.getApplicationContext() | ||
| .setTheme(R.style.Theme_Material3_DayNight_NoActionBar); | ||
| activityController = Robolectric.buildActivity(AppCompatActivity.class).create(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testGetUnscaledDimensionPixelSize_returnsSameValueWhenFontScalingIsOff() { | ||
| AppCompatActivity activity = activityController.get(); | ||
| int spResult = | ||
| MaterialResources.getUnscaledTextSize( | ||
| activity, R.style.TextAppearance_Test_UsesSP, 0); | ||
| int dpResult = | ||
| MaterialResources.getUnscaledTextSize( | ||
| activity, R.style.TextAppearance_Test_UsesDp, 0); | ||
| assertThat(spResult).isEqualTo(dpResult); | ||
| } | ||
|
|
||
| @Test | ||
| public void testUnscaledDimensionPixelSize_differsFromDimensionPixelSize() { | ||
| float fontScale = 1.7F; | ||
| setFontScale(activityController, fontScale); | ||
| AppCompatActivity activity = activityController.get(); | ||
| int unscaledSp = | ||
| MaterialResources.getUnscaledTextSize( | ||
| activity, R.style.TextAppearance_Test_UsesSP, 0); | ||
| int scaledSp = activity.getResources().getDimensionPixelSize( | ||
| R.dimen.material_text_size_sp); | ||
| assertThat(unscaledSp).isNotEqualTo(scaledSp); | ||
| assertThat(scaledSp).isEqualTo(Math.round(unscaledSp * fontScale)); | ||
| } | ||
|
|
||
| @Test | ||
| @Config(qualifiers = "xxxhdpi") | ||
| public void | ||
| testGetUnscaledDimensionPixelSize_returnsSameValueWhenFontScalingIsOnWithHighDensity() { | ||
| setFontScale(activityController, 1.3f); | ||
| AppCompatActivity activity = activityController.get(); | ||
| int spResult = | ||
| MaterialResources.getUnscaledTextSize( | ||
| activity, R.style.TextAppearance_Test_UsesSP, 0); | ||
| int dpResult = | ||
| MaterialResources.getUnscaledTextSize( | ||
| activity, R.style.TextAppearance_Test_UsesDp, 0); | ||
| assertThat(spResult).isEqualTo(dpResult); | ||
| } | ||
|
|
||
| @Test | ||
| public void testUnscaledDimensionPixelSize_noTextSizeAvailable() { | ||
| AppCompatActivity activity = activityController.get(); | ||
| int noSizeResult = | ||
| MaterialResources.getUnscaledTextSize( | ||
| activity, R.style.TextAppearance_Test_NoTextSize, 18); | ||
| assertThat(noSizeResult).isEqualTo(18); | ||
| } | ||
|
|
||
| @Test | ||
| public void testUnscaledDimensionPixelSize_noTextAppearanceAvailable() { | ||
| AppCompatActivity activity = activityController.get(); | ||
| int noTextAppearanceResult = | ||
| MaterialResources.getUnscaledTextSize( | ||
| activity, 0, 22); | ||
| assertThat(noTextAppearanceResult).isEqualTo(22); | ||
| } | ||
|
|
||
| private static void setFontScale( | ||
| ActivityController<AppCompatActivity> activityController, float scale) { | ||
| AppCompatActivity activity = activityController.get(); | ||
| Configuration configuration = activity.getResources().getConfiguration(); | ||
| DisplayMetrics metrics = activity.getResources().getDisplayMetrics(); | ||
| WindowManager wm = (WindowManager) activity.getSystemService(WINDOW_SERVICE); | ||
| wm.getDefaultDisplay().getMetrics(metrics); | ||
| configuration.fontScale = scale; | ||
| metrics.scaledDensity = configuration.fontScale * metrics.density; | ||
| activity.getResources().updateConfiguration(configuration, metrics); | ||
| activityController.configurationChange(configuration); | ||
| } | ||
| } |
28 changes: 16 additions & 12 deletions
28
lib/javatests/com/google/android/material/resources/res/values/dimens.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,25 @@ | ||
| <resources> | ||
| <!-- | ||
| Copyright 2019 The Android Open Source Project | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| Copyright 2019 The Android Open Source Project | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
| <resources> | ||
|
|
||
| <dimen name="mtrl_large_touch_target">100dp</dimen> | ||
| <dimen name="action_bar_size">16dp</dimen> | ||
| <dimen name="default_dimension">100dp</dimen> | ||
|
|
||
| <dimen name="material_text_size_sp">14sp</dimen> | ||
| <dimen name="material_text_size_dp">14dp</dimen> | ||
| </resources> |
25 changes: 25 additions & 0 deletions
25
lib/javatests/com/google/android/material/resources/res/values/styles.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| Copyright 2021 The Android Open Source Project | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
| <resources> | ||
| <style name="TextAppearance.Test.UsesSP" parent="TextAppearance.Material3.TitleSmall"> | ||
| <item name="android:textSize">@dimen/material_text_size_sp</item> | ||
| </style> | ||
| <style name="TextAppearance.Test.UsesDp" parent="TextAppearance.Material3.TitleSmall"> | ||
| <item name="android:textSize">@dimen/material_text_size_dp</item> | ||
| </style> | ||
| <style name="TextAppearance.Test.NoTextSize" parent=""/> | ||
| </resources> |