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

Commit cadc7a20 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Exploring transitions to/from Recents."

parents db6cf3a7 d42a6cfe
Loading
Loading
Loading
Loading
+8 −1
Original line number Original line Diff line number Diff line
@@ -2772,6 +2772,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
     */
     */
    public static final int NAVIGATION_BAR_TRANSLUCENT = 0x80000000;
    public static final int NAVIGATION_BAR_TRANSLUCENT = 0x80000000;
    /**
     * @hide
     *
     * Whether Recents is visible or not.
     */
    public static final int RECENT_APPS_VISIBLE = 0x00004000;
    /**
    /**
     * @hide
     * @hide
     *
     *
@@ -2782,7 +2789,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
    /**
    /**
     * @hide
     * @hide
     */
     */
    public static final int PUBLIC_STATUS_BAR_VISIBILITY_MASK = 0x00007FFF;
    public static final int PUBLIC_STATUS_BAR_VISIBILITY_MASK = 0x00003FFF;
    /**
    /**
     * These are the system UI flags that can be cleared by events outside
     * These are the system UI flags that can be cleared by events outside
+28 −0
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2012, 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="1.0"
         android:fillEnabled="true"
         android:fillBefore="true" android:fillAfter="true"
         android:interpolator="@android:interpolator/fast_out_slow_in"
         android:duration="0"/>
</set>
+30 −0
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2012, 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="normal">

    <!-- Animate the view out only after recents is visible -->
    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
           android:fillEnabled="true"
           android:fillBefore="true" android:fillAfter="true"
           android:interpolator="@android:interpolator/fast_out_slow_in"
           android:duration="1"/>
</set>
+3 −3
Original line number Original line Diff line number Diff line
@@ -20,9 +20,9 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
<set xmlns:android="http://schemas.android.com/apk/res/android"
     android:shareInterpolator="false"
     android:shareInterpolator="false"
     android:zAdjustment="top">
     android:zAdjustment="top">
  <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
  <alpha android:fromAlpha="1.0" android:toAlpha="1.0"
         android:fillEnabled="true"
         android:fillEnabled="true"
         android:fillBefore="true" android:fillAfter="true"
         android:fillBefore="true" android:fillAfter="true"
         android:interpolator="@android:interpolator/accelerate_cubic"
         android:interpolator="@android:interpolator/fast_out_slow_in"
         android:duration="250"/>
         android:duration="100"/>
</set>
</set>
+2 −2
Original line number Original line Diff line number Diff line
@@ -23,6 +23,6 @@
  <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
  <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
         android:fillEnabled="true"
         android:fillEnabled="true"
         android:fillBefore="true" android:fillAfter="true"
         android:fillBefore="true" android:fillAfter="true"
         android:interpolator="@android:interpolator/decelerate_cubic"
         android:interpolator="@android:interpolator/fast_out_slow_in"
         android:duration="250"/>
         android:duration="100"/>
</set>
</set>
Loading