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

Commit 1712a903 authored by Jay Aliomer's avatar Jay Aliomer Committed by Automerger Merge Worker
Browse files

Merge "Implementing the new material ripple" into sc-dev am: d9b1c748 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13553701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2535f0505408582b0e6e1fe8bae47a4c73e62641
parents d7359a46 d9b1c748

core/api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -1185,6 +1185,7 @@ package android { 
    field public static final int right = 16843183; // 0x10101af

    field public static final int ringtonePreferenceStyle = 16842899; // 0x1010093

    field public static final int ringtoneType = 16843257; // 0x10101f9

    field public static final int rippleStyle = 16844337; // 0x1010631

    field public static final int rollbackDataPolicy = 16844311; // 0x1010617

    field public static final int rotation = 16843558; // 0x1010326

    field public static final int rotationAnimation = 16844090; // 0x101053a
@@ -16535,9 +16536,13 @@ package android.graphics.drawable { 
  public class RippleDrawable extends android.graphics.drawable.LayerDrawable {

    ctor public RippleDrawable(@NonNull android.content.res.ColorStateList, @Nullable android.graphics.drawable.Drawable, @Nullable android.graphics.drawable.Drawable);

    method public int getRadius();

    method public int getRippleStyle();

    method public void setColor(android.content.res.ColorStateList);

    method public void setRadius(int);

    method public void setRippleStyle(int) throws java.lang.IllegalArgumentException;

    field public static final int RADIUS_AUTO = -1; // 0xffffffff

    field public static final int STYLE_PATTERNED = 1; // 0x1

    field public static final int STYLE_SOLID = 0; // 0x0

  }















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

























core/res/res/drawable/btn_borderless_material.xml



+2
−1




























Original line number
Diff line number
Diff line








@@ -15,7 +15,8 @@













-->































<ripple xmlns:android="http://schemas.android.com/apk/res/android"













        android:color="?attr/colorControlHighlight">













        android:color="?attr/colorControlHighlight"













        android:rippleStyle="?attr/rippleStyle">















    <item android:id="@id/mask"















          android:drawable="@drawable/btn_default_mtrl_shape" />















</ripple>
























core/res/res/drawable/btn_colored_material.xml



+2
−1




























Original line number
Diff line number
Diff line








@@ -19,7 +19,8 @@













       android:insetTop="@dimen/button_inset_vertical_material"















       android:insetRight="@dimen/button_inset_horizontal_material"















       android:insetBottom="@dimen/button_inset_vertical_material">













    <ripple android:color="?attr/colorControlHighlight">













    <ripple android:color="?attr/colorControlHighlight"













            android:rippleStyle="?attr/rippleStyle">















        <item>















            <shape android:shape="rectangle"















                   android:tint="@color/btn_colored_background_material">

































core/res/res/drawable/btn_default_material.xml



+2
−1




























Original line number
Diff line number
Diff line








@@ -15,6 +15,7 @@













-->































<ripple xmlns:android="http://schemas.android.com/apk/res/android"













        android:color="?attr/colorControlHighlight">













        android:color="?attr/colorControlHighlight"













        android:rippleStyle="?attr/rippleStyle">















    <item android:drawable="@drawable/btn_default_mtrl_shape" />















</ripple>
























core/res/res/drawable/btn_toggle_material.xml



+2
−1




























Original line number
Diff line number
Diff line








@@ -21,7 +21,8 @@













       android:insetBottom="@dimen/button_inset_vertical_material">















    <layer-list android:paddingMode="stack">















        <item>













            <ripple android:color="?attr/colorControlHighlight">













            <ripple android:color="?attr/colorControlHighlight"













                android:rippleStyle="?attr/rippleStyle">















                <item>















                    <shape android:shape="rectangle"















                           android:tint="?attr/colorButtonNormal">