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

Commit c2033107 authored by Annie Chin's avatar Annie Chin Committed by Android Git Automerger
Browse files

am 63330e51: Reset AlarmActivity animations on configuration change. 

* commit '63330e51':
  Reset AlarmActivity animations on configuration change.
parents 3e9d000a 63330e51

AndroidManifest.xml

+1 −2
Original line number Diff line number Diff line
@@ -99,8 +99,7 @@ 
                android:excludeFromRecents="true"

                android:theme="@style/AlarmAlertFullScreenTheme"

                android:windowSoftInputMode="stateAlwaysHidden"

                android:showOnLockScreen="true"

                android:configChanges="orientation|screenSize|keyboardHidden|keyboard|navigation"/>

                android:showOnLockScreen="true" />



        <activity android:name="ScreensaverActivity"

                android:excludeFromRecents="true"

src/com/android/deskclock/alarms/AlarmActivity.java

+3 −3
Original line number Diff line number Diff line
@@ -231,9 +231,6 @@ public class AlarmActivity extends AppCompatActivity 
        mPulseAnimator.setInterpolator(PULSE_INTERPOLATOR);

        mPulseAnimator.setRepeatCount(ValueAnimator.INFINITE);

        mPulseAnimator.start();



        // Set the animators to their initial values.

        setAnimatedFractions(0.0f /* snoozeFraction */, 0.0f /* dismissFraction */);

    }



    @Override
@@ -264,6 +261,9 @@ public class AlarmActivity extends AppCompatActivity 
            registerReceiver(mReceiver, filter);

            mReceiverRegistered = true;

        }



        // Set the animators to their initial values.

        setAnimatedFractions(0.0f /* snoozeFraction */, 0.0f /* dismissFraction */);

    }



    @Override