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

Commit 42ef93fc authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1 

* commit '33ace979':
  Remove fade animations from framework drawables.
parents 1fbc85d3 33ace979

core/res/res/drawable/activated_background.xml

+1 −2
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
     limitations under the License.

-->



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

        android:exitFadeDuration="@android:integer/config_mediumAnimTime">

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

    <item android:state_activated="true" android:drawable="@android:drawable/list_selector_background_selected" />

    <item android:drawable="@color/transparent" />

</selector>

core/res/res/drawable/activated_background_holo_dark.xml

+1 −2
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
     limitations under the License.

-->



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

        android:exitFadeDuration="@android:integer/config_mediumAnimTime">

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

    <item android:state_activated="true" android:drawable="@android:drawable/list_activated_holo" />

    <item android:drawable="@color/transparent" />

</selector>

core/res/res/drawable/activated_background_holo_light.xml

+1 −2
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
     limitations under the License.

-->



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

        android:exitFadeDuration="@android:integer/config_mediumAnimTime">

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

    <item android:state_activated="true" android:drawable="@android:drawable/list_activated_holo" />

    <item android:drawable="@color/transparent" />

</selector>

core/res/res/drawable/activated_background_light.xml

+1 −2
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
     limitations under the License.

-->



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

        android:exitFadeDuration="@android:integer/config_mediumAnimTime">

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

    <item android:state_activated="true" android:drawable="@drawable/list_selector_background_selected_light" />

    <item android:drawable="@color/transparent" />

</selector>

core/res/res/drawable/btn_cab_done_holo_dark.xml

+1 −2
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
     limitations under the License.

-->



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

          android:exitFadeDuration="@android:integer/config_mediumAnimTime">

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

    <item android:state_pressed="true"

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

    <item android:state_focused="true" android:state_enabled="true"