Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2814c297 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update battery & storage settings to use headline font."

parents 7276a61c dd19c3c8

res/layout/battery_header.xml

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="12dp"

            android:fontFamily="@*android:string/config_headlineFontFamily"

            android:textAppearance="@android:style/TextAppearance.Material.Display1"/>



        <TextView

res/layout/storage_summary.xml

+4 −3
Original line number Diff line number Diff line
@@ -30,13 +30,14 @@ 
        android:id="@android:id/title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:ellipsize="marquee"

        android:fadingEdge="horizontal"

        android:fontFamily="@*android:string/config_headlineFontFamily"

        android:singleLine="true"

        android:textAlignment="viewStart"

        android:textAppearance="@android:style/TextAppearance.Material.Subhead"

        android:textColor="?android:attr/colorAccent"

        android:textSize="36sp"

        android:ellipsize="marquee"

        android:fadingEdge="horizontal" />

        android:textSize="36sp"/>



    <TextView

        android:id="@android:id/summary"

res/layout/storage_summary_donut.xml

+3 −2
Original line number Diff line number Diff line
@@ -36,10 +36,11 @@ 


        <TextView

            android:id="@android:id/title"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:fontFamily="@*android:string/config_headlineFontFamily"

            android:singleLine="true"

            android:textAlignment="viewStart"

            android:textAppearance="@android:style/TextAppearance.Material.Display1"

src/com/android/settings/widget/DonutView.java

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.graphics.ColorFilter; 
import android.graphics.Paint;

import android.graphics.PorterDuff;

import android.graphics.PorterDuffColorFilter;

import android.graphics.Typeface;

import android.text.TextPaint;

import android.util.AttributeSet;

import android.view.View;
@@ -90,6 +91,9 @@ public class DonutView extends View { 
        mBigNumberPaint.setTextSize(

                resources.getDimension(R.dimen.storage_donut_view_percent_text_size));

        mBigNumberPaint.setTextAlign(Paint.Align.CENTER);

        mBigNumberPaint.setTypeface(Typeface.create(

                getContext().getString(com.android.internal.R.string.config_headlineFontFamily),

                Typeface.NORMAL));

    }



    @Override

tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java

+6 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.settings.SettingsRobolectricTestRunner; 
import com.android.settings.TestConfig;

import com.android.settings.core.instrumentation.MetricsFeatureProvider;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.shadow.SettingsShadowResources;

import com.android.settingslib.deviceinfo.StorageVolumeProvider;



import org.junit.Before;
@@ -57,7 +58,11 @@ import static com.android.settings.TestUtils.MEGABYTE; 
import static com.android.settings.TestUtils.GIGABYTE;



@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 StorageSummaryDonutPreferenceControllerTest {

    private Context mContext;

    private StorageSummaryDonutPreferenceController mController;