diff options
author | Paul Keith <javelinanddart@gmail.com> | 2018-01-01 18:56:04 +0100 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2018-01-27 00:41:46 +0100 |
commit | 3e3cc18dd56c4b795f1cd1476e51a38ab1ea9ef3 (patch) | |
tree | b920ea140049c355cf12360b73ae5efd04618e71 /res | |
parent | eedcecc62459dbebee63d39ed0a07e1bd7733688 (diff) | |
download | android_packages_apps_Snap-3e3cc18dd56c4b795f1cd1476e51a38ab1ea9ef3.tar.gz android_packages_apps_Snap-3e3cc18dd56c4b795f1cd1476e51a38ab1ea9ef3.tar.bz2 android_packages_apps_Snap-3e3cc18dd56c4b795f1cd1476e51a38ab1ea9ef3.zip |
Revert "Snap: Bring back original shutter icons and animation"
No reason to do use caf ones
This reverts commit a465e3a0cf7a81c7cb9a0e80cbfa7527e7d7de77.
Change-Id: I611351ddfa0b24087cc58466dcba95ab4999d1bd
Diffstat (limited to 'res')
28 files changed, 140 insertions, 3 deletions
diff --git a/res/drawable-hdpi/shutter_button_stop.png b/res/drawable-hdpi/shutter_button_stop.png Binary files differdeleted file mode 100644 index ae6c1dc79..000000000 --- a/res/drawable-hdpi/shutter_button_stop.png +++ /dev/null diff --git a/res/drawable-hdpi/shutter_button_video.png b/res/drawable-hdpi/shutter_button_video.png Binary files differdeleted file mode 100644 index 345c41891..000000000 --- a/res/drawable-hdpi/shutter_button_video.png +++ /dev/null diff --git a/res/drawable-hdpi/shutter_button_video_dim.png b/res/drawable-hdpi/shutter_button_video_dim.png Binary files differdeleted file mode 100644 index 88fad94e9..000000000 --- a/res/drawable-hdpi/shutter_button_video_dim.png +++ /dev/null diff --git a/res/drawable-hdpi/shutter_button_video_stop.png b/res/drawable-hdpi/shutter_button_video_stop.png Binary files differdeleted file mode 100644 index f5e1fb8ed..000000000 --- a/res/drawable-hdpi/shutter_button_video_stop.png +++ /dev/null diff --git a/res/drawable-hdpi/shutter_panorama.png b/res/drawable-hdpi/shutter_panorama.png Binary files differdeleted file mode 100644 index 16f044336..000000000 --- a/res/drawable-hdpi/shutter_panorama.png +++ /dev/null diff --git a/res/drawable-hdpi/shutter_panorama_dim.png b/res/drawable-hdpi/shutter_panorama_dim.png Binary files differdeleted file mode 100644 index d7c7a0625..000000000 --- a/res/drawable-hdpi/shutter_panorama_dim.png +++ /dev/null diff --git a/res/drawable-mdpi/shutter_button_stop.png b/res/drawable-mdpi/shutter_button_stop.png Binary files differdeleted file mode 100644 index 7058814e3..000000000 --- a/res/drawable-mdpi/shutter_button_stop.png +++ /dev/null diff --git a/res/drawable-mdpi/shutter_button_video.png b/res/drawable-mdpi/shutter_button_video.png Binary files differdeleted file mode 100644 index 1fad54077..000000000 --- a/res/drawable-mdpi/shutter_button_video.png +++ /dev/null diff --git a/res/drawable-mdpi/shutter_button_video_dim.png b/res/drawable-mdpi/shutter_button_video_dim.png Binary files differdeleted file mode 100644 index 721abc37a..000000000 --- a/res/drawable-mdpi/shutter_button_video_dim.png +++ /dev/null diff --git a/res/drawable-mdpi/shutter_button_video_stop.png b/res/drawable-mdpi/shutter_button_video_stop.png Binary files differdeleted file mode 100644 index 00985ae33..000000000 --- a/res/drawable-mdpi/shutter_button_video_stop.png +++ /dev/null diff --git a/res/drawable-mdpi/shutter_panorama.png b/res/drawable-mdpi/shutter_panorama.png Binary files differdeleted file mode 100644 index b140e57e0..000000000 --- a/res/drawable-mdpi/shutter_panorama.png +++ /dev/null diff --git a/res/drawable-mdpi/shutter_panorama_dim.png b/res/drawable-mdpi/shutter_panorama_dim.png Binary files differdeleted file mode 100644 index b6e22f920..000000000 --- a/res/drawable-mdpi/shutter_panorama_dim.png +++ /dev/null diff --git a/res/drawable-xhdpi/shutter_button_stop.png b/res/drawable-xhdpi/shutter_button_stop.png Binary files differdeleted file mode 100644 index 88f60d3c4..000000000 --- a/res/drawable-xhdpi/shutter_button_stop.png +++ /dev/null diff --git a/res/drawable-xhdpi/shutter_button_video.png b/res/drawable-xhdpi/shutter_button_video.png Binary files differdeleted file mode 100644 index da58053fe..000000000 --- a/res/drawable-xhdpi/shutter_button_video.png +++ /dev/null diff --git a/res/drawable-xhdpi/shutter_button_video_dim.png b/res/drawable-xhdpi/shutter_button_video_dim.png Binary files differdeleted file mode 100644 index fc41296f8..000000000 --- a/res/drawable-xhdpi/shutter_button_video_dim.png +++ /dev/null diff --git a/res/drawable-xhdpi/shutter_button_video_stop.png b/res/drawable-xhdpi/shutter_button_video_stop.png Binary files differdeleted file mode 100644 index 44df24b97..000000000 --- a/res/drawable-xhdpi/shutter_button_video_stop.png +++ /dev/null diff --git a/res/drawable-xhdpi/shutter_panorama.png b/res/drawable-xhdpi/shutter_panorama.png Binary files differdeleted file mode 100644 index 8cfd7ee2c..000000000 --- a/res/drawable-xhdpi/shutter_panorama.png +++ /dev/null diff --git a/res/drawable-xhdpi/shutter_panorama_dim.png b/res/drawable-xhdpi/shutter_panorama_dim.png Binary files differdeleted file mode 100644 index 606032b5a..000000000 --- a/res/drawable-xhdpi/shutter_panorama_dim.png +++ /dev/null diff --git a/res/drawable/btn_new_shutter.xml b/res/drawable/btn_new_shutter.xml index 53bef3176..a41581238 100644 --- a/res/drawable/btn_new_shutter.xml +++ b/res/drawable/btn_new_shutter.xml @@ -15,6 +15,7 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" android:drawable="@drawable/shutter_button_dim" /> - <item android:drawable="@drawable/shutter_button_0" /> + <item android:state_pressed="true" + android:drawable="@drawable/shutter_button_pressed" /> + <item android:drawable="@drawable/shutter_button_normal" /> </selector> diff --git a/res/drawable/shutter_button_normal.xml b/res/drawable/shutter_button_normal.xml new file mode 100644 index 000000000..9e1f9aad1 --- /dev/null +++ b/res/drawable/shutter_button_normal.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="@dimen/shutter_size" + android:height="@dimen/shutter_size" + android:viewportWidth="80" + android:viewportHeight="80"> + + <path + android:fillColor="@color/pic" + android:strokeWidth="1" + android:pathData="M 40 10.5 C 56.29240012 10.5 69.5 23.70759988 69.5 40 C 69.5 56.29240012 56.29240012 69.5 40 69.5 C 23.70759988 69.5 10.5 56.29240012 10.5 40 C 10.5 23.70759988 23.70759988 10.5 40 10.5 Z" /> + <path + android:strokeColor="@color/blue" + android:strokeWidth="7" + android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" /> + +</vector> diff --git a/res/drawable/shutter_button_pressed.xml b/res/drawable/shutter_button_pressed.xml new file mode 100644 index 000000000..32dbd58ee --- /dev/null +++ b/res/drawable/shutter_button_pressed.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="@dimen/shutter_size" + android:height="@dimen/shutter_size" + android:viewportWidth="80" + android:viewportHeight="80"> + + <path + android:fillColor="@color/pic_pressed" + android:strokeWidth="1" + android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" /> + <path + android:strokeColor="@color/blue" + android:strokeWidth="7" + android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" /> + +</vector> diff --git a/res/drawable/shutter_button_stop.xml b/res/drawable/shutter_button_stop.xml new file mode 100644 index 000000000..8954092bc --- /dev/null +++ b/res/drawable/shutter_button_stop.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="@dimen/shutter_size" + android:height="@dimen/shutter_size" + android:viewportWidth="80" + android:viewportHeight="80"> + + <path + android:fillColor="@color/pano_stop" + android:strokeWidth="1" + android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" /> + <path + android:strokeColor="@color/white" + android:strokeWidth="7" + android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" /> + +</vector> diff --git a/res/drawable/shutter_button_video.xml b/res/drawable/shutter_button_video.xml new file mode 100644 index 000000000..8c70e7d85 --- /dev/null +++ b/res/drawable/shutter_button_video.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="@dimen/shutter_size" + android:height="@dimen/shutter_size" + android:viewportWidth="80" + android:viewportHeight="80"> + + <path + android:fillColor="@color/video" + android:strokeWidth="1" + android:pathData="M 40 10.5 C 56.29240012 10.5 69.5 23.70759988 69.5 40 C 69.5 56.29240012 56.29240012 69.5 40 69.5 C 23.70759988 69.5 10.5 56.29240012 10.5 40 C 10.5 23.70759988 23.70759988 10.5 40 10.5 Z" /> + <path + android:strokeColor="@color/white" + android:strokeWidth="7" + android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" /> + +</vector> diff --git a/res/drawable/shutter_button_video_dim.xml b/res/drawable/shutter_button_video_dim.xml new file mode 100644 index 000000000..c3de0c04c --- /dev/null +++ b/res/drawable/shutter_button_video_dim.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="@dimen/shutter_size" + android:height="@dimen/shutter_size" + android:viewportWidth="80" + android:viewportHeight="80"> + + <path + android:fillColor="@color/video_pressed" + android:strokeWidth="1" + android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" /> + <path + android:strokeColor="@color/white" + android:strokeWidth="7" + android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" /> + +</vector> diff --git a/res/drawable/shutter_button_video_stop.xml b/res/drawable/shutter_button_video_stop.xml new file mode 100644 index 000000000..9acc1a297 --- /dev/null +++ b/res/drawable/shutter_button_video_stop.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="@dimen/shutter_size" + android:height="@dimen/shutter_size" + android:viewportWidth="80" + android:viewportHeight="80"> + + <path + android:fillColor="@color/video_stop" + android:strokeWidth="1" + android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" /> + <path + android:strokeColor="@color/white" + android:strokeWidth="7" + android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" /> + +</vector> diff --git a/res/drawable/shutter_panorama.xml b/res/drawable/shutter_panorama.xml new file mode 100644 index 000000000..e68ddc3dc --- /dev/null +++ b/res/drawable/shutter_panorama.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="@dimen/shutter_size" + android:height="@dimen/shutter_size" + android:viewportWidth="80" + android:viewportHeight="80"> + + <path + android:fillColor="@color/pano" + android:strokeWidth="1" + android:pathData="M 40 10.5 C 56.29240012 10.5 69.5 23.70759988 69.5 40 C 69.5 56.29240012 56.29240012 69.5 40 69.5 C 23.70759988 69.5 10.5 56.29240012 10.5 40 C 10.5 23.70759988 23.70759988 10.5 40 10.5 Z" /> + <path + android:strokeColor="@color/white" + android:strokeWidth="7" + android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" /> + +</vector> diff --git a/res/drawable/shutter_panorama_dim.xml b/res/drawable/shutter_panorama_dim.xml new file mode 100644 index 000000000..a9b69e347 --- /dev/null +++ b/res/drawable/shutter_panorama_dim.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="@dimen/shutter_size" + android:height="@dimen/shutter_size" + android:viewportWidth="80" + android:viewportHeight="80"> + + <path + android:fillColor="@color/pano_pressed" + android:strokeWidth="1" + android:pathData="M 40 12.5 C 55.1878306203 12.5 67.5 24.8121693797 67.5 40 C 67.5 55.1878306203 55.1878306203 67.5 40 67.5 C 24.8121693797 67.5 12.5 55.1878306203 12.5 40 C 12.5 24.8121693797 24.8121693797 12.5 40 12.5 Z" /> + <path + android:strokeColor="@color/white" + android:strokeWidth="7" + android:pathData="M 40 3.5 C 60.1583933688 3.5 76.5 19.8416066312 76.5 40 C 76.5 60.1583933688 60.1583933688 76.5 40 76.5 C 19.8416066312 76.5 3.5 60.1583933688 3.5 40 C 3.5 19.8416066312 19.8416066312 3.5 40 3.5 Z" /> + +</vector> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 4ac548fb0..210b4739c 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -106,7 +106,7 @@ <dimen name="capture_margin_top">16dip</dimen> <dimen name="camera_controls_size">0dip</dimen> <dimen name="camera_film_strip_gap">32dip</dimen> - <dimen name="shutter_size">80dp</dimen> + <dimen name="shutter_size">68dp</dimen> <dimen name="appwidget_width">180dp</dimen> <dimen name="appwidget_height">180dp</dimen> |