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

Commit 6191fa20 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Replace toast with snackbar when applicable." into ub-deskclock-dazzle

parents 7fbba058 7c955e74

res/animator/fade_in.xml

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

<!--

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

  -->

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

    android:valueFrom="0.0"

    android:valueTo="1.0"

    android:propertyName="alpha"

    android:interpolator="@android:interpolator/decelerate_quad"

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

res/animator/fade_out.xml

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

<!--

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

  -->

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

    android:valueFrom="1.0"

    android:valueTo="0.0"

    android:propertyName="alpha"

    android:interpolator="@android:interpolator/decelerate_quad"

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

res/drawable-hdpi/panel_undo_holo.9.png

deleted100644 → 0
−599 B
Loading image diff...

res/drawable-mdpi/panel_undo_holo.9.png

deleted100644 → 0
−374 B
Loading image diff...

res/layout-sw600dp-land/alarm_clock.xml

+0 −20
Original line number Diff line number Diff line
@@ -40,24 +40,4 @@ 


    <include layout="@layout/alarm_empty_view" />



    <FrameLayout

        android:id="@+id/undo_frame"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="gone">



        <com.android.deskclock.widget.ActionableToastBar

            android:id="@+id/undo_bar"

            style="@style/ToastBarStyle"

            android:layout_width="match_parent"

            android:layout_height="64dip"

            android:layout_gravity="bottom"

            android:layout_marginBottom="96dp"

            android:layout_marginLeft="@dimen/alarm_undo_bar_horizontal_margin"

            android:layout_marginStart="@dimen/alarm_undo_bar_horizontal_margin"

            android:layout_marginRight="@dimen/alarm_undo_bar_horizontal_margin"

            android:layout_marginEnd="@dimen/alarm_undo_bar_horizontal_margin" />



    </FrameLayout>



</FrameLayout>