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

Commit b281e071 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Sharesheet - alter entrance animation" into qt-dev

parents f47630e7 a8d026e5

core/res/res/anim/resolver_close_anim.xml

0 → 100644
+28 −0
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:interpolator="@anim/accelerate_interpolator"

     android:zAdjustment="top">



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

               android:fromYDelta="0"

               android:toYDelta="100%"

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

</set>

core/res/res/anim/resolver_launch_anim.xml

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

<!--

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

  -->



<!-- Animation for when a dock window at the bottom of the screen is entering. -->

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

     android:interpolator="@anim/accelerate_decelerate_interpolator"

     android:zAdjustment="top">



    <translate android:fromYDelta="100%"

               android:toYDelta="0"

               android:startOffset="@android:integer/config_shortAnimTime"

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

</set>
 
 No newline at end of file

core/res/res/values/symbols.xml

+3 −1
Original line number Diff line number Diff line
@@ -3787,6 +3787,8 @@ 
  <java-symbol type="dimen" name="chooser_direct_share_label_placeholder_max_width" />

  <java-symbol type="layout" name="chooser_az_label_row" />

  <java-symbol type="string" name="chooser_all_apps_button_label" />

  <java-symbol type="anim" name="resolver_launch_anim" />

  <java-symbol type="style" name="Animation.DeviceDefault.Activity.Resolver" />

  

  <java-symbol type="string" name="config_defaultSupervisionProfileOwnerComponent" />

</resources>

core/res/res/values/themes_device_defaults.xml

+9 −2
Original line number Diff line number Diff line
@@ -1667,8 +1667,7 @@ easier. 


    <!-- Theme used for the intent picker activity. -->

    <style name="Theme.DeviceDefault.ResolverCommon" parent="Theme.DeviceDefault.DayNight">

        <item name="windowEnterTransition">@empty</item>

        <item name="windowExitTransition">@empty</item>

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

        <item name="windowIsTranslucent">true</item>

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

        <item name="windowBackground">@color/transparent</item>
@@ -1682,6 +1681,14 @@ easier. 
        <item name="navigationBarDividerColor">@color/chooser_row_divider</item>

    </style>



    <style name="Animation.DeviceDefault.Activity.Resolver" parent="Animation.DeviceDefault.Activity">

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

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

        <!-- Handle close for profile switching -->

        <item name="activityOpenExitAnimation">@anim/resolver_close_anim</item>

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

    </style>



    <style name="Theme.DeviceDefault.Resolver" parent="Theme.DeviceDefault.ResolverCommon">

        <item name="windowLightNavigationBar">true</item>

    </style>