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

Commit ed76e59e authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev

parents 34450932 ff41a9a5

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -1415,7 +1415,7 @@ 
            android:theme="@style/Theme.ConfirmDeviceCredentials"/>



        <activity android:name="ConfirmLockPassword"

            android:windowSoftInputMode="adjustResize"

            android:windowSoftInputMode="stateHidden|adjustResize"

            android:theme="@style/Theme.ConfirmDeviceCredentials"/>



        <activity android:name=".fingerprint.FingerprintSettings" android:exported="false"/>

res/anim/confirm_credential_close_enter.xml

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

<!--

  ~ Copyright (C) 2015 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="0.0" android:toAlpha="1.0"

      android:interpolator="@*android:interpolator/decelerate_quart"

      android:fillEnabled="true"

      android:fillBefore="false" android:fillAfter="true"

      android:duration="200"/>

  <translate android:fromYDelta="8%" android:toYDelta="0"

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

      android:interpolator="@*android:interpolator/decelerate_quint"

      android:duration="350"/>

</set>

res/anim/confirm_credential_close_exit.xml

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

<!--

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

  -->



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

    android:interpolator="@android:interpolator/linear_out_slow_in"

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

    android:duration="350" />

res/anim/confirm_credential_open_enter.xml

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

<!--

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

  -->



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

    android:interpolator="@android:interpolator/linear_out_slow_in"

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

    android:duration="160" />

res/anim/confirm_credential_open_exit.xml

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

<!--

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

  -->



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

    android:fromAlpha="1.0" android:toAlpha="1.0"

    android:duration="160" />