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

Commit a457ce7c authored by Hyunyoung Song's avatar Hyunyoung Song Committed by android-build-merger
Browse files

Merge "Support fraction type for inset* for InsetDrawable. b/36024318" into oc-dev 

am: ab7a2879

Change-Id: I8c474b66527b7d718d61e1039840c5fa5d5f21e8
parents f3523dca ab7a2879

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -14182,7 +14182,9 @@ package android.graphics.drawable { 














  public class InsetDrawable extends android.graphics.drawable.DrawableWrapper {















    ctor public InsetDrawable(android.graphics.drawable.Drawable, int);













    ctor public InsetDrawable(android.graphics.drawable.Drawable, float);















    ctor public InsetDrawable(android.graphics.drawable.Drawable, int, int, int, int);













    ctor public InsetDrawable(android.graphics.drawable.Drawable, float, float, float, float);















  }





























  public class LayerDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {

























api/system-current.txt



+2
−0




























Original line number
Diff line number
Diff line








@@ -14956,7 +14956,9 @@ package android.graphics.drawable {



























  public class InsetDrawable extends android.graphics.drawable.DrawableWrapper {















    ctor public InsetDrawable(android.graphics.drawable.Drawable, int);













    ctor public InsetDrawable(android.graphics.drawable.Drawable, float);















    ctor public InsetDrawable(android.graphics.drawable.Drawable, int, int, int, int);













    ctor public InsetDrawable(android.graphics.drawable.Drawable, float, float, float, float);















  }





























  public class LayerDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {

























api/test-current.txt



+2
−0




























Original line number
Diff line number
Diff line








@@ -14226,7 +14226,9 @@ package android.graphics.drawable {



























  public class InsetDrawable extends android.graphics.drawable.DrawableWrapper {















    ctor public InsetDrawable(android.graphics.drawable.Drawable, int);













    ctor public InsetDrawable(android.graphics.drawable.Drawable, float);















    ctor public InsetDrawable(android.graphics.drawable.Drawable, int, int, int, int);













    ctor public InsetDrawable(android.graphics.drawable.Drawable, float, float, float, float);















  }





























  public class LayerDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {

























core/res/res/drawable/sym_def_app_icon.xml



+8
−1




























Original line number
Diff line number
Diff line















<?xml version="1.0" encoding="utf-8"?>















<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">















    <background android:drawable="@android:color/white" />













    <foreground android:drawable="@mipmap/sym_def_app_icon_maskable" />













    <foreground>













        <inset android:insetLeft="27.7%"













            android:insetTop="27.7%"













            android:insetRight="27.7%"













            android:insetBottom="27.7%">













            <bitmap android:src="@mipmap/sym_def_app_icon"/>













        </inset>













    </foreground>















</adaptive-icon>
























core/res/res/values/attrs.xml



+5
−5




























Original line number
Diff line number
Diff line








@@ -5767,11 +5767,11 @@













    <declare-styleable name="InsetDrawable">















        <attr name="visible" />















        <attr name="drawable" />













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













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













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













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













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













        <attr name="inset"  format="fraction|dimension"/>













        <attr name="insetLeft" format="fraction|dimension" />













        <attr name="insetRight" format="fraction|dimension" />













        <attr name="insetTop" format="fraction|dimension" />













        <attr name="insetBottom" format="fraction|dimension" />















    </declare-styleable>































    <!-- Drawable used to draw bitmaps. -->