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

Commit 1cbfe6eb authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Use default cross-activity animation in Launcher Home Settings" into main

parents 103191c5 2e19e736

res/anim-v33/shared_x_axis_activity_close_enter.xml

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

<!--

  ~ Copyright (C) 2022 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:showBackdrop="true">



    <alpha

        android:fromAlpha="0.0"

        android:toAlpha="1.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/standard_decelerate_interpolator"

        android:startOffset="100"

        android:duration="350" />



    <translate

        android:fromXDelta="-25%"

        android:toXDelta="0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/emphasized_interpolator"

        android:startOffset="0"

        android:duration="450" />



</set>
 
 No newline at end of file

res/anim-v33/shared_x_axis_activity_close_exit.xml

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

<!--

  ~ Copyright (C) 2022 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">



    <alpha

        android:fromAlpha="1.0"

        android:toAlpha="0.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/standard_accelerate_interpolator"

        android:startOffset="0"

        android:duration="100" />



    <translate

        android:fromXDelta="0"

        android:toXDelta="25%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/emphasized_interpolator"

        android:startOffset="0"

        android:duration="450" />



</set>
 
 No newline at end of file

res/anim-v33/shared_x_axis_activity_open_enter.xml

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

<!--

  ~ Copyright (C) 2022 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:showBackdrop="true">



    <alpha

        android:fromAlpha="0.0"

        android:toAlpha="1.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/standard_decelerate_interpolator"

        android:startOffset="100"

        android:duration="350" />



    <translate

        android:fromXDelta="25%"

        android:toXDelta="0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/emphasized_interpolator"

        android:startOffset="0"

        android:duration="450" />



</set>
 
 No newline at end of file

res/anim-v33/shared_x_axis_activity_open_exit.xml

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

<!--

  ~ Copyright (C) 2022 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">



    <alpha

        android:fromAlpha="1.0"

        android:toAlpha="0.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/standard_accelerate_interpolator"

        android:startOffset="0"

        android:duration="100" />



    <translate

        android:fromXDelta="0"

        android:toXDelta="-25%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/emphasized_interpolator"

        android:startOffset="0"

        android:duration="450" />



</set>
 
 No newline at end of file

res/values-v33/style.xml

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

<!--

/*

* Copyright (C) 2022 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.

*/

-->



<resources>

    <style name="HomeSettings.Theme" parent="@android:style/Theme.DeviceDefault.Settings">

        <item name="android:listPreferredItemPaddingEnd">16dp</item>

        <item name="android:listPreferredItemPaddingStart">24dp</item>

        <item name="android:navigationBarColor">@android:color/transparent</item>

        <item name="android:statusBarColor">@android:color/transparent</item>

        <item name="android:switchStyle">@style/SwitchStyle</item>

        <item name="android:textAppearanceListItem">@style/HomeSettings.PreferenceTitle</item>

        <item name="android:windowActionBar">false</item>

        <item name="android:windowNoTitle">true</item>

        <item name="preferenceTheme">@style/HomeSettings.PreferenceTheme</item>

        <item name="android:windowAnimationStyle">@style/Animation.SharedBackground</item>

    </style>



    <style name="Animation.SharedBackground" parent="@android:style/Animation.Activity">

        <item name="android:activityOpenEnterAnimation">@anim/shared_x_axis_activity_open_enter</item>

        <item name="android:activityOpenExitAnimation">@anim/shared_x_axis_activity_open_exit</item>

        <item name="android:activityCloseEnterAnimation">@anim/shared_x_axis_activity_close_enter</item>

        <item name="android:activityCloseExitAnimation">@anim/shared_x_axis_activity_close_exit</item>

    </style>

</resources>
 
 No newline at end of file