am 51776ec6: am 22147db9: Animating tab icons
* commit '51776ec67720dd98a1aa65b9da7cd27cf3796d83':
Animating tab icons
diff --git a/res/animator/ic_alarm_animation_button.xml b/res/animator/ic_alarm_animation_button.xml
new file mode 100644
index 0000000..83465d3
--- /dev/null
+++ b/res/animator/ic_alarm_animation_button.xml
@@ -0,0 +1,148 @@
+<?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>
diff --git a/res/animator/ic_clock_animation_second_hand.xml b/res/animator/ic_clock_animation_second_hand.xml
new file mode 100644
index 0000000..a98e6df
--- /dev/null
+++ b/res/animator/ic_clock_animation_second_hand.xml
@@ -0,0 +1,25 @@
+<?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" >
+ <objectAnimator
+ android:duration="1333"
+ android:propertyName="rotation"
+ android:valueFrom="0"
+ android:valueTo="360"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/res/animator/ic_stopwatch_animation_button.xml b/res/animator/ic_stopwatch_animation_button.xml
new file mode 100644
index 0000000..27e00cf
--- /dev/null
+++ b/res/animator/ic_stopwatch_animation_button.xml
@@ -0,0 +1,25 @@
+<?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" >
+ <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>
diff --git a/res/animator/ic_stopwatch_animation_hand.xml b/res/animator/ic_stopwatch_animation_hand.xml
new file mode 100644
index 0000000..a98e6df
--- /dev/null
+++ b/res/animator/ic_stopwatch_animation_hand.xml
@@ -0,0 +1,25 @@
+<?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" >
+ <objectAnimator
+ android:duration="1333"
+ android:propertyName="rotation"
+ android:valueFrom="0"
+ android:valueTo="360"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/res/animator/ic_timer_animation_hourglass_fill.xml b/res/animator/ic_timer_animation_hourglass_fill.xml
new file mode 100644
index 0000000..2a1fc46
--- /dev/null
+++ b/res/animator/ic_timer_animation_hourglass_fill.xml
@@ -0,0 +1,25 @@
+<?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" >
+ <objectAnimator
+ android:duration="333"
+ android:propertyName="rotation"
+ android:valueFrom="0"
+ android:valueTo="180"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/res/animator/ic_timer_animation_hourglass_frame.xml b/res/animator/ic_timer_animation_hourglass_frame.xml
new file mode 100644
index 0000000..2a1fc46
--- /dev/null
+++ b/res/animator/ic_timer_animation_hourglass_frame.xml
@@ -0,0 +1,25 @@
+<?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" >
+ <objectAnimator
+ android:duration="333"
+ android:propertyName="rotation"
+ android:valueFrom="0"
+ android:valueTo="180"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+</set>
diff --git a/res/animator/ic_timer_animation_mask_1.xml b/res/animator/ic_timer_animation_mask_1.xml
new file mode 100644
index 0000000..2e331a7
--- /dev/null
+++ b/res/animator/ic_timer_animation_mask_1.xml
@@ -0,0 +1,36 @@
+<?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="333"
+ android:propertyName="pathData"
+ android:valueFrom="M 24,13.3999938965 c 0,0.0 -24,0.0 -24,0.0 c 0,0.0 0,10.6000061035 0,10.6000061035 c 0,0 24,0 24,0 c 0,0 0,-10.6000061035 0,-10.6000061035 Z"
+ android:valueTo="M 24,13.3999938965 c 0,0.0 -24,0.0 -24,0.0 c 0,0.0 0,10.6000061035 0,10.6000061035 c 0,0 24,0 24,0 c 0,0 0,-10.6000061035 0,-10.6000061035 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ <objectAnimator
+ android:duration="1000"
+ android:propertyName="pathData"
+ android:valueFrom="M 24,13.3999938965 c 0,0.0 -24,0.0 -24,0.0 c 0,0.0 0,10.6000061035 0,10.6000061035 c 0,0 24,0 24,0 c 0,0 0,-10.6000061035 0,-10.6000061035 Z"
+ android:valueTo="M 24,0.00173950195312 c 0,0.0 -24,0.0 -24,0.0 c 0,0.0 0,10.6982574463 0,10.6982574463 c 0,0.0 24,0.0 24,0.0 c 0,0.0 0,-10.6982574463 0,-10.6982574463 Z"
+ android:valueType="pathType"
+ android:interpolator="@android:interpolator/fast_out_slow_in" />
+ </set>
+</set>
diff --git a/res/drawable/alarm_tab.xml b/res/drawable/alarm_tab.xml
deleted file mode 100644
index 2debaf7..0000000
--- a/res/drawable/alarm_tab.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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.
--->
- <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>
diff --git a/res/drawable/clock_tab.xml b/res/drawable/clock_tab.xml
deleted file mode 100644
index 6fc2779..0000000
--- a/res/drawable/clock_tab.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
--->
- <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>
diff --git a/res/drawable/ic_alarm.xml b/res/drawable/ic_alarm.xml
new file mode 100644
index 0000000..575b960
--- /dev/null
+++ b/res/drawable/ic_alarm.xml
@@ -0,0 +1,83 @@
+<?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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
+ <group
+ android:name="button"
+ android:translateX="12"
+ android:translateY="12" >
+ <group
+ android:name="button_pivot"
+ android:translateX="-12"
+ android:translateY="-12" >
+ <group
+ android:name="right_button"
+ android:translateX="19.0722"
+ android:translateY="4.5758" >
+ <path
+ android:name="path_1"
+ android:pathData="M 2.9409942627,1.16249084473 c 0.0,0.0 -4.59599304199,-3.85699462891 -4.59599304199,-3.85699462891 c 0.0,0.0 -1.2859954834,1.53300476074 -1.2859954834,1.53300476074 c 0.0,0.0 4.59599304199,3.85600280762 4.59599304199,3.85600280762 c 0.0,0.0 1.2859954834,-1.53201293945 1.2859954834,-1.53201293945 Z"
+ android:fillColor="#FFFFFFFF"
+ android:fillAlpha="1" />
+ </group>
+ <group
+ android:name="left_button"
+ android:translateX="4.9262"
+ android:translateY="4.5729" >
+ <path
+ android:name="left_button_path"
+ android:pathData="M 2.9409942627,-1.16250610352 c 0.0,0.0 -1.2859954834,-1.53199768066 -1.2859954834,-1.53199768066 c 0.0,0.0 -4.59599304199,3.85600280762 -4.59599304199,3.85600280762 c 0.0,0.0 1.2859954834,1.53300476074 1.2859954834,1.53300476074 c 0.0,0.0 4.59599304199,-3.8570098877 4.59599304199,-3.8570098877 Z"
+ android:fillColor="#FFFFFFFF"
+ android:fillAlpha="1" />
+ </group>
+ </group>
+ </group>
+ <group
+ android:name="alarm"
+ android:translateX="12"
+ android:translateY="12" >
+ <group
+ android:name="alarm_pivot"
+ android:translateX="-12"
+ android:translateY="-12" >
+ <group
+ android:name="alarm_hands"
+ android:translateX="13.75"
+ android:translateY="12.4473" >
+ <path
+ android:name="alarm_hands_path"
+ android:pathData="M -1.25,-4.42700195312 c 0.0,0.0 -1.5,0.0 -1.5,0.0 c 0.0,0.0 0.0,6.0 0.0,6.0 c 0.0,0.0 4.74699401855,2.85400390625 4.74699401855,2.85400390625 c 0.0,0.0 0.753005981445,-1.23199462891 0.753005981445,-1.23199462891 c 0.0,0.0 -4.0,-2.37200927734 -4.0,-2.37200927734 c 0.0,0.0 0.0,-5.25 0.0,-5.25 Z"
+ android:fillColor="#FFFFFFFF"
+ android:fillAlpha="1" />
+ </group>
+ <group
+ android:name="alarm_body"
+ android:translateX="12"
+ android:translateY="13.0203" >
+ <path
+ android:name="alarm_outline_path"
+ android:pathData="M -0.0050048828125,-9 c -4.97399902344,0 -8.99499511719,4.0299987793 -8.99499511719,9 c 0,4.9700012207 4.02099609375,9 8.99499511719,9 c 4.97399902344,0 9.00500488281,-4.0299987793 9.00500488281,-9 c 0,-4.9700012207 -4.03100585938,-9 -9.00500488281,-9 Z M 0,7 c -3.86700439453,0 -7,-3.13400268555 -7,-7 c 0,-3.86599731445 3.13299560547,-7 7,-7 c 3.86700439453,0 7,3.13400268555 7,7 c 0,3.86599731445 -3.13299560547,7 -7,7 Z"
+ android:fillColor="#FFFFFFFF"
+ android:fillAlpha="1" />
+ </group>
+ </group>
+ </group>
+</vector>
diff --git a/res/drawable/ic_alarm_animation.xml b/res/drawable/ic_alarm_animation.xml
new file mode 100644
index 0000000..f439ed6
--- /dev/null
+++ b/res/drawable/ic_alarm_animation.xml
@@ -0,0 +1,37 @@
+<?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.
+-->
+
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_selected="false" android:state_focused="true"
+ android:drawable="@drawable/ic_tab_alarm_activated" />
+
+ <item android:id="@+id/on" android:state_selected="true"
+ android:drawable="@drawable/ic_tab_alarm_activated" />
+
+ <item android:id="@+id/off"
+ android:drawable="@drawable/ic_tab_alarm_normal" />
+
+ <transition android:fromId="@id/off" android:toId="@id/on">
+ <animated-vector android:drawable="@drawable/ic_alarm">
+ <target
+ android:name="button"
+ android:animation="@animator/ic_alarm_animation_button" />
+ </animated-vector>
+ </transition>
+
+</animated-selector>
\ No newline at end of file
diff --git a/res/drawable/ic_clock.xml b/res/drawable/ic_clock.xml
new file mode 100644
index 0000000..9fb2cfc
--- /dev/null
+++ b/res/drawable/ic_clock.xml
@@ -0,0 +1,68 @@
+<?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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
+ <group
+ android:name="clock_frame"
+ android:translateX="12"
+ android:translateY="12" >
+ <group
+ android:name="clock_frame_pivot"
+ android:translateX="-12"
+ android:translateY="-12" >
+ <group
+ android:name="hour_hand"
+ android:translateX="12.00763"
+ android:translateY="9.992" >
+ <path
+ android:name="hour_hand_path"
+ android:pathData="M 0.742004394531,2.99200439453 c 0.0,0.0 -1.48400878906,0.0 -1.48400878906,0.0 c 0.0,0.0 0.0,-5.98400878906 0.0,-5.98400878906 c 0.0,0.0 1.48400878906,0.0 1.48400878906,0.0 c 0.0,0.0 0.0,5.98400878906 0.0,5.98400878906 Z"
+ android:fillColor="#FFFFFFFF"
+ android:fillAlpha="1" />
+ </group>
+ <group
+ android:name="clock_frame_1"
+ android:translateX="12"
+ android:translateY="12" >
+ <path
+ android:name="clock_ouline_path"
+ android:pathData="M -0.0050048828125,-10 c -5.52699279785,0 -9.99499511719,4.47700500488 -9.99499511719,10 c 0,5.52299499512 4.46800231934,10 9.99499511719,10 c 5.52600097656,0 10.0050048828,-4.47700500488 10.0050048828,-10 c 0,-5.52299499512 -4.47900390625,-10 -10.0050048828,-10 Z M 0,8 c -4.41999816895,0 -8,-3.58200073242 -8,-8 c 0,-4.41799926758 3.58000183105,-8 8,-8 c 4.41999816895,0 8,3.58200073242 8,8 c 0,4.41799926758 -3.58000183105,8 -8,8 Z"
+ android:fillColor="#FFFFFFFF"
+ android:fillAlpha="1" />
+ </group>
+ </group>
+ </group>
+ <group
+ android:name="second_hand"
+ android:translateX="12"
+ android:translateY="12" >
+ <group
+ android:name="second_hand_pivot"
+ android:translateX="-12"
+ android:translateY="-12" >
+ <path
+ android:name="second_hand_path"
+ android:pathData="M 12.7418060303,12.9839935303 c 0.0,0.0 -1.48399353027,0.0 -1.48399353027,0.0 c 0.0,0.0 0.0,-5.98399353027 0.0,-5.98399353027 c 0.0,0 1.48399353027,0 1.48399353027,0 c 0.0,0 0.0,5.98399353027 0.0,5.98399353027 Z"
+ android:fillColor="#FFFFFFFF"
+ android:fillAlpha="1" />
+ </group>
+ </group>
+</vector>
diff --git a/res/drawable/ic_clock_animation.xml b/res/drawable/ic_clock_animation.xml
new file mode 100644
index 0000000..608fbb7
--- /dev/null
+++ b/res/drawable/ic_clock_animation.xml
@@ -0,0 +1,39 @@
+<?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.
+-->
+
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_selected="false" android:state_focused="true"
+ android:drawable="@drawable/ic_tab_clock_activated" />
+
+ <item android:id="@+id/on" android:state_selected="true"
+ android:drawable="@drawable/ic_tab_clock_activated" />
+
+ <item android:id="@+id/off"
+ android:drawable="@drawable/ic_tab_clock_normal" />
+
+ <transition android:fromId="@id/off" android:toId="@id/on">
+ <animated-vector android:drawable="@drawable/ic_clock">
+ <target
+ android:name="second_hand"
+ android:animation="@animator/ic_clock_animation_second_hand" />
+ </animated-vector>
+ </transition>
+
+
+</animated-selector>
+
diff --git a/res/drawable/ic_stopwatch.xml b/res/drawable/ic_stopwatch.xml
new file mode 100644
index 0000000..1ea01c9
--- /dev/null
+++ b/res/drawable/ic_stopwatch.xml
@@ -0,0 +1,71 @@
+<?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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
+ <group
+ android:name="timer"
+ android:translateX="12"
+ android:translateY="12" >
+ <group
+ android:name="timer_pivot"
+ android:translateX="-12"
+ android:translateY="-12" >
+ <group
+ android:name="timer_body" >
+ <path
+ android:name="timer_interior_path"
+ android:pathData="M 19.0269927979,7.40730285645 c 0.0,0.0 1.42401123047,-1.42399597168 1.42401123047,-1.42399597168 c -0.428009033203,-0.513000488281 -0.902008056641,-0.98600769043 -1.41500854492,-1.41400146484 c 0.0,0.0 -1.4229888916,1.42399597168 -1.4229888916,1.42399597168 c -1.54000854492,-1.23199462891 -3.49101257324,-1.97300720215 -5.61801147461,-1.97300720215 c -4.97399902344,0.0 -8.99499511719,4.0299987793 -8.99499511719,9.0 c 0,4.9700012207 4.02099609375,9.0 8.99499511719,9.0 c 4.97399902344,0.0 9.00500488281,-4.0299987793 9.00500488281,-9.0 c 0,-2.125 -0.740997314453,-4.07398986816 -1.97300720215,-5.61299133301 Z M 12,20.0202941895 c -3.86700439453,0.0 -7,-3.13398742676 -7,-7.0 c 0,-3.86599731445 3.13299560547,-7.0 7,-7.0 c 3.86700439453,0.0 7,3.13400268555 7,7.0 c 0,3.86601257324 -3.13299560547,7.0 -7,7.0 Z"
+ android:fillColor="#FFFFFFFF"
+ android:fillAlpha="1" />
+ </group>
+ </group>
+ </group>
+ <group
+ android:name="hand"
+ android:translateX="11.96875"
+ android:translateY="13.17188" >
+ <group
+ android:name="hand_pivot"
+ android:translateX="-12"
+ android:translateY="-13.17188" >
+ <path
+ android:name="hand_path"
+ android:pathData="M 11,14.0200042725 c 0,0.0 2,0.0 2,0.0 c 0,0.0 0,-6.0 0,-6.0 c 0,0.0 -2,0.0 -2,0.0 c 0,0.0 0,6.0 0,6.0 Z"
+ android:fillColor="#FFFFFFFF"
+ android:fillAlpha="1" />
+ </group>
+ </group>
+ <group
+ android:name="button"
+ android:translateX="12"
+ android:translateY="12" >
+ <group
+ android:name="button_pivot"
+ android:translateX="-12"
+ android:translateY="-12" >
+ <path
+ android:name="button_path"
+ android:pathData="M 15,1.02000427246 c 0,0.0 -6,0.0 -6,0.0 c 0,0.0 0,2.0 0,2.0 c 0,0.0 6,0.0 6,0.0 c 0,0.0 0,-2.0 0,-2.0 Z"
+ android:fillColor="#FFFFFFFF"
+ android:fillAlpha="1" />
+ </group>
+ </group>
+</vector>
diff --git a/res/drawable/ic_stopwatch_animation.xml b/res/drawable/ic_stopwatch_animation.xml
new file mode 100644
index 0000000..c9a235c
--- /dev/null
+++ b/res/drawable/ic_stopwatch_animation.xml
@@ -0,0 +1,40 @@
+<?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.
+-->
+
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_selected="false" android:state_focused="true"
+ android:drawable="@drawable/ic_tab_stopwatch_activated" />
+
+ <item android:id="@+id/on" android:state_selected="true"
+ android:drawable="@drawable/ic_tab_stopwatch_activated" />
+
+ <item android:id="@+id/off"
+ android:drawable="@drawable/ic_tab_stopwatch_normal" />
+
+ <transition android:fromId="@id/off" android:toId="@id/on">
+ <animated-vector android:drawable="@drawable/ic_stopwatch">
+ <target
+ android:name="hand"
+ android:animation="@animator/ic_stopwatch_animation_hand" />
+ <target
+ android:name="button"
+ android:animation="@animator/ic_stopwatch_animation_button" />
+ </animated-vector>
+ </transition>
+
+</animated-selector>
diff --git a/res/drawable/ic_timer.xml b/res/drawable/ic_timer.xml
new file mode 100644
index 0000000..d0663d9
--- /dev/null
+++ b/res/drawable/ic_timer.xml
@@ -0,0 +1,75 @@
+<?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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
+ <group
+ android:name="hourglass_frame"
+ android:translateX="12"
+ android:translateY="12"
+ android:scaleX="0.7"
+ android:scaleY="0.7" >
+ <group
+ android:name="hourglass_frame_pivot"
+ android:translateX="-12"
+ android:translateY="-12" >
+ <group
+ android:name="hourglass_bottom"
+ android:translateX="12"
+ android:translateY="6.5" >
+ <path
+ android:name="bottom_inner_path"
+ android:pathData="M 6.52099609375,-3.89300537109 c 0.0,0.0 -6.52099609375,6.87901306152 -6.52099609375,6.87901306152 c 0,0.0 -6.52099609375,-6.87901306152 -6.52099609375,-6.87901306152 c 0.0,0.0 13.0419921875,0.0 13.0419921875,0.0 Z M 9.99800109863,-6.5 c 0.0,0.0 -19.9960021973,0.0 -19.9960021973,0.0 c -0.890991210938,0.0 -1.33700561523,1.07699584961 -0.707000732422,1.70700073242 c 0.0,0.0 10.7050018311,11.2929992676 10.7050018311,11.2929992676 c 0,0.0 10.7050018311,-11.2929992676 10.7050018311,-11.2929992676 c 0.630004882812,-0.630004882812 0.183990478516,-1.70700073242 -0.707000732422,-1.70700073242 Z"
+ android:fillColor="#FFFFFFFF"
+ android:fillAlpha="1" />
+ </group>
+ <group
+ android:name="hourglass_top"
+ android:translateX="12"
+ android:translateY="17.5" >
+ <path
+ android:name="top_inner_path"
+ android:pathData="M 0,-2.98600769043 c 0,0.0 6.52099609375,6.87901306152 6.52099609375,6.87901306152 c 0.0,0.0 -13.0419921875,0.0 -13.0419921875,0.0 c 0.0,0.0 6.52099609375,-6.87901306152 6.52099609375,-6.87901306152 Z M 0,-6.5 c 0,0.0 -10.7050018311,11.2929992676 -10.7050018311,11.2929992676 c -0.630004882812,0.630004882812 -0.184005737305,1.70700073242 0.707000732422,1.70700073242 c 0.0,0.0 19.9960021973,0.0 19.9960021973,0.0 c 0.890991210938,0.0 1.33699035645,-1.07699584961 0.707000732422,-1.70700073242 c 0.0,0.0 -10.7050018311,-11.2929992676 -10.7050018311,-11.2929992676 Z"
+ android:fillColor="#FFFFFFFF"
+ android:fillAlpha="1" />
+ </group>
+ </group>
+ </group>
+ <group
+ android:name="hourglass_fill"
+ android:translateX="12"
+ android:translateY="12"
+ android:scaleX="0.7"
+ android:scaleY="0.7" >
+ <group
+ android:name="hourglass_fill_pivot"
+ android:translateX="-12"
+ android:translateY="-12" >
+ <clip-path
+ android:name="mask_1"
+ android:pathData="M 24,13.3999938965 c 0,0.0 -24,0.0 -24,0.0 c 0,0.0 0,10.6000061035 0,10.6000061035 c 0,0 24,0 24,0 c 0,0 0,-10.6000061035 0,-10.6000061035 Z" />
+ <path
+ android:name="fill_path"
+ android:pathData="M 22.7100067139,22.2900085449 c 0.629989624023,0.629989624023 0.179992675781,1.70999145508 -0.710006713867,1.70999145508 c 0,0 -20,0 -20,0 c -0.889999389648,0 -1.33999633789,-1.08000183105 -0.710006713867,-1.70999145508 c 0.0,0.0 9.76000976562,-10.2900085449 9.76000976562,-10.2900085449 c 0.0,0 -9.76000976562,-10.2899932861 -9.76000976562,-10.2899932861 c -0.629989624023,-0.630004882812 -0.179992675781,-1.71000671387 0.710006713867,-1.71000671387 c 0,0 20,0 20,0 c 0.889999389648,0 1.33999633789,1.08000183105 0.710006713867,1.71000671387 c 0.0,0.0 -9.76000976562,10.2899932861 -9.76000976563,10.2899932861 c 0.0,0 9.76000976563,10.2900085449 9.76000976563,10.2900085449 Z"
+ android:fillColor="#FFFFFFFF"
+ android:fillAlpha="1" />
+ </group>
+ </group>
+</vector>
diff --git a/res/drawable/ic_timer_animation.xml b/res/drawable/ic_timer_animation.xml
new file mode 100644
index 0000000..31d9f12
--- /dev/null
+++ b/res/drawable/ic_timer_animation.xml
@@ -0,0 +1,43 @@
+<?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.
+-->
+
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_selected="false" android:state_focused="true"
+ android:drawable="@drawable/ic_tab_timer_activated" />
+
+ <item android:id="@+id/on" android:state_selected="true"
+ android:drawable="@drawable/ic_tab_timer_activated" />
+
+ <item android:id="@+id/off"
+ android:drawable="@drawable/ic_tab_timer_normal" />
+
+ <transition android:fromId="@id/off" android:toId="@id/on">
+ <animated-vector android:drawable="@drawable/ic_timer">
+ <target
+ android:name="hourglass_frame"
+ android:animation="@animator/ic_timer_animation_hourglass_frame" />
+ <target
+ android:name="hourglass_fill"
+ android:animation="@animator/ic_timer_animation_hourglass_fill" />
+ <target
+ android:name="mask_1"
+ android:animation="@animator/ic_timer_animation_mask_1" />
+ </animated-vector>
+ </transition>
+
+</animated-selector>
diff --git a/res/drawable/stopwatch_tab.xml b/res/drawable/stopwatch_tab.xml
deleted file mode 100644
index 9404da0..0000000
--- a/res/drawable/stopwatch_tab.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
--->
- <selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" android:state_pressed="false"
- android:drawable="@drawable/ic_tab_stopwatch_activated" />
- <item android:state_focused="true" android:state_pressed="true"
- android:drawable="@drawable/ic_tab_stopwatch_activated" />
- <item android:state_focused="false" android:state_pressed="true"
- android:drawable="@drawable/ic_tab_stopwatch_activated" />
- <item android:state_selected="true"
- android:drawable="@drawable/ic_tab_stopwatch_activated" />
- <item android:drawable="@drawable/ic_tab_stopwatch_normal" />
-</selector>
diff --git a/res/drawable/timer_tab.xml b/res/drawable/timer_tab.xml
deleted file mode 100644
index 75daefe..0000000
--- a/res/drawable/timer_tab.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
--->
- <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>
diff --git a/res/interpolator/ic_stopwatch_button_translatex_interpolator.xml b/res/interpolator/ic_stopwatch_button_translatex_interpolator.xml
new file mode 100644
index 0000000..b9a5349
--- /dev/null
+++ b/res/interpolator/ic_stopwatch_button_translatex_interpolator.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
+ android:pathData="M 0.000000,0.000000 C 0.2,0 0.1,0.5 0.5,0.5 C 0.7,0.5 0.6,1 1,1 " />
diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java
index 4f3dad8..0dd9c5c 100644
--- a/src/com/android/deskclock/DeskClock.java
+++ b/src/com/android/deskclock/DeskClock.java
@@ -204,22 +204,22 @@
mActionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
mAlarmTab = mActionBar.newTab();
- mAlarmTab.setIcon(R.drawable.alarm_tab);
+ mAlarmTab.setIcon(R.drawable.ic_alarm_animation);
mAlarmTab.setContentDescription(R.string.menu_alarm);
mTabsAdapter.addTab(mAlarmTab, AlarmClockFragment.class, ALARM_TAB_INDEX);
mClockTab = mActionBar.newTab();
- mClockTab.setIcon(R.drawable.clock_tab);
+ mClockTab.setIcon(R.drawable.ic_clock_animation);
mClockTab.setContentDescription(R.string.menu_clock);
mTabsAdapter.addTab(mClockTab, ClockFragment.class, CLOCK_TAB_INDEX);
mTimerTab = mActionBar.newTab();
- mTimerTab.setIcon(R.drawable.timer_tab);
+ mTimerTab.setIcon(R.drawable.ic_timer_animation);
mTimerTab.setContentDescription(R.string.menu_timer);
mTabsAdapter.addTab(mTimerTab, TimerFragment.class, TIMER_TAB_INDEX);
mStopwatchTab = mActionBar.newTab();
- mStopwatchTab.setIcon(R.drawable.stopwatch_tab);
+ mStopwatchTab.setIcon(R.drawable.ic_stopwatch_animation);
mStopwatchTab.setContentDescription(R.string.menu_stopwatch);
mTabsAdapter.addTab(mStopwatchTab, StopwatchFragment.class, STOPWATCH_TAB_INDEX);
@@ -535,7 +535,7 @@
}
@Override
- public void onTabReselected(Tab arg0, FragmentTransaction arg1) {
+ public void onTabReselected(Tab tab, FragmentTransaction arg1) {
// Do nothing
}
