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

Commit 810ed89c authored by Vinod Krishnan's avatar Vinod Krishnan Committed by Android (Google) Code Review
Browse files

Merge "Adding activity enter/exit animations for wearables" into klp-modular-dev

parents 73da981f 87224df1

core/res/res/anim/slide_in_micro.xml

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

<!--

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

**

** 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.

*/

-->



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

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

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

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

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

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

</set>

core/res/res/anim/slide_out_micro.xml

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

<!--

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

**

** 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.

*/

-->



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

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

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

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

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

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

</set>

core/res/res/values/styles.xml

+0 −8
Original line number Diff line number Diff line
@@ -225,14 +225,6 @@ please see styles_device_defaults.xml. 
        <item name="windowExitAnimation">@anim/fast_fade_out</item>

    </style>



    <!-- Window animations for swipe-dismissable windows. {@hide} -->

    <style name="Animation.SwipeDismiss">

        <item name="taskOpenEnterAnimation">@anim/swipe_window_enter</item>

        <item name="taskOpenExitAnimation">@anim/swipe_window_exit</item>

        <item name="taskCloseEnterAnimation">@anim/swipe_window_enter</item>

        <item name="taskCloseExitAnimation">@anim/swipe_window_exit</item>

    </style>



    <!-- Status Bar Styles -->

    <style name="TextAppearance.StatusBar">

        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>

core/res/res/values/styles_micro.xml

+13 −0
Original line number Diff line number Diff line
@@ -14,6 +14,19 @@ 
     limitations under the License.

-->

<resources>

    <style name="Animation.Micro"/>



    <style name="Animation.Micro.Activity" parent="Animation.Holo.Activity">

        <item name="activityOpenEnterAnimation">@anim/slide_in_micro</item>

        <item name="activityOpenExitAnimation">@null</item>

        <item name="activityCloseEnterAnimation">@null</item>

        <item name="activityCloseExitAnimation">@anim/slide_out_micro</item>

        <item name="taskOpenEnterAnimation">@anim/slide_in_micro</item>

        <item name="taskOpenExitAnimation">@null</item>

        <item name="taskCloseEnterAnimation">@null</item>

        <item name="taskCloseExitAnimation">@anim/slide_out_micro</item>

    </style>



    <style name="AlertDialog.Micro" parent="AlertDialog.Holo.Light">

        <item name="fullDark">@null</item>

        <item name="topDark">@null</item>

core/res/res/values/themes_micro.xml

+3 −4
Original line number Diff line number Diff line
@@ -19,9 +19,8 @@ 
        <item name="alertDialogStyle">@style/AlertDialog.Micro</item>

        <item name="dialogTheme">@style/Theme.Micro.Dialog</item>

        <item name="textViewStyle">@style/Widget.Micro.TextView</item>



        <item name="numberPickerStyle">@style/Widget.Micro.NumberPicker</item>

        <item name="windowAnimationStyle">@style/Animation.SwipeDismiss</item>

        <item name="windowAnimationStyle">@style/Animation.Micro.Activity</item>

        <item name="windowBackground">@color/black</item>

        <item name="windowContentOverlay">@null</item>

        <item name="windowIsFloating">false</item>
@@ -35,7 +34,7 @@ 
        <item name="dialogTheme">@style/Theme.Micro.Dialog</item>

        <item name="textViewStyle">@style/Widget.Micro.TextView</item>

        <item name="numberPickerStyle">@style/Widget.Micro.NumberPicker</item>

        <item name="windowAnimationStyle">@style/Animation.SwipeDismiss</item>

        <item name="windowAnimationStyle">@style/Animation.Micro.Activity</item>

        <item name="windowBackground">@color/white</item>

        <item name="windowContentOverlay">@null</item>

        <item name="windowIsFloating">false</item>