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

Update advanced battery screen to use headline font.

Browse Source 
am: e2a276f2b6

Change-Id: I920fe5c52fae1f8ec873f999dff72d79bcc2cd9a
This commit is contained in:
Andrew Sapperstein
2017-06-12 17:41:10 +00:00
committed by android-build-merger
parent 7fb248e126 e2a276f2b6
commit 4aba04c690
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/battery_usage_graph.xml
View File

@@ -28,6 +28,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:fontFamily="@*android:string/config_headlineFontFamily"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:textSize="36sp" android:textSize="36sp"
android:textColor="?android:attr/colorAccent" /> android:textColor="?android:attr/colorAccent" />

7
tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
View File

@@ -31,6 +31,7 @@ import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig; import com.android.settings.TestConfig;
import com.android.settings.graph.UsageView; import com.android.settings.graph.UsageView;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -42,7 +43,11 @@ import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
shadows = {
SettingsShadowResources.class,
SettingsShadowResources.SettingsShadowTheme.class
})
public class BatteryHistoryPreferenceTest { public class BatteryHistoryPreferenceTest {
@Mock @Mock
private PreferenceViewHolder mViewHolder; private PreferenceViewHolder mViewHolder;