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

Commit b790e6ba authored by Justin Klaassen's avatar Justin Klaassen
Browse files

Merge remote-tracking branch 'goog/ub-deskclock-dazzle' into master 

* goog/ub-deskclock-dazzle: (113 commits)
  Fix snooze event tracking
  Rebuild notifications after app upgrade
  Fire timers as scheduled after app upgrade
  Create AlarmObserverPreL in onCreate
  Handle deleted timers gracefully
  Fix alarm not firing in memory-pressure situations
  Promote TimerService to the foreground while expired timers exist
  Match firing alarms for SEARCH_MODE == alarm.next
  Fix alarm icon cut off in 1x4 digital widget on nexus 5
  Import translations. DO NOT MERGE
  Attempt to avoid early death of AlarmService
  Import translations. DO NOT MERGE
  Pausing an expired timer should reset it
  Import translations. DO NOT MERGE
  Fix alarm query
  Allow authority to be set from build configuration - DO NOT MERGE
  Make analog widget 2x2
  Import translations. DO NOT MERGE
  Do not attempt to display deleted timer
  Import translations. DO NOT MERGE
  ...

Change-Id: I264a5c20274b0f1e4d6c6bb1ad8c682d80a95234
parents ecd5f039 e5cf47c1

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ LOCAL_OVERRIDES_PACKAGES := AlarmClock 
LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_STATIC_JAVA_LIBRARIES := android-opt-datetimepicker

LOCAL_STATIC_JAVA_LIBRARIES += messageformat

LOCAL_STATIC_JAVA_LIBRARIES += android-support-design

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat
@@ -37,5 +38,6 @@ LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat 
LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.gridlayout

LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.recyclerview

LOCAL_AAPT_FLAGS += --extra-packages com.android.datetimepicker

LOCAL_AAPT_FLAGS += --extra-packages com.android.messageformat



include $(BUILD_PACKAGE)

AndroidManifest.xml

+16 −43
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ 
                <category android:name="android.intent.category.VOICE" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.deskclock.action.STOP_TIMER" />

                <action android:name="com.android.deskclock.action.PAUSE_TIMER" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE" />

            </intent-filter>
@@ -214,7 +214,7 @@ 
                <category android:name="android.intent.category.VOICE" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.deskclock.action.STOP_STOPWATCH" />

                <action android:name="com.android.deskclock.action.PAUSE_STOPWATCH" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE" />

            </intent-filter>
@@ -266,7 +266,7 @@ 
                <action android:name="android.intent.action.DATE_CHANGED"/>

                <action android:name="android.intent.action.LOCALE_CHANGED"/>

                <action android:name="android.intent.action.TIMEZONE_CHANGED"/>

                <action android:name="com.android.deskclock.CITIES_CHANGED"/>

                <action android:name="com.android.deskclock.DIGITAL_WIDGET_CHANGED"/>

                <action android:name="com.android.deskclock.ON_QUARTER_HOUR"/>

                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>

                <action android:name="android.app.action.NEXT_ALARM_CLOCK_CHANGED"/>
@@ -313,60 +313,33 @@ 
            android:label="@string/dismiss_alarm"

            android:theme="@android:style/Theme.Holo.Light.Dialog.NoActionBar"/>



        <!-- This activity is basically like the TimerFragment in DeskClock

         but only during lock screen

         so that it only has the fired timers -->

        <activity android:name="com.android.deskclock.timer.TimerAlertFullScreen"

        <!-- This activity displays only the timers that have expired with only a reset button

         present. This makes the activity appropriate for display above the lock screen so that

         users have the limited ability to silence expired timers but nothing else. -->

        <activity android:name=".timer.ExpiredTimersActivity"

                android:excludeFromRecents="true"

                android:theme="@style/TimerAlertFullScreenTheme"

                android:theme="@style/ExpiredTimersActivityTheme"

                android:launchMode="singleInstance"

                android:showOnLockScreen="true"

                android:taskAffinity=""

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



        <service android:name="TimerRingService"

                android:exported="false"

                android:description="@string/timer_ring_service_desc">

            <intent-filter>

                <action android:name="com.android.deskclock.TIMER_ALERT" />

            </intent-filter>

        </service>



        <!-- Legacy broadcast receiver that honors old scheduled timers across app upgrade. -->

        <receiver android:name="com.android.deskclock.timer.TimerReceiver"

                  android:exported="false">

            <intent-filter>

                <action android:name="start_timer" />

                <action android:name="stop_timer" />

                <action android:name="delete_timer" />

                <action android:name="reset_timer" />

                <action android:name="times_up" />

                <action android:name="timer_done" />

                <action android:name="timer_update" />

                <action android:name="notif_in_use_show" />

                <action android:name="notif_in_use_cancel" />

                <action android:name="notif_times_up_stop" />

                <action android:name="notif_times_up_plus_one" />

                <action android:name="notif_times_up_show" />

                <action android:name="notif_times_up_cancel" />

                <action android:name="notif_pause_timer" />

                <action android:name="notif_plus_one_timer" />

                <action android:name="notif_resume_timer" />

                <action android:name="notif_reset_timer" />

                <action android:name="notif_reset_all_timers" />

                <action android:name="notif_update" />

            </intent-filter>

        </receiver>



        <service android:name="com.android.deskclock.stopwatch.StopwatchService"

        <service android:name=".timer.TimerService"

                 android:exported="false"

                 android:description="@string/timer_service_desc">

        </service>



        <service android:name=".stopwatch.StopwatchService"

                android:exported="false"

                android:description="@string/stopwatch_service_desc">

            <intent-filter>

                <action android:name="start_stopwatch" />

                <action android:name="lap_stopwatch" />

                <action android:name="stop_stopwatch" />

                <action android:name="reset_stopwatch" />

                <action android:name="share_stopwatch" />

            </intent-filter>

        </service>

    </application>

</manifest>

build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ android { 
        compile (project(":android-opt-datetimepicker")) {

            exclude module: "support-v4"

        }

        compile project(":messageformat")

        compile project(":support-design")

        compile project(":support-v7-appcompat")

        compile project(":support-v7-gridlayout")

res/animator-v22/ic_alarm_animation_button.xml

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

<!--

     Copyright (C) 2014 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:ordering="sequentially">

    <objectAnimator

        android:duration="33"

        android:interpolator="@android:interpolator/fast_out_slow_in"

        android:propertyName="rotation"

        android:valueFrom="0"

        android:valueTo="8"/>

    <objectAnimator

        android:duration="67"

        android:interpolator="@android:interpolator/fast_out_slow_in"

        android:propertyName="rotation"

        android:valueFrom="8"

        android:valueTo="-8"/>

    <objectAnimator

        android:duration="67"

        android:interpolator="@android:interpolator/fast_out_slow_in"

        android:propertyName="rotation"

        android:valueFrom="-8"

        android:valueTo="8"/>

    <objectAnimator

        android:duration="67"

        android:interpolator="@android:interpolator/fast_out_slow_in"

        android:propertyName="rotation"

        android:valueFrom="8"

        android:valueTo="-8"/>

    <objectAnimator

        android:duration="67"

        android:interpolator="@android:interpolator/fast_out_slow_in"

        android:propertyName="rotation"

        android:valueFrom="-8"

        android:valueTo="8"/>

    <objectAnimator

        android:duration="67"

        android:interpolator="@android:interpolator/fast_out_slow_in"

        android:propertyName="rotation"

        android:valueFrom="8"

        android:valueTo="-8"/>

    <objectAnimator

        android:duration="67"

        android:interpolator="@android:interpolator/fast_out_slow_in"

        android:propertyName="rotation"

        android:valueFrom="-8"

        android:valueTo="8"/>

    <objectAnimator

        android:duration="67"

        android:interpolator="@android:interpolator/fast_out_slow_in"

        android:propertyName="rotation"

        android:valueFrom="8"

        android:valueTo="-8"/>

    <objectAnimator

        android:duration="33"

        android:interpolator="@android:interpolator/fast_out_slow_in"

        android:propertyName="rotation"

        android:valueFrom="-8"

        android:valueTo="0"/>

</set>
 
 No newline at end of file

res/animator-v22/ic_clock_hour_hand_animation.xml

0 → 100644
+187 −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" >

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="166"

            android:propertyName="translateX"

            android:valueFrom="117.75"

            android:valueTo="116.68351"

            android:valueType="floatType"

            android:interpolator="@interpolator/ic_clock_animation_interpolator_1" />

        <objectAnimator

            android:duration="41"

            android:propertyName="translateX"

            android:valueFrom="116.68351"

            android:valueTo="116.2544"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="166"

            android:propertyName="translateX"

            android:valueFrom="116.2544"

            android:valueTo="115.10072"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="20"

            android:propertyName="translateX"

            android:valueFrom="115.10072"

            android:valueTo="114.59167"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="20"

            android:propertyName="translateX"

            android:valueFrom="114.59167"

            android:valueTo="114.07271"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="20"

            android:propertyName="translateX"

            android:valueFrom="114.07271"

            android:valueTo="113.92814"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="20"

            android:propertyName="translateX"

            android:valueFrom="113.92814"

            android:valueTo="114.75237"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="20"

            android:propertyName="translateX"

            android:valueFrom="114.75237"

            android:valueTo="114.32657"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="20"

            android:propertyName="translateX"

            android:valueFrom="114.32657"

            android:valueTo="114.52556"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="83"

            android:propertyName="translateX"

            android:valueFrom="114.52556"

            android:valueTo="114.26022"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="250"

            android:propertyName="translateX"

            android:valueFrom="114.26022"

            android:valueTo="114.25"

            android:valueType="floatType"

            android:interpolator="@interpolator/ic_clock_animation_interpolator_0" />

    </set>

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="166"

            android:propertyName="translateY"

            android:valueFrom="128.25"

            android:valueTo="128.05357"

            android:valueType="floatType"

            android:interpolator="@interpolator/ic_clock_animation_interpolator_1" />

        <objectAnimator

            android:duration="41"

            android:propertyName="translateY"

            android:valueFrom="128.05357"

            android:valueTo="127.39493"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="166"

            android:propertyName="translateY"

            android:valueFrom="127.39493"

            android:valueTo="125.76069"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="20"

            android:propertyName="translateY"

            android:valueFrom="125.76069"

            android:valueTo="125.76442"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="20"

            android:propertyName="translateY"

            android:valueFrom="125.76442"

            android:valueTo="125.38347"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="20"

            android:propertyName="translateY"

            android:valueFrom="125.38347"

            android:valueTo="125.00182"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="20"

            android:propertyName="translateY"

            android:valueFrom="125.00182"

            android:valueTo="125.27592"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="20"

            android:propertyName="translateY"

            android:valueFrom="125.27592"

            android:valueTo="125.10044"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="20"

            android:propertyName="translateY"

            android:valueFrom="125.10044"

            android:valueTo="124.92464"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="83"

            android:propertyName="translateY"

            android:valueFrom="124.92464"

            android:valueTo="124.41091"

            android:valueType="floatType"

            android:interpolator="@android:interpolator/linear" />

        <objectAnimator

            android:duration="250"

            android:propertyName="translateY"

            android:valueFrom="124.41091"

            android:valueTo="124.0"

            android:valueType="floatType"

            android:interpolator="@interpolator/ic_clock_animation_interpolator_0" />

    </set>

    <objectAnimator

        android:duration="833"

        android:propertyName="rotation"

        android:valueFrom="0.0"

        android:valueTo="121.0"

        android:valueType="floatType"

        android:interpolator="@android:interpolator/fast_out_slow_in" />

</set>