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

Commit a0bfa932 authored by Matt Garnes's avatar Matt Garnes
Browse files

Merge branch 'staging/cm-12.1' into caf/cm-12.1. 

Conflicts:
	res/values-zh-rCN/cm_strings.xml

Change-Id: Id689871ef23dd272ddaf4f366d9f59b251bde208
parents 34e3e3a0 4908c7ab

AndroidManifest.xml

+1 −2
Original line number Diff line number Diff line 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.deskclock"

        android:versionCode="302" android:versionName="3.0.2">

        android:versionCode="303" android:versionName="3.0.3">



    <original-package android:name="com.android.alarmclock" />

    <original-package android:name="com.android.deskclock" />
@@ -161,7 +161,6 @@ 
                <action android:name="android.intent.action.SCREEN_ON" />

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

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

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

                <action android:name="android.app.action.NEXT_ALARM_CLOCK_CHANGED" />

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

                </intent-filter>

res/animator/ic_alarm_animation_button.xml

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

    <set

        android:ordering="sequentially" >

        <objectAnimator

            android:duration="33"

            android:propertyName="rotation"

            android:valueFrom="0"

            android:valueTo="8"

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

        <objectAnimator

            android:duration="67"

            android:propertyName="rotation"

            android:valueFrom="8"

            android:valueTo="-8"

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

        <objectAnimator

            android:duration="67"

            android:propertyName="rotation"

            android:valueFrom="-8"

            android:valueTo="8"

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

        <objectAnimator

            android:duration="67"

            android:propertyName="rotation"

            android:valueFrom="8"

            android:valueTo="-8"

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

        <objectAnimator

            android:duration="67"

            android:propertyName="rotation"

            android:valueFrom="-8"

            android:valueTo="8"

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

        <objectAnimator

            android:duration="67"

            android:propertyName="rotation"

            android:valueFrom="8"

            android:valueTo="-8"

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

        <objectAnimator

            android:duration="67"

            android:propertyName="rotation"

            android:valueFrom="-8"

            android:valueTo="8"

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

        <objectAnimator

            android:duration="67"

            android:propertyName="rotation"

            android:valueFrom="8"

            android:valueTo="-8"

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

        <objectAnimator

            android:duration="67"

            android:propertyName="rotation"

            android:valueFrom="-8"

            android:valueTo="8"

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

        <objectAnimator

            android:duration="67"

            android:propertyName="rotation"

            android:valueFrom="8"

            android:valueTo="-8"

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

        <objectAnimator

            android:duration="67"

            android:propertyName="rotation"

            android:valueFrom="-8"

            android:valueTo="8"

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

        <objectAnimator

            android:duration="67"

            android:propertyName="rotation"

            android:valueFrom="8"

            android:valueTo="-8"

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

        <objectAnimator

            android:duration="67"

            android:propertyName="rotation"

            android:valueFrom="-8"

            android:valueTo="8"

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

        <objectAnimator

            android:duration="67"

            android:propertyName="rotation"

            android:valueFrom="8"

            android:valueTo="-8"

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

        <objectAnimator

            android:duration="67"

            android:propertyName="rotation"

            android:valueFrom="-8"

            android:valueTo="8"

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

        <objectAnimator

            android:duration="67"

            android:propertyName="rotation"

            android:valueFrom="8"

            android:valueTo="-8"

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

        <objectAnimator

            android:duration="67"

            android:propertyName="rotation"

            android:valueFrom="-8"

            android:valueTo="8"

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

        <objectAnimator

            android:duration="67"

            android:propertyName="rotation"

            android:valueFrom="8"

            android:valueTo="-8"

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

        <objectAnimator

            android:duration="67"

            android:propertyName="rotation"

            android:valueFrom="-8"

            android:valueTo="8"

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

        <objectAnimator

            android:duration="67"

            android:propertyName="rotation"

            android:valueFrom="8"

            android:valueTo="-8"

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

        <objectAnimator

            android:duration="33"

            android:propertyName="rotation"

            android:valueFrom="-8"

            android:valueTo="0"

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

    </set>

</set>

res/drawable/alarm_tab.xml→res/animator/ic_clock_animation_second_hand.xml

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

<!-- Copyright (C) 2013 The Android Open Source Project

<!--

     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.
@@ -13,14 +14,12 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    <item android:state_focused="true" android:state_pressed="false"

          android:drawable="@drawable/ic_tab_alarm_activated" />

    <item android:state_focused="true" android:state_pressed="true"

          android:drawable="@drawable/ic_tab_alarm_activated" />

   <item android:state_focused="false" android:state_pressed="true"

         android:drawable="@drawable/ic_tab_alarm_activated" />

   <item android:state_selected="true"

         android:drawable="@drawable/ic_tab_alarm_activated" />

   <item android:drawable="@drawable/ic_tab_alarm_normal" />

</selector>
 


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

    <objectAnimator

        android:duration="1333"

        android:propertyName="rotation"

        android:valueFrom="0"

        android:valueTo="360"

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

</set>

res/drawable/clock_tab.xml→res/animator/ic_stopwatch_animation_button.xml

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

<!-- Copyright (C) 2012 The Android Open Source Project

<!--

     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.
@@ -13,14 +14,12 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    <item android:state_focused="true" android:state_pressed="false"    

          android:drawable="@drawable/ic_tab_clock_activated" />   

    <item android:state_focused="true" android:state_pressed="true"

          android:drawable="@drawable/ic_tab_clock_activated" />  

   <item android:state_focused="false" android:state_pressed="true"

         android:drawable="@drawable/ic_tab_clock_activated" /> 

   <item android:state_selected="true"

         android:drawable="@drawable/ic_tab_clock_activated" /> 

   <item android:drawable="@drawable/ic_tab_clock_normal" />

</selector>
 


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

    <objectAnimator

        android:duration="267"

        android:propertyXName="translateX"

        android:propertyYName="translateY"

        android:pathData="M 12,12 c 0,0.16667 0,1 0,1 l 0,-1 "

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

</set>

res/drawable/timer_tab.xml→res/animator/ic_stopwatch_animation_hand.xml

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

<!-- Copyright (C) 2012 The Android Open Source Project

<!--

     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.
@@ -13,14 +14,12 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    <item android:state_focused="true" android:state_pressed="false"    

          android:drawable="@drawable/ic_tab_timer_activated" />   

    <item android:state_focused="true" android:state_pressed="true"

          android:drawable="@drawable/ic_tab_timer_activated" />  

   <item android:state_focused="false" android:state_pressed="true"

         android:drawable="@drawable/ic_tab_timer_activated" /> 

   <item android:state_selected="true"

         android:drawable="@drawable/ic_tab_timer_activated" /> 

   <item android:drawable="@drawable/ic_tab_timer_normal" />

</selector>
 


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

    <objectAnimator

        android:duration="1333"

        android:propertyName="rotation"

        android:valueFrom="0"

        android:valueTo="360"

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

</set>