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

Commit 81131edc authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Revert "Disabling som attributes so that dependencies can use compat... 

Merge "Revert "Disabling som attributes so that dependencies can use compat libraries"" into ub-launcher3-burnaby-polish
parents 2cb92eb2 59871ef8

res/values/attrs.xml

+1 −5
Original line number Diff line number Diff line
@@ -100,12 +100,8 @@ 
        <attr name="y" format="string" />

        <attr name="spanX" format="string" />

        <attr name="spanY" format="string" />

        <!--

          Temporarily disabling attr format definitions to prevent conflicts with support libs.

           Re-enable it once AAPT starts supporting multiple definitions of same attr.

        <attr name="icon" format="reference" />  

        <attr name="title" format="reference" />

        -->

        <attr name="uri" format="string" />

    </declare-styleable>
@@ -119,7 +115,7 @@ 
    </declare-styleable>



    <declare-styleable name="PreloadIconDrawable">

        <attr name="ringBackground" format="reference" />

        <attr name="background" format="reference" />

        <attr name="ringOutset" format="dimension" />

        <attr name="indicatorSize" format="dimension" />

    </declare-styleable>

res/values/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -84,13 +84,13 @@ 
    <style name="DropTargetButton" parent="DropTargetButtonBase" />



    <style name="PreloadIcon">

        <item name="ringBackground">@drawable/virtual_preload</item>

        <item name="background">@drawable/virtual_preload</item>

        <item name="indicatorSize">4dp</item>

        <item name="ringOutset">4dp</item>

    </style>



    <style name="PreloadIcon.Folder">

        <item name="ringBackground">@drawable/virtual_preload_folder</item>

        <item name="background">@drawable/virtual_preload_folder</item>

        <item name="indicatorSize">4dp</item>

        <item name="ringOutset">4dp</item>

    </style>

src/com/android/launcher3/PreloadIconDrawable.java

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ class PreloadIconDrawable extends Drawable { 


    public void applyPreloaderTheme(Theme t) {

        TypedArray ta = t.obtainStyledAttributes(R.styleable.PreloadIconDrawable);

        mBgDrawable = ta.getDrawable(R.styleable.PreloadIconDrawable_ringBackground);

        mBgDrawable = ta.getDrawable(R.styleable.PreloadIconDrawable_background);

        mBgDrawable.setFilterBitmap(true);

        mPaint.setStrokeWidth(ta.getDimension(R.styleable.PreloadIconDrawable_indicatorSize, 0));

        mRingOutset = ta.getDimensionPixelSize(R.styleable.PreloadIconDrawable_ringOutset, 0);