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

Commit 54717814 authored by Brandon Keely's avatar Brandon Keely Committed by Android (Google) Code Review
Browse files

Merge "Massaging framework window transitions."

parents 890a631e ef6d5e19

core/res/res/anim-sw600dp/activity_close_enter.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2009, 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.

*/

-->



<set xmlns:android="http://schemas.android.com/apk/res/android" android:zAdjustment="normal">

    <alpha android:fromAlpha="1.0" android:toAlpha="1.0"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:duration="@android:integer/config_shortAnimTime"/>

</set>
 
 No newline at end of file

core/res/res/anim-sw600dp/activity_close_exit.xml

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2009, 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.

*/

-->



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

        android:shareInterpolator="false"

        android:zAdjustment="top">

    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"

            android:interpolator="@interpolator/accelerate_decelerate"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:duration="@android:integer/config_shortAnimTime"/>

    <scale android:fromXScale="1.0" android:toXScale="1.1"

            android:fromYScale="1.0" android:toYScale="1.1"

            android:pivotX="50%p" android:pivotY="50%p"

            android:interpolator="@interpolator/accelerate_decelerate"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:duration="@android:integer/config_shortAnimTime"/>

</set>
 
 No newline at end of file

core/res/res/anim-sw600dp/activity_open_enter.xml

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2009, 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.

*/

-->



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

        android:shareInterpolator="false"

        android:zAdjustment="top">

    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"

            android:interpolator="@interpolator/accelerate_decelerate"

            android:fillEnabled="true"

            android:fillBefore="false" android:fillAfter="false"

            android:duration="@android:integer/config_shortAnimTime"/>

    <scale android:fromXScale="1.1" android:toXScale="1.0"

            android:fromYScale="1.1" android:toYScale="1.0"

            android:pivotX="50%p" android:pivotY="50%p"

            android:interpolator="@interpolator/accelerate_decelerate"

            android:fillEnabled="true"

            android:fillBefore="false" android:fillAfter="false"

            android:duration="@android:integer/config_shortAnimTime"/>

</set>
 
 No newline at end of file

core/res/res/anim-sw600dp/activity_open_exit.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2009, 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.

*/

-->



<set xmlns:android="http://schemas.android.com/apk/res/android" android:zAdjustment="normal">

    <alpha android:fromAlpha="1.0" android:toAlpha="1.0"

            android:fillEnabled="true" android:fillBefore="false" android:fillAfter="false"

            android:duration="@android:integer/config_shortAnimTime"/>

</set>
 
 No newline at end of file

core/res/res/anim-sw600dp/wallpaper_close_enter.xml

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2009, 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.

*/

-->



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

        android:detachWallpaper="true" android:shareInterpolator="false"

        android:zAdjustment="top">



        <alpha android:fromAlpha="0.0" android:toAlpha="1.0"

                android:interpolator="@interpolator/decelerate_cubic"

                android:fillEnabled="true"

                android:fillBefore="false" android:fillAfter="true"

                android:duration="@android:integer/config_shortAnimTime"/>



        <scale android:fromXScale="2.0" android:toXScale="1.0"

                android:fromYScale="0.1" android:toYScale="1.0"

                android:pivotX="50%p" android:pivotY="50%p"

                android:interpolator="@interpolator/decelerate_quint"

                android:fillEnabled="true"

                android:fillBefore="false" android:fillAfter="true"

                android:duration="@android:integer/config_shortAnimTime"/>



</set>
 
 No newline at end of file