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

Commit c96e3927 authored by ztenghui's avatar ztenghui Committed by Android (Google) Code Review
Browse files

Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev

parents ca517b97 2e17d2b2

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -588,6 +588,7 @@ package android { 
    field public static final int fastScrollThumbDrawable = 16843574; // 0x1010336

    field public static final int fastScrollTrackDrawable = 16843577; // 0x1010339

    field public static final int fillAfter = 16843197; // 0x10101bd

    field public static final int fillAlpha = 16843981; // 0x10104cd

    field public static final int fillBefore = 16843196; // 0x10101bc

    field public static final int fillColor = 16843806; // 0x101041e

    field public static final int fillEnabled = 16843343; // 0x101024f
@@ -1203,6 +1204,7 @@ package android { 
    field public static final int streamType = 16843273; // 0x1010209

    field public static final int stretchColumns = 16843081; // 0x1010149

    field public static final int stretchMode = 16843030; // 0x1010116

    field public static final int strokeAlpha = 16843980; // 0x10104cc

    field public static final int strokeColor = 16843808; // 0x1010420

    field public static final int strokeLineCap = 16843813; // 0x1010425

    field public static final int strokeLineJoin = 16843814; // 0x1010426

core/res/res/drawable/ic_corp_icon_badge.xml

+6 −4
Original line number Diff line number Diff line
@@ -20,11 +20,13 @@ Copyright (C) 2014 The Android Open Source Project 
        android:viewportHeight="64.0">



    <path

        android:fillColor="#33000000"

        android:pathData="M49.062,50.0m-14.0,0.0a14.0,14.0 0.0,1.0 1.0,28.0 0.0a14.0,14.0 0.0,1.0 1.0,-28.0 0.0"/>

        android:fillColor="#FF000000"

        android:pathData="M49.062,50.0m-14.0,0.0a14.0,14.0 0.0,1.0 1.0,28.0 0.0a14.0,14.0 0.0,1.0 1.0,-28.0 0.0"

        android:fillAlpha="0.2"/>

    <path

        android:fillColor="#33000000"

        android:pathData="M49.0,49.5m-14.0,0.0a14.0,14.0 0.0,1.0 1.0,28.0 0.0a14.0,14.0 0.0,1.0 1.0,-28.0 0.0"/>

        android:fillColor="#FF000000"

        android:pathData="M49.0,49.5m-14.0,0.0a14.0,14.0 0.0,1.0 1.0,28.0 0.0a14.0,14.0 0.0,1.0 1.0,-28.0 0.0"

        android:fillAlpha="0.2"/>

    <path

        android:pathData="M49.0,49.0m-14.0,0.0a14.0,14.0 0.0,1.0 1.0,28.0 0.0a14.0,14.0 0.0,1.0 1.0,-28.0 0.0"

        android:fillColor="#FF5722"/>

core/res/res/drawable/vector_drawable_progress_indeterminate_horizontal.xml

+2 −2
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ 
        android:translateY="5" >

        <group android:name="v21_pivot" >

            <group

                android:name="rectangle_path_1_position"

                android:alpha="0.1" >

                android:name="rectangle_path_1_position">

                <path

                    android:name="rectangle_path_1"

                    android:fillColor="?attr/colorControlActivated"

                    android:fillAlpha="0.1"

                    android:pathData="M -180.0 -1.0 l 360 0 l 0 2 l -360 0 Z" />

            </group>

            <group

core/res/res/values/attrs.xml

+6 −2
Original line number Diff line number Diff line
@@ -5286,8 +5286,6 @@ 
        <attr name="scaleX" />

        <!-- The amount to scale the group on X coordinate -->

        <attr name="scaleY" />

        <!-- The alpha of the group (0 is transparent and 1 is opaque) -->

        <attr name="alpha" />

    </declare-styleable>



    <!-- Defines the path used in VectorDrawables. -->
@@ -5298,8 +5296,14 @@ 
        <attr name="strokeWidth" format="float" />

        <!-- The color to stroke the path if not defined implies no stroke-->

        <attr name="strokeColor" format="color" />

        <!-- The opacity of a path stroke, as a value between 0 (completely transparent)

             and 1 (completely opaque) -->

        <attr name="strokeAlpha" format="float" />

        <!-- The color to fill the path if not defined implies no fill-->

        <attr name="fillColor" format="color" />

        <!-- The alpha of the path fill, as a value between 0 (completely transparent)

             and 1 (completely opaque)-->

        <attr name="fillAlpha" format="float" />

        <!-- The specification of the operations that define the path  -->

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

        <!-- The fraction of the path to trim from the start from 0 to 1 -->

core/res/res/values/public.xml

+2 −0
Original line number Diff line number Diff line
@@ -2291,6 +2291,8 @@ 
  <public type="attr" name="fragmentAllowEnterTransitionOverlap" />

  <public type="attr" name="fragmentAllowReturnTransitionOverlap" />

  <public type="attr" name="patternPathData" />

  <public type="attr" name="strokeAlpha" />

  <public type="attr" name="fillAlpha" />



  <public-padding type="dimen" name="l_resource_pad" end="0x01050010" />