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

Commit 93dcc45e authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Add attribute for controlling ripple radius"

parents 682c8e50 88d44d4a

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -12071,7 +12071,10 @@ package android.graphics.drawable { 














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















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













    method public int getRadius();















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













    method public void setRadius(int);













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















  }





























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

























api/system-current.txt



+3
−0




























Original line number
Diff line number
Diff line








@@ -12345,7 +12345,10 @@ package android.graphics.drawable {



























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















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













    method public int getRadius();















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













    method public void setRadius(int);













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















  }





























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

























core/res/res/drawable/action_bar_item_background_material.xml
0 → 100644



+19
−0




























Original line number
Diff line number
Diff line













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













<!-- Copyright (C) 2015 The Android Open Source Project



























     Licensed under the Apache License, Version 2.0 (the "License");













     you may not use this file except in compliance with the License.













     You may obtain a copy of the License at



























          http://www.apache.org/licenses/LICENSE-2.0



























     Unless required by applicable law or agreed to in writing, software













     distributed under the License is distributed on an "AS IS" BASIS,













     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













     See the License for the specific language governing permissions and













     limitations under the License.













-->



























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













        android:color="?attr/colorControlHighlight"













        android:radius="20dp" />
























core/res/res/drawable/control_background_material.xml



+2
−1




























Original line number
Diff line number
Diff line








@@ -15,4 +15,5 @@













-->































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













        android:color="@color/control_highlight_material" />












        android:color="@color/control_highlight_material"













        android:radius="20dp" />
























core/res/res/values/attrs.xml



+3
−0




























Original line number
Diff line number
Diff line








@@ -5291,6 +5291,9 @@













    <declare-styleable name="RippleDrawable">















        <!-- The color to use for ripple effects. This attribute is required. -->















        <attr name="color" />













        <!-- The radius of the ripple when fully expanded. By default, the













             radius is computed based on the size of the ripple's container. -->













        <attr name="radius" />















    </declare-styleable>































    <declare-styleable name="ScaleDrawable">