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

Commit 47bf0d95 authored by Alan Viverette's avatar Alan Viverette
Browse files

Separate ripple animation logic, remove RevealDrawable 

Change-Id: I9d0370cea288e6caf518209b5bc94a66a0f9176f
parent 460572b2

api/current.txt

+3 −5
Original line number Diff line number Diff line
@@ -1519,6 +1519,7 @@ package android { 
    field public static final int inputExtractEditText = 16908325; // 0x1020025

    field public static final int keyboardView = 16908326; // 0x1020026

    field public static final int list = 16908298; // 0x102000a

    field public static final int mask = 16908335; // 0x102002f

    field public static final int message = 16908299; // 0x102000b

    field public static final int paste = 16908322; // 0x1020022

    field public static final int primary = 16908300; // 0x102000c
@@ -10757,10 +10758,6 @@ package android.graphics.drawable { 
    method public void setPicture(android.graphics.Picture);

  }













  public class RevealDrawable extends android.graphics.drawable.LayerDrawable {













    ctor public RevealDrawable(android.graphics.drawable.Drawable[]);













  }



























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















    ctor public RotateDrawable();















    method public void draw(android.graphics.Canvas);










@@ -10830,7 +10827,8 @@ package android.graphics.drawable {













    method public void addState(int[], android.graphics.drawable.Drawable);















  }



























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













  public class TouchFeedbackDrawable extends android.graphics.drawable.LayerDrawable {













    method public android.graphics.Rect getDirtyBounds();















  }





























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

























core/res/res/drawable/btn_borderless_quantum.xml



+4
−2




























Original line number
Diff line number
Diff line








@@ -15,5 +15,7 @@













-->































<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"













    android:tint="?attr/colorButtonPressed"













    android:mask="@drawable/btn_qntm_alpha" />












    android:tint="?attr/colorButtonPressed">













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













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













</touch-feedback>
























core/res/res/drawable/btn_default_quantum.xml



+4
−2




























Original line number
Diff line number
Diff line








@@ -16,6 +16,8 @@





























<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"















    android:tint="?attr/colorButtonPressed">













    <item>















        <nine-patch android:src="@drawable/btn_qntm_alpha"















            android:tint="?attr/colorButtonNormal" />













    </item>















</touch-feedback>
























core/res/res/values/attrs.xml



+1
−5




























Original line number
Diff line number
Diff line








@@ -4436,16 +4436,12 @@





























    <!-- Drawable used to show animated touch feedback. -->















    <declare-styleable name="TouchFeedbackDrawable">













        <!-- The tint to use for feedback ripples. This attribute is mandatory. -->













        <!-- The tint to use for feedback ripples. This attribute is required. -->















        <attr name="tint" />















        <!-- Specifies the Porter-Duff blending mode used to apply the tint. The default vlaue is src_atop, which draws over the opaque parts of the drawable. -->















        <attr name="tintMode" />















        <!-- Whether to pin feedback ripples to the center of the drawable. Default value is false. -->















        <attr name="pinned" format="boolean" />













        <!-- Optional drawable used to mask ripple bounds before projection. -->













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













        <!-- Optional drawable onto which ripples are projected. -->













        <attr name="drawable" />















    </declare-styleable>































    <declare-styleable name="ScaleDrawable">

































core/res/res/values/ids.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -83,4 +83,5 @@













  <item type="id" name="current_scene" />















  <item type="id" name="scene_layoutid_cache" />















  <item type="id" name="shared_element_name" />













  <item type="id" name="mask" />















</resources>