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

Commit 22834cb0 authored by Gus Prevas's avatar Gus Prevas Committed by android-build-merger
Browse files

Merge "Updates Wear window animation styles." into nyc-dev 

am: bb8c3090

* commit 'bb8c3090':
  Updates Wear window animation styles.

Change-Id: I419f5d6c1277b24af5713cb1f4064fb4dd809a16
parents dc21c57a bb8c3090

core/res/res/anim/slide_in_micro.xml→core/res/res/anim/slide_in_enter_micro.xml

+7 −5
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

<!--

<!--

/* //device/apps/common/res/anim/slide_in_micro.xml

**

**

** Copyright 2014, The Android Open Source Project

** Copyright 2014, The Android Open Source Project

**

**
@@ -18,10 +17,13 @@ 
*/

*/

-->

-->





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

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

    <translate android:fromXDelta="100%p" android:toXDelta="0"

     android:zAdjustment="top">

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

    <translate android:fromYDelta="5%p" android:toXDelta="0"

               android:duration="417"

               android:interpolator="@android:interpolator/launch_task_micro_ydelta" />

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

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

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

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

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

           android:duration="150"

           android:interpolator="@android:interpolator/launch_task_micro_alpha" />

</set>
 
</set>

core/res/res/anim/slide_in_exit_micro.xml

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

<!--

/*

** Copyright 2016, 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="normal">

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

            android:duration="417" />

</set>

core/res/res/anim/slide_out_micro.xml

+7 −4
Original line number Original line Diff line number Diff line
@@ -18,10 +18,13 @@ 
*/

*/

-->

-->





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

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

    <translate android:fromXDelta="0" android:toXDelta="100%p"

     android:zAdjustment="top">

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

    <translate android:fromYDelta="0" android:toYDelta="5%p"

               android:duration="250"

               android:interpolator="@android:interpolator/fast_out_slow_in"/>

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

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

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

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

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

           android:startOffset="100" android:duration="150"

           android:interpolator="@android:interpolator/fast_out_slow_in" />

</set>
 
</set>

core/res/res/interpolator/launch_task_micro_alpha.xml

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

<!--

/*

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

*/

-->



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

                  android:controlX1="0"

                  android:controlY1="0"

                  android:controlX2="0.7"

                  android:controlY2="1" />

core/res/res/interpolator/launch_task_micro_ydelta.xml

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

<!--

/*

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

*/

-->



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

                  android:controlX1="0"

                  android:controlY1="0"

                  android:controlX2="0.4"

                  android:controlY2="1" />