diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2012-10-16 15:30:49 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2012-10-16 16:29:25 +0800 |
| commit | eec0ab92b1c9c32bf1e36bddb360386879f74615 (patch) | |
| tree | 5424c3b459b5d5330c99051ff234155062d4fdfb | |
| parent | ed19156e705efb982b351653a3ea9b15f5a08df7 (diff) | |
| download | Camera-eec0ab92b1c9c32bf1e36bddb360386879f74615.tar.gz | |
Remove unused drawables and xml files.
bug:7201108
Change-Id: Idc831de134e492fe4bbe4071b69a54fea42e65bc
302 files changed, 2 insertions, 907 deletions
diff --git a/res/anim-land/first_level_fade_in.xml b/res/anim-land/first_level_fade_in.xml deleted file mode 100644 index e6b38e68..00000000 --- a/res/anim-land/first_level_fade_in.xml +++ /dev/null @@ -1,18 +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. ---> -<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator"> - <translate android:fromYDelta="-100%p" android:toYDelta="0" android:duration="300" /> -</set> diff --git a/res/anim-land/first_level_fade_out.xml b/res/anim-land/first_level_fade_out.xml deleted file mode 100644 index 2c6d35a8..00000000 --- a/res/anim-land/first_level_fade_out.xml +++ /dev/null @@ -1,18 +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. ---> -<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator"> - <translate android:fromYDelta="0" android:toYDelta="-100%p" android:duration="300" /> -</set> diff --git a/res/anim-land/second_level_fade_in.xml b/res/anim-land/second_level_fade_in.xml deleted file mode 100644 index 8f34e543..00000000 --- a/res/anim-land/second_level_fade_in.xml +++ /dev/null @@ -1,18 +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. ---> -<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator"> - <translate android:fromYDelta="100%p" android:toYDelta="0" android:duration="300" /> -</set> diff --git a/res/anim-land/second_level_fade_out.xml b/res/anim-land/second_level_fade_out.xml deleted file mode 100644 index 8dd3c982..00000000 --- a/res/anim-land/second_level_fade_out.xml +++ /dev/null @@ -1,18 +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. ---> -<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator"> - <translate android:fromYDelta="0" android:toYDelta="100%p" android:duration="300" /> -</set> diff --git a/res/anim-land/setting_popup_grow_fade_in.xml b/res/anim-land/setting_popup_grow_fade_in.xml deleted file mode 100644 index 41980230..00000000 --- a/res/anim-land/setting_popup_grow_fade_in.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. ---> -<!-- This animation is shared by phone and tablet in landscape orientation. --> -<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> - <scale android:interpolator="@interpolator/decelerate_quint" - android:fromXScale="0.9" android:toXScale="1.0" - android:fromYScale="0.9" android:toYScale="1.0" - android:pivotX="100%" android:pivotY="50%" - android:duration="300" /> - <alpha android:interpolator="@interpolator/decelerate_cubic" - android:fromAlpha="0.5" android:toAlpha="1.0" - android:duration="300" /> -</set> diff --git a/res/anim-land/setting_popup_shrink_fade_out.xml b/res/anim-land/setting_popup_shrink_fade_out.xml deleted file mode 100644 index 63b00cc0..00000000 --- a/res/anim-land/setting_popup_shrink_fade_out.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. ---> -<!-- This animation is shared by phone and tablet in landscape orientation. --> -<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> - <scale android:interpolator="@interpolator/decelerate_quint" - android:fromXScale="1.0" android:toXScale="0.9" - android:fromYScale="1.0" android:toYScale="0.9" - android:pivotX="100%" android:pivotY="50%" - android:duration="300" /> - <alpha android:interpolator="@interpolator/decelerate_cubic" - android:fromAlpha="1.0" android:toAlpha="0.0" - android:duration="300" /> -</set> diff --git a/res/anim-port/first_level_fade_in.xml b/res/anim-port/first_level_fade_in.xml deleted file mode 100644 index 9cd50b72..00000000 --- a/res/anim-port/first_level_fade_in.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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:interpolator="@android:anim/accelerate_interpolator"> - <translate android:fromXDelta="100%p" android:toXDelta="0" android:duration="300" /> -</set> diff --git a/res/anim-port/first_level_fade_out.xml b/res/anim-port/first_level_fade_out.xml deleted file mode 100644 index 102b695a..00000000 --- a/res/anim-port/first_level_fade_out.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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:interpolator="@android:anim/accelerate_interpolator"> - <translate android:fromXDelta="0" android:toXDelta="100%p" android:duration="300" /> -</set> diff --git a/res/anim-port/second_level_fade_in.xml b/res/anim-port/second_level_fade_in.xml deleted file mode 100644 index baf165f2..00000000 --- a/res/anim-port/second_level_fade_in.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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:interpolator="@android:anim/accelerate_interpolator"> - <translate android:fromXDelta="-100%p" android:toXDelta="0" android:duration="300" /> -</set> diff --git a/res/anim-port/second_level_fade_out.xml b/res/anim-port/second_level_fade_out.xml deleted file mode 100644 index 272f1712..00000000 --- a/res/anim-port/second_level_fade_out.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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:interpolator="@android:anim/accelerate_interpolator"> - <translate android:fromXDelta="0" android:toXDelta="-100%p" android:duration="300" /> -</set> diff --git a/res/anim-port/setting_popup_grow_fade_in.xml b/res/anim-port/setting_popup_grow_fade_in.xml deleted file mode 100644 index fde38804..00000000 --- a/res/anim-port/setting_popup_grow_fade_in.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011, 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. ---> -<!-- This animation is shared by phone and tablet in portrait orientation. --> -<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> - <scale android:interpolator="@interpolator/decelerate_quint" - android:fromXScale="0.9" android:toXScale="1.0" - android:fromYScale="0.9" android:toYScale="1.0" - android:pivotX="50%" android:pivotY="100%" - android:duration="300" /> - <alpha android:interpolator="@interpolator/decelerate_cubic" - android:fromAlpha="0.5" android:toAlpha="1.0" - android:duration="300" /> -</set> diff --git a/res/anim-port/setting_popup_shrink_fade_out.xml b/res/anim-port/setting_popup_shrink_fade_out.xml deleted file mode 100644 index 4f6457c2..00000000 --- a/res/anim-port/setting_popup_shrink_fade_out.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2007, 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. ---> -<!-- This animation is shared by phone and tablet in portrait orientation. --> -<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> - <scale android:interpolator="@interpolator/decelerate_quint" - android:fromXScale="1.0" android:toXScale="0.9" - android:fromYScale="1.0" android:toYScale="0.9" - android:pivotX="50%" android:pivotY="100%" - android:duration="300" /> - <alpha android:interpolator="@interpolator/decelerate_cubic" - android:fromAlpha="1.0" android:toAlpha="0.0" - android:duration="300" /> -</set> diff --git a/res/drawable-hdpi/btn_ic_panorama.png b/res/drawable-hdpi/btn_ic_panorama.png Binary files differdeleted file mode 100644 index e4db1ff8..00000000 --- a/res/drawable-hdpi/btn_ic_panorama.png +++ /dev/null diff --git a/res/drawable-hdpi/btn_pan_shutter_holo.png b/res/drawable-hdpi/btn_pan_shutter_holo.png Binary files differdeleted file mode 100644 index c5298747..00000000 --- a/res/drawable-hdpi/btn_pan_shutter_holo.png +++ /dev/null diff --git a/res/drawable-hdpi/btn_pan_shutter_holo_large.png b/res/drawable-hdpi/btn_pan_shutter_holo_large.png Binary files differdeleted file mode 100644 index 9df392c4..00000000 --- a/res/drawable-hdpi/btn_pan_shutter_holo_large.png +++ /dev/null diff --git a/res/drawable-hdpi/btn_retake_shutter_holo.png b/res/drawable-hdpi/btn_retake_shutter_holo.png Binary files differdeleted file mode 100644 index c425f9cf..00000000 --- a/res/drawable-hdpi/btn_retake_shutter_holo.png +++ /dev/null diff --git a/res/drawable-hdpi/btn_retake_shutter_holo_large.png b/res/drawable-hdpi/btn_retake_shutter_holo_large.png Binary files differdeleted file mode 100644 index 6f34dd01..00000000 --- a/res/drawable-hdpi/btn_retake_shutter_holo_large.png +++ /dev/null diff --git a/res/drawable-hdpi/btn_retake_shutter_pressed_holo.png b/res/drawable-hdpi/btn_retake_shutter_pressed_holo.png Binary files differdeleted file mode 100644 index 84c79359..00000000 --- a/res/drawable-hdpi/btn_retake_shutter_pressed_holo.png +++ /dev/null diff --git a/res/drawable-hdpi/btn_retake_shutter_pressed_holo_large.png b/res/drawable-hdpi/btn_retake_shutter_pressed_holo_large.png Binary files differdeleted file mode 100644 index 76ec9fe8..00000000 --- a/res/drawable-hdpi/btn_retake_shutter_pressed_holo_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_focus_face_focused.9.png b/res/drawable-hdpi/ic_focus_face_focused.9.png Binary files differdeleted file mode 100644 index 982dcd2c..00000000 --- a/res/drawable-hdpi/ic_focus_face_focused.9.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_focus_failed.9.png b/res/drawable-hdpi/ic_focus_failed.9.png Binary files differdeleted file mode 100644 index 82cc76ed..00000000 --- a/res/drawable-hdpi/ic_focus_failed.9.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_focus_focused.9.png b/res/drawable-hdpi/ic_focus_focused.9.png Binary files differdeleted file mode 100644 index f956cfb9..00000000 --- a/res/drawable-hdpi/ic_focus_focused.9.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_focus_focusing.9.png b/res/drawable-hdpi/ic_focus_focusing.9.png Binary files differdeleted file mode 100644 index aaf5ee49..00000000 --- a/res/drawable-hdpi/ic_focus_focusing.9.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_gallery.png b/res/drawable-hdpi/ic_gallery.png Binary files differdeleted file mode 100644 index 039f38b4..00000000 --- a/res/drawable-hdpi/ic_gallery.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_gallery_large.png b/res/drawable-hdpi/ic_gallery_large.png Binary files differdeleted file mode 100644 index 12f586a0..00000000 --- a/res/drawable-hdpi/ic_gallery_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_gallery_xlarge.png b/res/drawable-hdpi/ic_gallery_xlarge.png Binary files differdeleted file mode 100644 index 12f586a0..00000000 --- a/res/drawable-hdpi/ic_gallery_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_highlight.9.png b/res/drawable-hdpi/ic_highlight.9.png Binary files differdeleted file mode 100644 index ae766b9d..00000000 --- a/res/drawable-hdpi/ic_highlight.9.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_cloudy.png b/res/drawable-hdpi/ic_indicators_cloudy.png Binary files differdeleted file mode 100644 index ced46ceb..00000000 --- a/res/drawable-hdpi/ic_indicators_cloudy.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_cloudy_large.png b/res/drawable-hdpi/ic_indicators_cloudy_large.png Binary files differdeleted file mode 100644 index cafcff4e..00000000 --- a/res/drawable-hdpi/ic_indicators_cloudy_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_cloudy_xlarge.png b/res/drawable-hdpi/ic_indicators_cloudy_xlarge.png Binary files differdeleted file mode 100644 index cafcff4e..00000000 --- a/res/drawable-hdpi/ic_indicators_cloudy_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_fluorescent.png b/res/drawable-hdpi/ic_indicators_fluorescent.png Binary files differdeleted file mode 100644 index c3420c66..00000000 --- a/res/drawable-hdpi/ic_indicators_fluorescent.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_fluorescent_large.png b/res/drawable-hdpi/ic_indicators_fluorescent_large.png Binary files differdeleted file mode 100644 index 79ac9bb3..00000000 --- a/res/drawable-hdpi/ic_indicators_fluorescent_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_fluorescent_xlarge.png b/res/drawable-hdpi/ic_indicators_fluorescent_xlarge.png Binary files differdeleted file mode 100644 index 79ac9bb3..00000000 --- a/res/drawable-hdpi/ic_indicators_fluorescent_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_incandescent.png b/res/drawable-hdpi/ic_indicators_incandescent.png Binary files differdeleted file mode 100644 index be9c3075..00000000 --- a/res/drawable-hdpi/ic_indicators_incandescent.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_incandescent_large.png b/res/drawable-hdpi/ic_indicators_incandescent_large.png Binary files differdeleted file mode 100644 index a1dae2ae..00000000 --- a/res/drawable-hdpi/ic_indicators_incandescent_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_incandescent_xlarge.png b/res/drawable-hdpi/ic_indicators_incandescent_xlarge.png Binary files differdeleted file mode 100644 index a1dae2ae..00000000 --- a/res/drawable-hdpi/ic_indicators_incandescent_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_landscape.png b/res/drawable-hdpi/ic_indicators_landscape.png Binary files differdeleted file mode 100644 index 8636fc09..00000000 --- a/res/drawable-hdpi/ic_indicators_landscape.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_landscape_flash_auto.png b/res/drawable-hdpi/ic_indicators_landscape_flash_auto.png Binary files differdeleted file mode 100644 index da3a0c9d..00000000 --- a/res/drawable-hdpi/ic_indicators_landscape_flash_auto.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_landscape_flash_auto_large.png b/res/drawable-hdpi/ic_indicators_landscape_flash_auto_large.png Binary files differdeleted file mode 100644 index d571c0ac..00000000 --- a/res/drawable-hdpi/ic_indicators_landscape_flash_auto_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_landscape_flash_auto_xlarge.png b/res/drawable-hdpi/ic_indicators_landscape_flash_auto_xlarge.png Binary files differdeleted file mode 100644 index d571c0ac..00000000 --- a/res/drawable-hdpi/ic_indicators_landscape_flash_auto_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_landscape_flash_on.png b/res/drawable-hdpi/ic_indicators_landscape_flash_on.png Binary files differdeleted file mode 100644 index c7af702a..00000000 --- a/res/drawable-hdpi/ic_indicators_landscape_flash_on.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_landscape_flash_on_large.png b/res/drawable-hdpi/ic_indicators_landscape_flash_on_large.png Binary files differdeleted file mode 100644 index 28ce420d..00000000 --- a/res/drawable-hdpi/ic_indicators_landscape_flash_on_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_landscape_flash_on_xlarge.png b/res/drawable-hdpi/ic_indicators_landscape_flash_on_xlarge.png Binary files differdeleted file mode 100644 index 28ce420d..00000000 --- a/res/drawable-hdpi/ic_indicators_landscape_flash_on_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_landscape_large.png b/res/drawable-hdpi/ic_indicators_landscape_large.png Binary files differdeleted file mode 100644 index 4019661f..00000000 --- a/res/drawable-hdpi/ic_indicators_landscape_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_landscape_xlarge.png b/res/drawable-hdpi/ic_indicators_landscape_xlarge.png Binary files differdeleted file mode 100644 index 4019661f..00000000 --- a/res/drawable-hdpi/ic_indicators_landscape_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_macro.png b/res/drawable-hdpi/ic_indicators_macro.png Binary files differdeleted file mode 100644 index 0ec71d5f..00000000 --- a/res/drawable-hdpi/ic_indicators_macro.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_macro_large.png b/res/drawable-hdpi/ic_indicators_macro_large.png Binary files differdeleted file mode 100644 index 5770a45d..00000000 --- a/res/drawable-hdpi/ic_indicators_macro_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_macro_xlarge.png b/res/drawable-hdpi/ic_indicators_macro_xlarge.png Binary files differdeleted file mode 100644 index 5770a45d..00000000 --- a/res/drawable-hdpi/ic_indicators_macro_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_scn.png b/res/drawable-hdpi/ic_indicators_scn.png Binary files differdeleted file mode 100644 index 675b1c5c..00000000 --- a/res/drawable-hdpi/ic_indicators_scn.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_scn_large.png b/res/drawable-hdpi/ic_indicators_scn_large.png Binary files differdeleted file mode 100644 index e8b0129e..00000000 --- a/res/drawable-hdpi/ic_indicators_scn_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_scn_xlarge.png b/res/drawable-hdpi/ic_indicators_scn_xlarge.png Binary files differdeleted file mode 100644 index e8b0129e..00000000 --- a/res/drawable-hdpi/ic_indicators_scn_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_sunlight.png b/res/drawable-hdpi/ic_indicators_sunlight.png Binary files differdeleted file mode 100644 index f7fcba60..00000000 --- a/res/drawable-hdpi/ic_indicators_sunlight.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_sunlight_large.png b/res/drawable-hdpi/ic_indicators_sunlight_large.png Binary files differdeleted file mode 100644 index 91abd264..00000000 --- a/res/drawable-hdpi/ic_indicators_sunlight_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_indicators_sunlight_xlarge.png b/res/drawable-hdpi/ic_indicators_sunlight_xlarge.png Binary files differdeleted file mode 100644 index 91abd264..00000000 --- a/res/drawable-hdpi/ic_indicators_sunlight_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_overflow.png b/res/drawable-hdpi/ic_menu_overflow.png Binary files differdeleted file mode 100644 index a12aedfa..00000000 --- a/res/drawable-hdpi/ic_menu_overflow.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_overflow_large.png b/res/drawable-hdpi/ic_menu_overflow_large.png Binary files differdeleted file mode 100644 index a7bdbeb1..00000000 --- a/res/drawable-hdpi/ic_menu_overflow_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_overflow_xlarge.png b/res/drawable-hdpi/ic_menu_overflow_xlarge.png Binary files differdeleted file mode 100644 index a7bdbeb1..00000000 --- a/res/drawable-hdpi/ic_menu_overflow_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_shot_border.9.png b/res/drawable-hdpi/ic_shot_border.9.png Binary files differdeleted file mode 100644 index af853175..00000000 --- a/res/drawable-hdpi/ic_shot_border.9.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_shot_border_xlarge.9.png b/res/drawable-hdpi/ic_shot_border_xlarge.9.png Binary files differdeleted file mode 100644 index 870e480e..00000000 --- a/res/drawable-hdpi/ic_shot_border_xlarge.9.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_switch_camera_holo_light.png b/res/drawable-hdpi/ic_switch_camera_holo_light.png Binary files differdeleted file mode 100644 index 20b08658..00000000 --- a/res/drawable-hdpi/ic_switch_camera_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_switch_pan_holo_light.png b/res/drawable-hdpi/ic_switch_pan_holo_light.png Binary files differdeleted file mode 100644 index 6633fac0..00000000 --- a/res/drawable-hdpi/ic_switch_pan_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_switch_video_holo_light.png b/res/drawable-hdpi/ic_switch_video_holo_light.png Binary files differdeleted file mode 100644 index 2b94b13a..00000000 --- a/res/drawable-hdpi/ic_switch_video_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_1.png b/res/drawable-hdpi/ic_timelapse_1.png Binary files differdeleted file mode 100644 index b9603a75..00000000 --- a/res/drawable-hdpi/ic_timelapse_1.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_10.png b/res/drawable-hdpi/ic_timelapse_10.png Binary files differdeleted file mode 100644 index 25832a42..00000000 --- a/res/drawable-hdpi/ic_timelapse_10.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_10_large.png b/res/drawable-hdpi/ic_timelapse_10_large.png Binary files differdeleted file mode 100644 index fae08208..00000000 --- a/res/drawable-hdpi/ic_timelapse_10_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_10_xlarge.png b/res/drawable-hdpi/ic_timelapse_10_xlarge.png Binary files differdeleted file mode 100644 index fae08208..00000000 --- a/res/drawable-hdpi/ic_timelapse_10_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_1_5.png b/res/drawable-hdpi/ic_timelapse_1_5.png Binary files differdeleted file mode 100644 index eb220c55..00000000 --- a/res/drawable-hdpi/ic_timelapse_1_5.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_1_5_large.png b/res/drawable-hdpi/ic_timelapse_1_5_large.png Binary files differdeleted file mode 100644 index 9a2232c7..00000000 --- a/res/drawable-hdpi/ic_timelapse_1_5_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_1_5_xlarge.png b/res/drawable-hdpi/ic_timelapse_1_5_xlarge.png Binary files differdeleted file mode 100644 index 9a2232c7..00000000 --- a/res/drawable-hdpi/ic_timelapse_1_5_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_1_large.png b/res/drawable-hdpi/ic_timelapse_1_large.png Binary files differdeleted file mode 100644 index f4b788e1..00000000 --- a/res/drawable-hdpi/ic_timelapse_1_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_1_xlarge.png b/res/drawable-hdpi/ic_timelapse_1_xlarge.png Binary files differdeleted file mode 100644 index f4b788e1..00000000 --- a/res/drawable-hdpi/ic_timelapse_1_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_2.png b/res/drawable-hdpi/ic_timelapse_2.png Binary files differdeleted file mode 100644 index 1f315afd..00000000 --- a/res/drawable-hdpi/ic_timelapse_2.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_2_5.png b/res/drawable-hdpi/ic_timelapse_2_5.png Binary files differdeleted file mode 100644 index f57ed7d4..00000000 --- a/res/drawable-hdpi/ic_timelapse_2_5.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_2_5_large.png b/res/drawable-hdpi/ic_timelapse_2_5_large.png Binary files differdeleted file mode 100644 index 41245f6f..00000000 --- a/res/drawable-hdpi/ic_timelapse_2_5_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_2_5_xlarge.png b/res/drawable-hdpi/ic_timelapse_2_5_xlarge.png Binary files differdeleted file mode 100644 index 41245f6f..00000000 --- a/res/drawable-hdpi/ic_timelapse_2_5_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_2_large.png b/res/drawable-hdpi/ic_timelapse_2_large.png Binary files differdeleted file mode 100644 index dbb59df1..00000000 --- a/res/drawable-hdpi/ic_timelapse_2_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_2_xlarge.png b/res/drawable-hdpi/ic_timelapse_2_xlarge.png Binary files differdeleted file mode 100644 index dbb59df1..00000000 --- a/res/drawable-hdpi/ic_timelapse_2_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_3.png b/res/drawable-hdpi/ic_timelapse_3.png Binary files differdeleted file mode 100644 index 8a8e3701..00000000 --- a/res/drawable-hdpi/ic_timelapse_3.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_3_large.png b/res/drawable-hdpi/ic_timelapse_3_large.png Binary files differdeleted file mode 100644 index b3dd3c5d..00000000 --- a/res/drawable-hdpi/ic_timelapse_3_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_3_xlarge.png b/res/drawable-hdpi/ic_timelapse_3_xlarge.png Binary files differdeleted file mode 100644 index b3dd3c5d..00000000 --- a/res/drawable-hdpi/ic_timelapse_3_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_5.png b/res/drawable-hdpi/ic_timelapse_5.png Binary files differdeleted file mode 100644 index 6831b4ab..00000000 --- a/res/drawable-hdpi/ic_timelapse_5.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_5_large.png b/res/drawable-hdpi/ic_timelapse_5_large.png Binary files differdeleted file mode 100644 index 38a7279f..00000000 --- a/res/drawable-hdpi/ic_timelapse_5_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_timelapse_5_xlarge.png b/res/drawable-hdpi/ic_timelapse_5_xlarge.png Binary files differdeleted file mode 100644 index 38a7279f..00000000 --- a/res/drawable-hdpi/ic_timelapse_5_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_white_balance_auto_holo_light.png b/res/drawable-hdpi/ic_white_balance_auto_holo_light.png Binary files differdeleted file mode 100644 index ea488eee..00000000 --- a/res/drawable-hdpi/ic_white_balance_auto_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_white_balance_auto_holo_light_large.png b/res/drawable-hdpi/ic_white_balance_auto_holo_light_large.png Binary files differdeleted file mode 100644 index dc5efeab..00000000 --- a/res/drawable-hdpi/ic_white_balance_auto_holo_light_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_white_balance_auto_holo_light_xlarge.png b/res/drawable-hdpi/ic_white_balance_auto_holo_light_xlarge.png Binary files differdeleted file mode 100644 index dc5efeab..00000000 --- a/res/drawable-hdpi/ic_white_balance_auto_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_white_balance_cloudy_holo_light.png b/res/drawable-hdpi/ic_white_balance_cloudy_holo_light.png Binary files differdeleted file mode 100644 index e25559e5..00000000 --- a/res/drawable-hdpi/ic_white_balance_cloudy_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_white_balance_cloudy_holo_light_large.png b/res/drawable-hdpi/ic_white_balance_cloudy_holo_light_large.png Binary files differdeleted file mode 100644 index 9bf242de..00000000 --- a/res/drawable-hdpi/ic_white_balance_cloudy_holo_light_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_white_balance_cloudy_holo_light_xlarge.png b/res/drawable-hdpi/ic_white_balance_cloudy_holo_light_xlarge.png Binary files differdeleted file mode 100644 index 9bf242de..00000000 --- a/res/drawable-hdpi/ic_white_balance_cloudy_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_white_balance_fluorescent_holo_light.png b/res/drawable-hdpi/ic_white_balance_fluorescent_holo_light.png Binary files differdeleted file mode 100644 index de50a086..00000000 --- a/res/drawable-hdpi/ic_white_balance_fluorescent_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_white_balance_fluorescent_holo_light_large.png b/res/drawable-hdpi/ic_white_balance_fluorescent_holo_light_large.png Binary files differdeleted file mode 100644 index 1c2d104a..00000000 --- a/res/drawable-hdpi/ic_white_balance_fluorescent_holo_light_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_white_balance_fluorescent_holo_light_xlarge.png b/res/drawable-hdpi/ic_white_balance_fluorescent_holo_light_xlarge.png Binary files differdeleted file mode 100644 index 1c2d104a..00000000 --- a/res/drawable-hdpi/ic_white_balance_fluorescent_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_white_balance_incandescent_holo_light.png b/res/drawable-hdpi/ic_white_balance_incandescent_holo_light.png Binary files differdeleted file mode 100644 index 2f49c332..00000000 --- a/res/drawable-hdpi/ic_white_balance_incandescent_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_white_balance_incandescent_holo_light_large.png b/res/drawable-hdpi/ic_white_balance_incandescent_holo_light_large.png Binary files differdeleted file mode 100644 index b3a0393d..00000000 --- a/res/drawable-hdpi/ic_white_balance_incandescent_holo_light_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_white_balance_incandescent_holo_light_xlarge.png b/res/drawable-hdpi/ic_white_balance_incandescent_holo_light_xlarge.png Binary files differdeleted file mode 100644 index b3a0393d..00000000 --- a/res/drawable-hdpi/ic_white_balance_incandescent_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_white_balance_sunlight_holo_light.png b/res/drawable-hdpi/ic_white_balance_sunlight_holo_light.png Binary files differdeleted file mode 100644 index 47a1f1a4..00000000 --- a/res/drawable-hdpi/ic_white_balance_sunlight_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_white_balance_sunlight_holo_light_large.png b/res/drawable-hdpi/ic_white_balance_sunlight_holo_light_large.png Binary files differdeleted file mode 100644 index 37212aa7..00000000 --- a/res/drawable-hdpi/ic_white_balance_sunlight_holo_light_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_white_balance_sunlight_holo_light_xlarge.png b/res/drawable-hdpi/ic_white_balance_sunlight_holo_light_xlarge.png Binary files differdeleted file mode 100644 index 37212aa7..00000000 --- a/res/drawable-hdpi/ic_white_balance_sunlight_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_zoom_in_holo_dark.png b/res/drawable-hdpi/ic_zoom_in_holo_dark.png Binary files differdeleted file mode 100644 index 89b5f155..00000000 --- a/res/drawable-hdpi/ic_zoom_in_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_zoom_in_holo_dark_large.png b/res/drawable-hdpi/ic_zoom_in_holo_dark_large.png Binary files differdeleted file mode 100644 index 78178cd8..00000000 --- a/res/drawable-hdpi/ic_zoom_in_holo_dark_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_zoom_in_holo_dark_xlarge.png b/res/drawable-hdpi/ic_zoom_in_holo_dark_xlarge.png Binary files differdeleted file mode 100644 index 99d5ef4e..00000000 --- a/res/drawable-hdpi/ic_zoom_in_holo_dark_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_zoom_in_holo_light.png b/res/drawable-hdpi/ic_zoom_in_holo_light.png Binary files differdeleted file mode 100644 index 9751ca32..00000000 --- a/res/drawable-hdpi/ic_zoom_in_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_zoom_in_holo_light_large.png b/res/drawable-hdpi/ic_zoom_in_holo_light_large.png Binary files differdeleted file mode 100644 index 38897025..00000000 --- a/res/drawable-hdpi/ic_zoom_in_holo_light_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_zoom_in_holo_light_xlarge.png b/res/drawable-hdpi/ic_zoom_in_holo_light_xlarge.png Binary files differdeleted file mode 100644 index 42c0a75c..00000000 --- a/res/drawable-hdpi/ic_zoom_in_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_zoom_out_holo_dark.png b/res/drawable-hdpi/ic_zoom_out_holo_dark.png Binary files differdeleted file mode 100644 index f4a25891..00000000 --- a/res/drawable-hdpi/ic_zoom_out_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_zoom_out_holo_dark_large.png b/res/drawable-hdpi/ic_zoom_out_holo_dark_large.png Binary files differdeleted file mode 100644 index 426aac80..00000000 --- a/res/drawable-hdpi/ic_zoom_out_holo_dark_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_zoom_out_holo_dark_xlarge.png b/res/drawable-hdpi/ic_zoom_out_holo_dark_xlarge.png Binary files differdeleted file mode 100644 index 5fa4c954..00000000 --- a/res/drawable-hdpi/ic_zoom_out_holo_dark_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_zoom_out_holo_light.png b/res/drawable-hdpi/ic_zoom_out_holo_light.png Binary files differdeleted file mode 100644 index ba094ac1..00000000 --- a/res/drawable-hdpi/ic_zoom_out_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_zoom_out_holo_light_large.png b/res/drawable-hdpi/ic_zoom_out_holo_light_large.png Binary files differdeleted file mode 100644 index fdf9ab2f..00000000 --- a/res/drawable-hdpi/ic_zoom_out_holo_light_large.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_zoom_out_holo_light_xlarge.png b/res/drawable-hdpi/ic_zoom_out_holo_light_xlarge.png Binary files differdeleted file mode 100644 index 5a8eac88..00000000 --- a/res/drawable-hdpi/ic_zoom_out_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_zoom_slider.png b/res/drawable-hdpi/ic_zoom_slider.png Binary files differdeleted file mode 100644 index 8427e4d0..00000000 --- a/res/drawable-hdpi/ic_zoom_slider.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_zoom_slider_large.png b/res/drawable-hdpi/ic_zoom_slider_large.png Binary files differdeleted file mode 100644 index 292fe2e1..00000000 --- a/res/drawable-hdpi/ic_zoom_slider_large.png +++ /dev/null diff --git a/res/drawable-land-hdpi/btn_close_settings.png b/res/drawable-land-hdpi/btn_close_settings.png Binary files differdeleted file mode 100644 index 58cce57d..00000000 --- a/res/drawable-land-hdpi/btn_close_settings.png +++ /dev/null diff --git a/res/drawable-land-hdpi/btn_close_settings_large.png b/res/drawable-land-hdpi/btn_close_settings_large.png Binary files differdeleted file mode 100644 index baaea34f..00000000 --- a/res/drawable-land-hdpi/btn_close_settings_large.png +++ /dev/null diff --git a/res/drawable-land-hdpi/btn_pan_shutter_holo_xlarge.png b/res/drawable-land-hdpi/btn_pan_shutter_holo_xlarge.png Binary files differdeleted file mode 100644 index 19436d4b..00000000 --- a/res/drawable-land-hdpi/btn_pan_shutter_holo_xlarge.png +++ /dev/null diff --git a/res/drawable-land-hdpi/btn_retake_shutter_holo_xlarge.png b/res/drawable-land-hdpi/btn_retake_shutter_holo_xlarge.png Binary files differdeleted file mode 100644 index a8129719..00000000 --- a/res/drawable-land-hdpi/btn_retake_shutter_holo_xlarge.png +++ /dev/null diff --git a/res/drawable-land-hdpi/btn_retake_shutter_pressed_holo_xlarge.png b/res/drawable-land-hdpi/btn_retake_shutter_pressed_holo_xlarge.png Binary files differdeleted file mode 100644 index b3e852b2..00000000 --- a/res/drawable-land-hdpi/btn_retake_shutter_pressed_holo_xlarge.png +++ /dev/null diff --git a/res/drawable-land-hdpi/btn_wheel_close_settings_xlarge.png b/res/drawable-land-hdpi/btn_wheel_close_settings_xlarge.png Binary files differdeleted file mode 100644 index 6d2ad464..00000000 --- a/res/drawable-land-hdpi/btn_wheel_close_settings_xlarge.png +++ /dev/null diff --git a/res/drawable-land-mdpi/btn_close_settings.png b/res/drawable-land-mdpi/btn_close_settings.png Binary files differdeleted file mode 100644 index d44d05da..00000000 --- a/res/drawable-land-mdpi/btn_close_settings.png +++ /dev/null diff --git a/res/drawable-land-mdpi/btn_pan_shutter_holo_xlarge.png b/res/drawable-land-mdpi/btn_pan_shutter_holo_xlarge.png Binary files differdeleted file mode 100644 index 84431faa..00000000 --- a/res/drawable-land-mdpi/btn_pan_shutter_holo_xlarge.png +++ /dev/null diff --git a/res/drawable-land-mdpi/btn_retake_shutter_holo_xlarge.png b/res/drawable-land-mdpi/btn_retake_shutter_holo_xlarge.png Binary files differdeleted file mode 100644 index c292d593..00000000 --- a/res/drawable-land-mdpi/btn_retake_shutter_holo_xlarge.png +++ /dev/null diff --git a/res/drawable-land-mdpi/btn_retake_shutter_pressed_holo_xlarge.png b/res/drawable-land-mdpi/btn_retake_shutter_pressed_holo_xlarge.png Binary files differdeleted file mode 100644 index fe083ee1..00000000 --- a/res/drawable-land-mdpi/btn_retake_shutter_pressed_holo_xlarge.png +++ /dev/null diff --git a/res/drawable-land-mdpi/btn_wheel_close_settings_xlarge.png b/res/drawable-land-mdpi/btn_wheel_close_settings_xlarge.png Binary files differdeleted file mode 100644 index 7bca4e12..00000000 --- a/res/drawable-land-mdpi/btn_wheel_close_settings_xlarge.png +++ /dev/null diff --git a/res/drawable-land-xhdpi/btn_close_settings.png b/res/drawable-land-xhdpi/btn_close_settings.png Binary files differdeleted file mode 100644 index 5984c1a9..00000000 --- a/res/drawable-land-xhdpi/btn_close_settings.png +++ /dev/null diff --git a/res/drawable-land-xhdpi/btn_pan_shutter_holo_xlarge.png b/res/drawable-land-xhdpi/btn_pan_shutter_holo_xlarge.png Binary files differdeleted file mode 100644 index 129a5496..00000000 --- a/res/drawable-land-xhdpi/btn_pan_shutter_holo_xlarge.png +++ /dev/null diff --git a/res/drawable-land-xhdpi/btn_retake_shutter_holo_xlarge.png b/res/drawable-land-xhdpi/btn_retake_shutter_holo_xlarge.png Binary files differdeleted file mode 100644 index 6cae86fc..00000000 --- a/res/drawable-land-xhdpi/btn_retake_shutter_holo_xlarge.png +++ /dev/null diff --git a/res/drawable-land-xhdpi/btn_retake_shutter_pressed_holo_xlarge.png b/res/drawable-land-xhdpi/btn_retake_shutter_pressed_holo_xlarge.png Binary files differdeleted file mode 100644 index 2120ab1c..00000000 --- a/res/drawable-land-xhdpi/btn_retake_shutter_pressed_holo_xlarge.png +++ /dev/null diff --git a/res/drawable-land-xhdpi/btn_wheel_close_settings_xlarge.png b/res/drawable-land-xhdpi/btn_wheel_close_settings_xlarge.png Binary files differdeleted file mode 100644 index 94592431..00000000 --- a/res/drawable-land-xhdpi/btn_wheel_close_settings_xlarge.png +++ /dev/null diff --git a/res/drawable-land/bg_camera_pattern.xml b/res/drawable-land/bg_camera_pattern.xml deleted file mode 100644 index 7ddb9bc6..00000000 --- a/res/drawable-land/bg_camera_pattern.xml +++ /dev/null @@ -1,25 +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. - */ ---> -<shape xmlns:android="http://schemas.android.com/apk/res/android"> - <gradient name="bg_camera_pattern" - android:startColor="#ff111111" - android:endColor="#ff000000" - android:angle="-90" - /> -</shape> diff --git a/res/drawable-mdpi/btn_pan_shutter_holo.png b/res/drawable-mdpi/btn_pan_shutter_holo.png Binary files differdeleted file mode 100644 index e0c28c02..00000000 --- a/res/drawable-mdpi/btn_pan_shutter_holo.png +++ /dev/null diff --git a/res/drawable-mdpi/btn_retake_shutter_holo.png b/res/drawable-mdpi/btn_retake_shutter_holo.png Binary files differdeleted file mode 100644 index 2337c8cc..00000000 --- a/res/drawable-mdpi/btn_retake_shutter_holo.png +++ /dev/null diff --git a/res/drawable-mdpi/btn_retake_shutter_pressed_holo.png b/res/drawable-mdpi/btn_retake_shutter_pressed_holo.png Binary files differdeleted file mode 100644 index a1a9e73c..00000000 --- a/res/drawable-mdpi/btn_retake_shutter_pressed_holo.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_focus_face_focused.9.png b/res/drawable-mdpi/ic_focus_face_focused.9.png Binary files differdeleted file mode 100644 index 8f894ae6..00000000 --- a/res/drawable-mdpi/ic_focus_face_focused.9.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_focus_failed.9.png b/res/drawable-mdpi/ic_focus_failed.9.png Binary files differdeleted file mode 100644 index 5658d0fe..00000000 --- a/res/drawable-mdpi/ic_focus_failed.9.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_focus_focused.9.png b/res/drawable-mdpi/ic_focus_focused.9.png Binary files differdeleted file mode 100644 index cfcc7c47..00000000 --- a/res/drawable-mdpi/ic_focus_focused.9.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_focus_focusing.9.png b/res/drawable-mdpi/ic_focus_focusing.9.png Binary files differdeleted file mode 100644 index fc94b843..00000000 --- a/res/drawable-mdpi/ic_focus_focusing.9.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_gallery.png b/res/drawable-mdpi/ic_gallery.png Binary files differdeleted file mode 100644 index 963f0072..00000000 --- a/res/drawable-mdpi/ic_gallery.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_gallery_xlarge.png b/res/drawable-mdpi/ic_gallery_xlarge.png Binary files differdeleted file mode 100644 index 9388931a..00000000 --- a/res/drawable-mdpi/ic_gallery_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_highlight.9.png b/res/drawable-mdpi/ic_highlight.9.png Binary files differdeleted file mode 100644 index 15bd7414..00000000 --- a/res/drawable-mdpi/ic_highlight.9.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicators_cloudy.png b/res/drawable-mdpi/ic_indicators_cloudy.png Binary files differdeleted file mode 100644 index b0892708..00000000 --- a/res/drawable-mdpi/ic_indicators_cloudy.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicators_cloudy_xlarge.png b/res/drawable-mdpi/ic_indicators_cloudy_xlarge.png Binary files differdeleted file mode 100644 index 6b16cab4..00000000 --- a/res/drawable-mdpi/ic_indicators_cloudy_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicators_fluorescent.png b/res/drawable-mdpi/ic_indicators_fluorescent.png Binary files differdeleted file mode 100644 index 0f6b74f4..00000000 --- a/res/drawable-mdpi/ic_indicators_fluorescent.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicators_fluorescent_xlarge.png b/res/drawable-mdpi/ic_indicators_fluorescent_xlarge.png Binary files differdeleted file mode 100644 index d7c23bc0..00000000 --- a/res/drawable-mdpi/ic_indicators_fluorescent_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicators_incandescent.png b/res/drawable-mdpi/ic_indicators_incandescent.png Binary files differdeleted file mode 100644 index 6042142b..00000000 --- a/res/drawable-mdpi/ic_indicators_incandescent.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicators_incandescent_xlarge.png b/res/drawable-mdpi/ic_indicators_incandescent_xlarge.png Binary files differdeleted file mode 100644 index 5e63b431..00000000 --- a/res/drawable-mdpi/ic_indicators_incandescent_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicators_landscape.png b/res/drawable-mdpi/ic_indicators_landscape.png Binary files differdeleted file mode 100644 index 643ea7c0..00000000 --- a/res/drawable-mdpi/ic_indicators_landscape.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicators_landscape_flash_auto.png b/res/drawable-mdpi/ic_indicators_landscape_flash_auto.png Binary files differdeleted file mode 100644 index 38ac3b1d..00000000 --- a/res/drawable-mdpi/ic_indicators_landscape_flash_auto.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicators_landscape_flash_auto_xlarge.png b/res/drawable-mdpi/ic_indicators_landscape_flash_auto_xlarge.png Binary files differdeleted file mode 100644 index 95e410c9..00000000 --- a/res/drawable-mdpi/ic_indicators_landscape_flash_auto_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicators_landscape_flash_on.png b/res/drawable-mdpi/ic_indicators_landscape_flash_on.png Binary files differdeleted file mode 100644 index c65dc719..00000000 --- a/res/drawable-mdpi/ic_indicators_landscape_flash_on.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicators_landscape_flash_on_xlarge.png b/res/drawable-mdpi/ic_indicators_landscape_flash_on_xlarge.png Binary files differdeleted file mode 100644 index 2cb4f15e..00000000 --- a/res/drawable-mdpi/ic_indicators_landscape_flash_on_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicators_landscape_xlarge.png b/res/drawable-mdpi/ic_indicators_landscape_xlarge.png Binary files differdeleted file mode 100644 index 36a66f54..00000000 --- a/res/drawable-mdpi/ic_indicators_landscape_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicators_macro.png b/res/drawable-mdpi/ic_indicators_macro.png Binary files differdeleted file mode 100644 index f0ff4feb..00000000 --- a/res/drawable-mdpi/ic_indicators_macro.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicators_macro_xlarge.png b/res/drawable-mdpi/ic_indicators_macro_xlarge.png Binary files differdeleted file mode 100644 index 61ec7a44..00000000 --- a/res/drawable-mdpi/ic_indicators_macro_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicators_scn.png b/res/drawable-mdpi/ic_indicators_scn.png Binary files differdeleted file mode 100644 index 5c152a85..00000000 --- a/res/drawable-mdpi/ic_indicators_scn.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicators_scn_xlarge.png b/res/drawable-mdpi/ic_indicators_scn_xlarge.png Binary files differdeleted file mode 100644 index da55fdb6..00000000 --- a/res/drawable-mdpi/ic_indicators_scn_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicators_sunlight.png b/res/drawable-mdpi/ic_indicators_sunlight.png Binary files differdeleted file mode 100644 index 59bce0f8..00000000 --- a/res/drawable-mdpi/ic_indicators_sunlight.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_indicators_sunlight_xlarge.png b/res/drawable-mdpi/ic_indicators_sunlight_xlarge.png Binary files differdeleted file mode 100644 index 4c8d29e7..00000000 --- a/res/drawable-mdpi/ic_indicators_sunlight_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menu_overflow.png b/res/drawable-mdpi/ic_menu_overflow.png Binary files differdeleted file mode 100644 index 4a3bde3b..00000000 --- a/res/drawable-mdpi/ic_menu_overflow.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menu_overflow_xlarge.png b/res/drawable-mdpi/ic_menu_overflow_xlarge.png Binary files differdeleted file mode 100644 index f927168e..00000000 --- a/res/drawable-mdpi/ic_menu_overflow_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_shot_border.9.png b/res/drawable-mdpi/ic_shot_border.9.png Binary files differdeleted file mode 100644 index 80609ef9..00000000 --- a/res/drawable-mdpi/ic_shot_border.9.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_shot_border_xlarge.9.png b/res/drawable-mdpi/ic_shot_border_xlarge.9.png Binary files differdeleted file mode 100644 index 1e23fe27..00000000 --- a/res/drawable-mdpi/ic_shot_border_xlarge.9.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_switch_camera_holo_light.png b/res/drawable-mdpi/ic_switch_camera_holo_light.png Binary files differdeleted file mode 100644 index e600169c..00000000 --- a/res/drawable-mdpi/ic_switch_camera_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_switch_pan_holo_light.png b/res/drawable-mdpi/ic_switch_pan_holo_light.png Binary files differdeleted file mode 100644 index 7907e669..00000000 --- a/res/drawable-mdpi/ic_switch_pan_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_switch_video_holo_light.png b/res/drawable-mdpi/ic_switch_video_holo_light.png Binary files differdeleted file mode 100644 index cf4afebd..00000000 --- a/res/drawable-mdpi/ic_switch_video_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_timelapse_1.png b/res/drawable-mdpi/ic_timelapse_1.png Binary files differdeleted file mode 100644 index 48070f8d..00000000 --- a/res/drawable-mdpi/ic_timelapse_1.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_timelapse_10.png b/res/drawable-mdpi/ic_timelapse_10.png Binary files differdeleted file mode 100644 index 3a8dbf1b..00000000 --- a/res/drawable-mdpi/ic_timelapse_10.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_timelapse_10_xlarge.png b/res/drawable-mdpi/ic_timelapse_10_xlarge.png Binary files differdeleted file mode 100644 index da69f4b8..00000000 --- a/res/drawable-mdpi/ic_timelapse_10_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_timelapse_1_5.png b/res/drawable-mdpi/ic_timelapse_1_5.png Binary files differdeleted file mode 100644 index 172fb031..00000000 --- a/res/drawable-mdpi/ic_timelapse_1_5.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_timelapse_1_5_xlarge.png b/res/drawable-mdpi/ic_timelapse_1_5_xlarge.png Binary files differdeleted file mode 100644 index a2bf8276..00000000 --- a/res/drawable-mdpi/ic_timelapse_1_5_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_timelapse_1_xlarge.png b/res/drawable-mdpi/ic_timelapse_1_xlarge.png Binary files differdeleted file mode 100644 index 57078416..00000000 --- a/res/drawable-mdpi/ic_timelapse_1_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_timelapse_2.png b/res/drawable-mdpi/ic_timelapse_2.png Binary files differdeleted file mode 100644 index 07be67aa..00000000 --- a/res/drawable-mdpi/ic_timelapse_2.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_timelapse_2_5.png b/res/drawable-mdpi/ic_timelapse_2_5.png Binary files differdeleted file mode 100644 index f6e11aa3..00000000 --- a/res/drawable-mdpi/ic_timelapse_2_5.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_timelapse_2_5_xlarge.png b/res/drawable-mdpi/ic_timelapse_2_5_xlarge.png Binary files differdeleted file mode 100644 index 770a8981..00000000 --- a/res/drawable-mdpi/ic_timelapse_2_5_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_timelapse_2_xlarge.png b/res/drawable-mdpi/ic_timelapse_2_xlarge.png Binary files differdeleted file mode 100644 index 83e0ed11..00000000 --- a/res/drawable-mdpi/ic_timelapse_2_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_timelapse_3.png b/res/drawable-mdpi/ic_timelapse_3.png Binary files differdeleted file mode 100644 index 0807ffe4..00000000 --- a/res/drawable-mdpi/ic_timelapse_3.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_timelapse_3_xlarge.png b/res/drawable-mdpi/ic_timelapse_3_xlarge.png Binary files differdeleted file mode 100644 index 9f7cbb24..00000000 --- a/res/drawable-mdpi/ic_timelapse_3_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_timelapse_5.png b/res/drawable-mdpi/ic_timelapse_5.png Binary files differdeleted file mode 100644 index ab58057f..00000000 --- a/res/drawable-mdpi/ic_timelapse_5.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_timelapse_5_xlarge.png b/res/drawable-mdpi/ic_timelapse_5_xlarge.png Binary files differdeleted file mode 100644 index f86780b0..00000000 --- a/res/drawable-mdpi/ic_timelapse_5_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_white_balance_auto_holo_light.png b/res/drawable-mdpi/ic_white_balance_auto_holo_light.png Binary files differdeleted file mode 100644 index 309cc5d2..00000000 --- a/res/drawable-mdpi/ic_white_balance_auto_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_white_balance_auto_holo_light_xlarge.png b/res/drawable-mdpi/ic_white_balance_auto_holo_light_xlarge.png Binary files differdeleted file mode 100644 index b8ec090b..00000000 --- a/res/drawable-mdpi/ic_white_balance_auto_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_white_balance_cloudy_holo_light.png b/res/drawable-mdpi/ic_white_balance_cloudy_holo_light.png Binary files differdeleted file mode 100644 index a8b2397c..00000000 --- a/res/drawable-mdpi/ic_white_balance_cloudy_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_white_balance_cloudy_holo_light_xlarge.png b/res/drawable-mdpi/ic_white_balance_cloudy_holo_light_xlarge.png Binary files differdeleted file mode 100644 index 3dbb1e2b..00000000 --- a/res/drawable-mdpi/ic_white_balance_cloudy_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_white_balance_fluorescent_holo_light.png b/res/drawable-mdpi/ic_white_balance_fluorescent_holo_light.png Binary files differdeleted file mode 100644 index 69e54587..00000000 --- a/res/drawable-mdpi/ic_white_balance_fluorescent_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_white_balance_fluorescent_holo_light_xlarge.png b/res/drawable-mdpi/ic_white_balance_fluorescent_holo_light_xlarge.png Binary files differdeleted file mode 100644 index a60a97a9..00000000 --- a/res/drawable-mdpi/ic_white_balance_fluorescent_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_white_balance_incandescent_holo_light.png b/res/drawable-mdpi/ic_white_balance_incandescent_holo_light.png Binary files differdeleted file mode 100644 index 628779ec..00000000 --- a/res/drawable-mdpi/ic_white_balance_incandescent_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_white_balance_incandescent_holo_light_xlarge.png b/res/drawable-mdpi/ic_white_balance_incandescent_holo_light_xlarge.png Binary files differdeleted file mode 100644 index 8176071b..00000000 --- a/res/drawable-mdpi/ic_white_balance_incandescent_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_white_balance_sunlight_holo_light.png b/res/drawable-mdpi/ic_white_balance_sunlight_holo_light.png Binary files differdeleted file mode 100644 index b28206c5..00000000 --- a/res/drawable-mdpi/ic_white_balance_sunlight_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_white_balance_sunlight_holo_light_xlarge.png b/res/drawable-mdpi/ic_white_balance_sunlight_holo_light_xlarge.png Binary files differdeleted file mode 100644 index a5a0ab20..00000000 --- a/res/drawable-mdpi/ic_white_balance_sunlight_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_zoom_in_holo_dark.png b/res/drawable-mdpi/ic_zoom_in_holo_dark.png Binary files differdeleted file mode 100644 index 4f332780..00000000 --- a/res/drawable-mdpi/ic_zoom_in_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_zoom_in_holo_dark_xlarge.png b/res/drawable-mdpi/ic_zoom_in_holo_dark_xlarge.png Binary files differdeleted file mode 100644 index fd352072..00000000 --- a/res/drawable-mdpi/ic_zoom_in_holo_dark_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_zoom_in_holo_light.png b/res/drawable-mdpi/ic_zoom_in_holo_light.png Binary files differdeleted file mode 100644 index 3238a393..00000000 --- a/res/drawable-mdpi/ic_zoom_in_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_zoom_in_holo_light_xlarge.png b/res/drawable-mdpi/ic_zoom_in_holo_light_xlarge.png Binary files differdeleted file mode 100644 index 3d55439b..00000000 --- a/res/drawable-mdpi/ic_zoom_in_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_zoom_out_holo_dark.png b/res/drawable-mdpi/ic_zoom_out_holo_dark.png Binary files differdeleted file mode 100644 index 26318944..00000000 --- a/res/drawable-mdpi/ic_zoom_out_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_zoom_out_holo_dark_xlarge.png b/res/drawable-mdpi/ic_zoom_out_holo_dark_xlarge.png Binary files differdeleted file mode 100644 index e2828727..00000000 --- a/res/drawable-mdpi/ic_zoom_out_holo_dark_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_zoom_out_holo_light.png b/res/drawable-mdpi/ic_zoom_out_holo_light.png Binary files differdeleted file mode 100644 index 8113dab2..00000000 --- a/res/drawable-mdpi/ic_zoom_out_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_zoom_out_holo_light_xlarge.png b/res/drawable-mdpi/ic_zoom_out_holo_light_xlarge.png Binary files differdeleted file mode 100644 index 1a5475b8..00000000 --- a/res/drawable-mdpi/ic_zoom_out_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_zoom_slider.png b/res/drawable-mdpi/ic_zoom_slider.png Binary files differdeleted file mode 100644 index 16aacf16..00000000 --- a/res/drawable-mdpi/ic_zoom_slider.png +++ /dev/null diff --git a/res/drawable-port-hdpi/btn_close_settings.png b/res/drawable-port-hdpi/btn_close_settings.png Binary files differdeleted file mode 100644 index f7b863da..00000000 --- a/res/drawable-port-hdpi/btn_close_settings.png +++ /dev/null diff --git a/res/drawable-port-hdpi/btn_close_settings_large.png b/res/drawable-port-hdpi/btn_close_settings_large.png Binary files differdeleted file mode 100644 index b595b6d1..00000000 --- a/res/drawable-port-hdpi/btn_close_settings_large.png +++ /dev/null diff --git a/res/drawable-port-hdpi/btn_pan_shutter_holo_xlarge.png b/res/drawable-port-hdpi/btn_pan_shutter_holo_xlarge.png Binary files differdeleted file mode 100644 index 1842f4c7..00000000 --- a/res/drawable-port-hdpi/btn_pan_shutter_holo_xlarge.png +++ /dev/null diff --git a/res/drawable-port-hdpi/btn_retake_shutter_holo_xlarge.png b/res/drawable-port-hdpi/btn_retake_shutter_holo_xlarge.png Binary files differdeleted file mode 100644 index cd116d7c..00000000 --- a/res/drawable-port-hdpi/btn_retake_shutter_holo_xlarge.png +++ /dev/null diff --git a/res/drawable-port-hdpi/btn_retake_shutter_pressed_holo_xlarge.png b/res/drawable-port-hdpi/btn_retake_shutter_pressed_holo_xlarge.png Binary files differdeleted file mode 100644 index b7efff2d..00000000 --- a/res/drawable-port-hdpi/btn_retake_shutter_pressed_holo_xlarge.png +++ /dev/null diff --git a/res/drawable-port-hdpi/btn_wheel_close_settings_xlarge.png b/res/drawable-port-hdpi/btn_wheel_close_settings_xlarge.png Binary files differdeleted file mode 100644 index 917ed5ae..00000000 --- a/res/drawable-port-hdpi/btn_wheel_close_settings_xlarge.png +++ /dev/null diff --git a/res/drawable-port-mdpi/btn_close_settings.png b/res/drawable-port-mdpi/btn_close_settings.png Binary files differdeleted file mode 100644 index dc24d946..00000000 --- a/res/drawable-port-mdpi/btn_close_settings.png +++ /dev/null diff --git a/res/drawable-port-mdpi/btn_pan_shutter_holo_xlarge.png b/res/drawable-port-mdpi/btn_pan_shutter_holo_xlarge.png Binary files differdeleted file mode 100644 index 6690bb2b..00000000 --- a/res/drawable-port-mdpi/btn_pan_shutter_holo_xlarge.png +++ /dev/null diff --git a/res/drawable-port-mdpi/btn_retake_shutter_holo_xlarge.png b/res/drawable-port-mdpi/btn_retake_shutter_holo_xlarge.png Binary files differdeleted file mode 100644 index 023ab33b..00000000 --- a/res/drawable-port-mdpi/btn_retake_shutter_holo_xlarge.png +++ /dev/null diff --git a/res/drawable-port-mdpi/btn_retake_shutter_pressed_holo_xlarge.png b/res/drawable-port-mdpi/btn_retake_shutter_pressed_holo_xlarge.png Binary files differdeleted file mode 100644 index c78d4bd3..00000000 --- a/res/drawable-port-mdpi/btn_retake_shutter_pressed_holo_xlarge.png +++ /dev/null diff --git a/res/drawable-port-mdpi/btn_wheel_close_settings_xlarge.png b/res/drawable-port-mdpi/btn_wheel_close_settings_xlarge.png Binary files differdeleted file mode 100644 index a02af578..00000000 --- a/res/drawable-port-mdpi/btn_wheel_close_settings_xlarge.png +++ /dev/null diff --git a/res/drawable-port-xhdpi/btn_close_settings.png b/res/drawable-port-xhdpi/btn_close_settings.png Binary files differdeleted file mode 100644 index 4226f346..00000000 --- a/res/drawable-port-xhdpi/btn_close_settings.png +++ /dev/null diff --git a/res/drawable-port-xhdpi/btn_pan_shutter_holo_xlarge.png b/res/drawable-port-xhdpi/btn_pan_shutter_holo_xlarge.png Binary files differdeleted file mode 100644 index 3af2f4df..00000000 --- a/res/drawable-port-xhdpi/btn_pan_shutter_holo_xlarge.png +++ /dev/null diff --git a/res/drawable-port-xhdpi/btn_retake_shutter_holo_xlarge.png b/res/drawable-port-xhdpi/btn_retake_shutter_holo_xlarge.png Binary files differdeleted file mode 100644 index 2718174f..00000000 --- a/res/drawable-port-xhdpi/btn_retake_shutter_holo_xlarge.png +++ /dev/null diff --git a/res/drawable-port-xhdpi/btn_retake_shutter_pressed_holo_xlarge.png b/res/drawable-port-xhdpi/btn_retake_shutter_pressed_holo_xlarge.png Binary files differdeleted file mode 100644 index 4f174338..00000000 --- a/res/drawable-port-xhdpi/btn_retake_shutter_pressed_holo_xlarge.png +++ /dev/null diff --git a/res/drawable-port-xhdpi/btn_wheel_close_settings_xlarge.png b/res/drawable-port-xhdpi/btn_wheel_close_settings_xlarge.png Binary files differdeleted file mode 100644 index 5cce7874..00000000 --- a/res/drawable-port-xhdpi/btn_wheel_close_settings_xlarge.png +++ /dev/null diff --git a/res/drawable-port/bg_camera_pattern.xml b/res/drawable-port/bg_camera_pattern.xml deleted file mode 100644 index 63b3e6f6..00000000 --- a/res/drawable-port/bg_camera_pattern.xml +++ /dev/null @@ -1,23 +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. - */ ---> -<shape xmlns:android="http://schemas.android.com/apk/res/android"> - <gradient name="bg_camera_pattern" - android:startColor="#ff000000" - android:endColor="#ff111111" /> -</shape> diff --git a/res/drawable-xhdpi/btn_pan_shutter_holo.png b/res/drawable-xhdpi/btn_pan_shutter_holo.png Binary files differdeleted file mode 100644 index 364e56c5..00000000 --- a/res/drawable-xhdpi/btn_pan_shutter_holo.png +++ /dev/null diff --git a/res/drawable-xhdpi/btn_retake_shutter_holo.png b/res/drawable-xhdpi/btn_retake_shutter_holo.png Binary files differdeleted file mode 100644 index 42a80aa1..00000000 --- a/res/drawable-xhdpi/btn_retake_shutter_holo.png +++ /dev/null diff --git a/res/drawable-xhdpi/btn_retake_shutter_pressed_holo.png b/res/drawable-xhdpi/btn_retake_shutter_pressed_holo.png Binary files differdeleted file mode 100644 index 4aa4dd09..00000000 --- a/res/drawable-xhdpi/btn_retake_shutter_pressed_holo.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_focus_face_focused.9.png b/res/drawable-xhdpi/ic_focus_face_focused.9.png Binary files differdeleted file mode 100644 index c98debc3..00000000 --- a/res/drawable-xhdpi/ic_focus_face_focused.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_focus_failed.9.png b/res/drawable-xhdpi/ic_focus_failed.9.png Binary files differdeleted file mode 100644 index 90214450..00000000 --- a/res/drawable-xhdpi/ic_focus_failed.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_focus_focused.9.png b/res/drawable-xhdpi/ic_focus_focused.9.png Binary files differdeleted file mode 100644 index 40ab6e5e..00000000 --- a/res/drawable-xhdpi/ic_focus_focused.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_focus_focusing.9.png b/res/drawable-xhdpi/ic_focus_focusing.9.png Binary files differdeleted file mode 100644 index 6b62f3ad..00000000 --- a/res/drawable-xhdpi/ic_focus_focusing.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_gallery.png b/res/drawable-xhdpi/ic_gallery.png Binary files differdeleted file mode 100644 index e7654eed..00000000 --- a/res/drawable-xhdpi/ic_gallery.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_gallery_xlarge.png b/res/drawable-xhdpi/ic_gallery_xlarge.png Binary files differdeleted file mode 100644 index 5bc1a2e1..00000000 --- a/res/drawable-xhdpi/ic_gallery_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_highlight.9.png b/res/drawable-xhdpi/ic_highlight.9.png Binary files differdeleted file mode 100644 index 81dc33ca..00000000 --- a/res/drawable-xhdpi/ic_highlight.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicators_cloudy.png b/res/drawable-xhdpi/ic_indicators_cloudy.png Binary files differdeleted file mode 100644 index a6d924b8..00000000 --- a/res/drawable-xhdpi/ic_indicators_cloudy.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicators_cloudy_xlarge.png b/res/drawable-xhdpi/ic_indicators_cloudy_xlarge.png Binary files differdeleted file mode 100644 index 2fcd2075..00000000 --- a/res/drawable-xhdpi/ic_indicators_cloudy_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicators_fluorescent.png b/res/drawable-xhdpi/ic_indicators_fluorescent.png Binary files differdeleted file mode 100644 index 012c67f6..00000000 --- a/res/drawable-xhdpi/ic_indicators_fluorescent.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicators_fluorescent_xlarge.png b/res/drawable-xhdpi/ic_indicators_fluorescent_xlarge.png Binary files differdeleted file mode 100644 index 62143255..00000000 --- a/res/drawable-xhdpi/ic_indicators_fluorescent_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicators_incandescent.png b/res/drawable-xhdpi/ic_indicators_incandescent.png Binary files differdeleted file mode 100644 index 84bbd6a0..00000000 --- a/res/drawable-xhdpi/ic_indicators_incandescent.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicators_incandescent_xlarge.png b/res/drawable-xhdpi/ic_indicators_incandescent_xlarge.png Binary files differdeleted file mode 100644 index dadc4913..00000000 --- a/res/drawable-xhdpi/ic_indicators_incandescent_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicators_landscape.png b/res/drawable-xhdpi/ic_indicators_landscape.png Binary files differdeleted file mode 100644 index ebbcd676..00000000 --- a/res/drawable-xhdpi/ic_indicators_landscape.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicators_landscape_flash_auto.png b/res/drawable-xhdpi/ic_indicators_landscape_flash_auto.png Binary files differdeleted file mode 100644 index 654746b2..00000000 --- a/res/drawable-xhdpi/ic_indicators_landscape_flash_auto.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicators_landscape_flash_auto_xlarge.png b/res/drawable-xhdpi/ic_indicators_landscape_flash_auto_xlarge.png Binary files differdeleted file mode 100644 index 4ac81d85..00000000 --- a/res/drawable-xhdpi/ic_indicators_landscape_flash_auto_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicators_landscape_flash_on.png b/res/drawable-xhdpi/ic_indicators_landscape_flash_on.png Binary files differdeleted file mode 100644 index 7f33bd5e..00000000 --- a/res/drawable-xhdpi/ic_indicators_landscape_flash_on.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicators_landscape_flash_on_xlarge.png b/res/drawable-xhdpi/ic_indicators_landscape_flash_on_xlarge.png Binary files differdeleted file mode 100644 index 9bb5afa6..00000000 --- a/res/drawable-xhdpi/ic_indicators_landscape_flash_on_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicators_landscape_xlarge.png b/res/drawable-xhdpi/ic_indicators_landscape_xlarge.png Binary files differdeleted file mode 100644 index 224a0c88..00000000 --- a/res/drawable-xhdpi/ic_indicators_landscape_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicators_macro.png b/res/drawable-xhdpi/ic_indicators_macro.png Binary files differdeleted file mode 100644 index 7d34b856..00000000 --- a/res/drawable-xhdpi/ic_indicators_macro.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicators_macro_xlarge.png b/res/drawable-xhdpi/ic_indicators_macro_xlarge.png Binary files differdeleted file mode 100644 index 5c83fec5..00000000 --- a/res/drawable-xhdpi/ic_indicators_macro_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicators_scn.png b/res/drawable-xhdpi/ic_indicators_scn.png Binary files differdeleted file mode 100644 index fafc0bc0..00000000 --- a/res/drawable-xhdpi/ic_indicators_scn.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicators_scn_xlarge.png b/res/drawable-xhdpi/ic_indicators_scn_xlarge.png Binary files differdeleted file mode 100644 index 0d145fb8..00000000 --- a/res/drawable-xhdpi/ic_indicators_scn_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicators_sunlight.png b/res/drawable-xhdpi/ic_indicators_sunlight.png Binary files differdeleted file mode 100644 index 71a0f687..00000000 --- a/res/drawable-xhdpi/ic_indicators_sunlight.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_indicators_sunlight_xlarge.png b/res/drawable-xhdpi/ic_indicators_sunlight_xlarge.png Binary files differdeleted file mode 100644 index 79a8e46d..00000000 --- a/res/drawable-xhdpi/ic_indicators_sunlight_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_menu_overflow.png b/res/drawable-xhdpi/ic_menu_overflow.png Binary files differdeleted file mode 100644 index 715cff8c..00000000 --- a/res/drawable-xhdpi/ic_menu_overflow.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_menu_overflow_xlarge.png b/res/drawable-xhdpi/ic_menu_overflow_xlarge.png Binary files differdeleted file mode 100644 index cd509d2d..00000000 --- a/res/drawable-xhdpi/ic_menu_overflow_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_shot_border.9.png b/res/drawable-xhdpi/ic_shot_border.9.png Binary files differdeleted file mode 100644 index 9795cdd4..00000000 --- a/res/drawable-xhdpi/ic_shot_border.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_shot_border_xlarge.9.png b/res/drawable-xhdpi/ic_shot_border_xlarge.9.png Binary files differdeleted file mode 100644 index f1040ad0..00000000 --- a/res/drawable-xhdpi/ic_shot_border_xlarge.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_switch_camera_holo_light.png b/res/drawable-xhdpi/ic_switch_camera_holo_light.png Binary files differdeleted file mode 100644 index 1c011e49..00000000 --- a/res/drawable-xhdpi/ic_switch_camera_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_switch_pan_holo_light.png b/res/drawable-xhdpi/ic_switch_pan_holo_light.png Binary files differdeleted file mode 100644 index bec0863f..00000000 --- a/res/drawable-xhdpi/ic_switch_pan_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_switch_video_holo_light.png b/res/drawable-xhdpi/ic_switch_video_holo_light.png Binary files differdeleted file mode 100644 index 26fc1573..00000000 --- a/res/drawable-xhdpi/ic_switch_video_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_timelapse_1.png b/res/drawable-xhdpi/ic_timelapse_1.png Binary files differdeleted file mode 100644 index 978a5f98..00000000 --- a/res/drawable-xhdpi/ic_timelapse_1.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_timelapse_10.png b/res/drawable-xhdpi/ic_timelapse_10.png Binary files differdeleted file mode 100644 index 2c263744..00000000 --- a/res/drawable-xhdpi/ic_timelapse_10.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_timelapse_10_xlarge.png b/res/drawable-xhdpi/ic_timelapse_10_xlarge.png Binary files differdeleted file mode 100644 index 2a1b6179..00000000 --- a/res/drawable-xhdpi/ic_timelapse_10_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_timelapse_1_5.png b/res/drawable-xhdpi/ic_timelapse_1_5.png Binary files differdeleted file mode 100644 index 51b800fc..00000000 --- a/res/drawable-xhdpi/ic_timelapse_1_5.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_timelapse_1_5_xlarge.png b/res/drawable-xhdpi/ic_timelapse_1_5_xlarge.png Binary files differdeleted file mode 100644 index 923cec8b..00000000 --- a/res/drawable-xhdpi/ic_timelapse_1_5_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_timelapse_1_xlarge.png b/res/drawable-xhdpi/ic_timelapse_1_xlarge.png Binary files differdeleted file mode 100644 index aa89d30a..00000000 --- a/res/drawable-xhdpi/ic_timelapse_1_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_timelapse_2.png b/res/drawable-xhdpi/ic_timelapse_2.png Binary files differdeleted file mode 100644 index ff02d1f8..00000000 --- a/res/drawable-xhdpi/ic_timelapse_2.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_timelapse_2_5.png b/res/drawable-xhdpi/ic_timelapse_2_5.png Binary files differdeleted file mode 100644 index e38fc04c..00000000 --- a/res/drawable-xhdpi/ic_timelapse_2_5.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_timelapse_2_5_xlarge.png b/res/drawable-xhdpi/ic_timelapse_2_5_xlarge.png Binary files differdeleted file mode 100644 index c12ecd7c..00000000 --- a/res/drawable-xhdpi/ic_timelapse_2_5_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_timelapse_2_xlarge.png b/res/drawable-xhdpi/ic_timelapse_2_xlarge.png Binary files differdeleted file mode 100644 index a7011425..00000000 --- a/res/drawable-xhdpi/ic_timelapse_2_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_timelapse_3.png b/res/drawable-xhdpi/ic_timelapse_3.png Binary files differdeleted file mode 100644 index 401c733f..00000000 --- a/res/drawable-xhdpi/ic_timelapse_3.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_timelapse_3_xlarge.png b/res/drawable-xhdpi/ic_timelapse_3_xlarge.png Binary files differdeleted file mode 100644 index d3f681ff..00000000 --- a/res/drawable-xhdpi/ic_timelapse_3_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_timelapse_5.png b/res/drawable-xhdpi/ic_timelapse_5.png Binary files differdeleted file mode 100644 index 7ed793be..00000000 --- a/res/drawable-xhdpi/ic_timelapse_5.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_timelapse_5_xlarge.png b/res/drawable-xhdpi/ic_timelapse_5_xlarge.png Binary files differdeleted file mode 100644 index 1eca86ff..00000000 --- a/res/drawable-xhdpi/ic_timelapse_5_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_white_balance_auto_holo_light.png b/res/drawable-xhdpi/ic_white_balance_auto_holo_light.png Binary files differdeleted file mode 100644 index 0b981972..00000000 --- a/res/drawable-xhdpi/ic_white_balance_auto_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_white_balance_auto_holo_light_xlarge.png b/res/drawable-xhdpi/ic_white_balance_auto_holo_light_xlarge.png Binary files differdeleted file mode 100644 index cc419970..00000000 --- a/res/drawable-xhdpi/ic_white_balance_auto_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_white_balance_cloudy_holo_light.png b/res/drawable-xhdpi/ic_white_balance_cloudy_holo_light.png Binary files differdeleted file mode 100644 index bf0c8fb9..00000000 --- a/res/drawable-xhdpi/ic_white_balance_cloudy_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_white_balance_cloudy_holo_light_xlarge.png b/res/drawable-xhdpi/ic_white_balance_cloudy_holo_light_xlarge.png Binary files differdeleted file mode 100644 index b47c7966..00000000 --- a/res/drawable-xhdpi/ic_white_balance_cloudy_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_white_balance_fluorescent_holo_light.png b/res/drawable-xhdpi/ic_white_balance_fluorescent_holo_light.png Binary files differdeleted file mode 100644 index 253552e2..00000000 --- a/res/drawable-xhdpi/ic_white_balance_fluorescent_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_white_balance_fluorescent_holo_light_xlarge.png b/res/drawable-xhdpi/ic_white_balance_fluorescent_holo_light_xlarge.png Binary files differdeleted file mode 100644 index 67923455..00000000 --- a/res/drawable-xhdpi/ic_white_balance_fluorescent_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_white_balance_incandescent_holo_light.png b/res/drawable-xhdpi/ic_white_balance_incandescent_holo_light.png Binary files differdeleted file mode 100644 index 1e1750e5..00000000 --- a/res/drawable-xhdpi/ic_white_balance_incandescent_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_white_balance_incandescent_holo_light_xlarge.png b/res/drawable-xhdpi/ic_white_balance_incandescent_holo_light_xlarge.png Binary files differdeleted file mode 100644 index 9d0f1a32..00000000 --- a/res/drawable-xhdpi/ic_white_balance_incandescent_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_white_balance_sunlight_holo_light.png b/res/drawable-xhdpi/ic_white_balance_sunlight_holo_light.png Binary files differdeleted file mode 100644 index a3b7d1f3..00000000 --- a/res/drawable-xhdpi/ic_white_balance_sunlight_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_white_balance_sunlight_holo_light_xlarge.png b/res/drawable-xhdpi/ic_white_balance_sunlight_holo_light_xlarge.png Binary files differdeleted file mode 100644 index 5388a665..00000000 --- a/res/drawable-xhdpi/ic_white_balance_sunlight_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_zoom_in_holo_dark.png b/res/drawable-xhdpi/ic_zoom_in_holo_dark.png Binary files differdeleted file mode 100644 index 78178cd8..00000000 --- a/res/drawable-xhdpi/ic_zoom_in_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_zoom_in_holo_light.png b/res/drawable-xhdpi/ic_zoom_in_holo_light.png Binary files differdeleted file mode 100644 index 38897025..00000000 --- a/res/drawable-xhdpi/ic_zoom_in_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_zoom_out_holo_dark.png b/res/drawable-xhdpi/ic_zoom_out_holo_dark.png Binary files differdeleted file mode 100644 index 426aac80..00000000 --- a/res/drawable-xhdpi/ic_zoom_out_holo_dark.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_zoom_out_holo_dark_xlarge.png b/res/drawable-xhdpi/ic_zoom_out_holo_dark_xlarge.png Binary files differdeleted file mode 100644 index 34064d73..00000000 --- a/res/drawable-xhdpi/ic_zoom_out_holo_dark_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_zoom_out_holo_light.png b/res/drawable-xhdpi/ic_zoom_out_holo_light.png Binary files differdeleted file mode 100644 index fdf9ab2f..00000000 --- a/res/drawable-xhdpi/ic_zoom_out_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_zoom_out_holo_light_xlarge.png b/res/drawable-xhdpi/ic_zoom_out_holo_light_xlarge.png Binary files differdeleted file mode 100644 index 6297de4d..00000000 --- a/res/drawable-xhdpi/ic_zoom_out_holo_light_xlarge.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_zoom_slider.png b/res/drawable-xhdpi/ic_zoom_slider.png Binary files differdeleted file mode 100644 index 9501f921..00000000 --- a/res/drawable-xhdpi/ic_zoom_slider.png +++ /dev/null diff --git a/res/drawable/border_last_picture.xml b/res/drawable/border_last_picture.xml deleted file mode 100644 index 0cc6f8ab..00000000 --- a/res/drawable/border_last_picture.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 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_pressed="true" android:drawable="@drawable/ic_highlight" /> - <item android:drawable="@android:color/transparent" /> -</selector> - diff --git a/res/drawable/btn_setting_picker.xml b/res/drawable/btn_setting_picker.xml deleted file mode 100644 index 4ecfe95e..00000000 --- a/res/drawable/btn_setting_picker.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 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_pressed="true" android:color="@android:color/white" /> - <item android:color="@android:color/darker_gray" /> -</selector> diff --git a/res/drawable/btn_shutter.xml b/res/drawable/btn_shutter.xml deleted file mode 100644 index 983a2698..00000000 --- a/res/drawable/btn_shutter.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 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_pressed="true" android:drawable="@drawable/btn_camera_shutter_pressed_holo" /> - <item android:drawable="@drawable/btn_camera_shutter_holo" /> -</selector> - diff --git a/res/drawable/btn_shutter_pan.xml b/res/drawable/btn_shutter_pan.xml deleted file mode 100644 index c0772606..00000000 --- a/res/drawable/btn_shutter_pan.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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_pressed="true" - android:drawable="@drawable/btn_pan_shutter_pressed_holo" /> <!-- pressed --> - <item android:state_focused="true" - android:drawable="@drawable/btn_pan_shutter_holo" /> <!-- focused --> - <item android:drawable="@drawable/btn_pan_shutter_holo" /> <!-- default --> -</selector> diff --git a/res/drawable/btn_shutter_pan_recording.xml b/res/drawable/btn_shutter_pan_recording.xml deleted file mode 100644 index 26c9dd20..00000000 --- a/res/drawable/btn_shutter_pan_recording.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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_pressed="true" - android:drawable="@drawable/btn_pan_shutter_recording_pressed_holo" /> <!-- pressed --> - <item android:state_focused="true" - android:drawable="@drawable/btn_pan_shutter_recording_holo" /> <!-- focused --> - <item android:drawable="@drawable/btn_pan_shutter_recording_holo" /> <!-- default --> -</selector> diff --git a/res/drawable/btn_shutter_retake.xml b/res/drawable/btn_shutter_retake.xml deleted file mode 100644 index 0a836b9b..00000000 --- a/res/drawable/btn_shutter_retake.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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_pressed="true" android:drawable="@drawable/btn_retake_shutter_pressed_holo" /> - <item android:drawable="@drawable/btn_retake_shutter_holo" /> -</selector> - diff --git a/res/drawable/btn_shutter_video.xml b/res/drawable/btn_shutter_video.xml deleted file mode 100644 index 04dcec96..00000000 --- a/res/drawable/btn_shutter_video.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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_pressed="true" android:drawable="@drawable/btn_video_shutter_pressed_holo" /> - <item android:drawable="@drawable/btn_video_shutter_holo" /> -</selector> - diff --git a/res/drawable/ic_zoom_in.xml b/res/drawable/ic_zoom_in.xml deleted file mode 100644 index 7fa4dac2..00000000 --- a/res/drawable/ic_zoom_in.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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_selected="true" android:drawable="@drawable/ic_zoom_in_holo_light" /> - <item android:drawable="@drawable/ic_zoom_in_holo_dark" /> -</selector> - diff --git a/res/drawable/ic_zoom_out.xml b/res/drawable/ic_zoom_out.xml deleted file mode 100644 index 46d2a94c..00000000 --- a/res/drawable/ic_zoom_out.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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_selected="true" android:drawable="@drawable/ic_zoom_out_holo_light" /> - <item android:drawable="@drawable/ic_zoom_out_holo_dark" /> -</selector> - diff --git a/res/drawable/zoom_slider_bar.xml b/res/drawable/zoom_slider_bar.xml deleted file mode 100644 index d3e14358..00000000 --- a/res/drawable/zoom_slider_bar.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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_selected="true" android:drawable="@drawable/ic_zoom_big" /> - <item android:drawable="@drawable/ic_zoom_big_dark" /> -</selector> - diff --git a/res/layout/focus_indicator.xml b/res/layout/focus_indicator.xml deleted file mode 100644 index 8a1d4c16..00000000 --- a/res/layout/focus_indicator.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<com.android.camera.ui.FocusIndicatorRotateLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/focus_indicator_rotate_layout" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_centerInParent="true"> - <View android:id="@+id/focus_indicator" - android:layout_height="120dp" - android:layout_width="120dp"/> -</com.android.camera.ui.FocusIndicatorRotateLayout> diff --git a/res/values-large-hdpi/drawable.xml b/res/values-large-hdpi/drawable.xml index d000f63d..119ab1de 100644 --- a/res/values-large-hdpi/drawable.xml +++ b/res/values-large-hdpi/drawable.xml @@ -14,17 +14,6 @@ limitations under the License. --> <resources> - <item name="btn_camera_shutter_holo" type="drawable">@drawable/btn_camera_shutter_holo_large</item> - <item name="btn_camera_shutter_pressed_holo" type="drawable">@drawable/btn_camera_shutter_pressed_holo_large</item> - <item name="btn_close_settings" type="drawable">@drawable/btn_close_settings_large</item> - <item name="btn_pan_shutter_holo" type="drawable">@drawable/btn_pan_shutter_holo_large</item> - <item name="btn_pan_shutter_pressed_holo" type="drawable">@drawable/btn_pan_shutter_pressed_holo_large</item> - <item name="btn_pan_shutter_recording_holo" type="drawable">@drawable/btn_pan_shutter_recording_holo_large</item> - <item name="btn_pan_shutter_recording_pressed_holo" type="drawable">@drawable/btn_pan_shutter_recording_pressed_holo_large</item> - <item name="btn_retake_shutter_holo" type="drawable">@drawable/btn_retake_shutter_holo_large</item> - <item name="btn_retake_shutter_pressed_holo" type="drawable">@drawable/btn_retake_shutter_pressed_holo_large</item> - <item name="btn_video_shutter_holo" type="drawable">@drawable/btn_video_shutter_holo_large</item> - <item name="btn_video_shutter_pressed_holo" type="drawable">@drawable/btn_video_shutter_pressed_holo_large</item> <item name="btn_video_shutter_recording_holo" type="drawable">@drawable/btn_video_shutter_recording_holo_large</item> <item name="btn_video_shutter_recording_pressed_holo" type="drawable">@drawable/btn_video_shutter_recording_pressed_holo_large</item> <item name="ic_effects_holo_light" type="drawable">@drawable/ic_effects_holo_light_large</item> @@ -32,17 +21,6 @@ <item name="ic_flash_auto_holo_light" type="drawable">@drawable/ic_flash_auto_holo_light_large</item> <item name="ic_flash_off_holo_light" type="drawable">@drawable/ic_flash_off_holo_light_large</item> <item name="ic_flash_on_holo_light" type="drawable">@drawable/ic_flash_on_holo_light_large</item> - <item name="ic_gallery" type="drawable">@drawable/ic_gallery_large</item> - <item name="ic_indicators_cloudy" type="drawable">@drawable/ic_indicators_cloudy_large</item> - <item name="ic_indicators_fluorescent" type="drawable">@drawable/ic_indicators_fluorescent_large</item> - <item name="ic_indicators_incandescent" type="drawable">@drawable/ic_indicators_incandescent_large</item> - <item name="ic_indicators_landscape_flash_auto" type="drawable">@drawable/ic_indicators_landscape_flash_auto_large</item> - <item name="ic_indicators_landscape_flash_on" type="drawable">@drawable/ic_indicators_landscape_flash_on_large</item> - <item name="ic_indicators_landscape" type="drawable">@drawable/ic_indicators_landscape_large</item> - <item name="ic_indicators_macro" type="drawable">@drawable/ic_indicators_macro_large</item> - <item name="ic_indicators_scn" type="drawable">@drawable/ic_indicators_scn_large</item> - <item name="ic_indicators_sunlight" type="drawable">@drawable/ic_indicators_sunlight_large</item> - <item name="ic_menu_overflow" type="drawable">@drawable/ic_menu_overflow_large</item> <item name="ic_pan_border_fast" type="drawable">@drawable/ic_pan_border_fast_large</item> <item name="ic_pan_left_indicator_fast" type="drawable">@drawable/ic_pan_left_indicator_fast_large</item> <item name="ic_pan_left_indicator" type="drawable">@drawable/ic_pan_left_indicator_large</item> @@ -54,23 +32,6 @@ <item name="ic_snapshot_border" type="drawable">@drawable/ic_snapshot_border_large</item> <item name="ic_switch_photo_facing_holo_light" type="drawable">@drawable/ic_switch_photo_facing_holo_light_large</item> <item name="ic_switch_video_facing_holo_light" type="drawable">@drawable/ic_switch_video_facing_holo_light_large</item> - <item name="ic_timelapse_10" type="drawable">@drawable/ic_timelapse_10_large</item> - <item name="ic_timelapse_1_5" type="drawable">@drawable/ic_timelapse_1_5_large</item> - <item name="ic_timelapse_1" type="drawable">@drawable/ic_timelapse_1_large</item> - <item name="ic_timelapse_2_5" type="drawable">@drawable/ic_timelapse_2_5_large</item> - <item name="ic_timelapse_2" type="drawable">@drawable/ic_timelapse_2_large</item> - <item name="ic_timelapse_3" type="drawable">@drawable/ic_timelapse_3_large</item> - <item name="ic_timelapse_5" type="drawable">@drawable/ic_timelapse_5_large</item> <item name="ic_timelapse_none" type="drawable">@drawable/ic_timelapse_none_large</item> - <item name="ic_white_balance_auto_holo_light" type="drawable">@drawable/ic_white_balance_auto_holo_light_large</item> - <item name="ic_white_balance_cloudy_holo_light" type="drawable">@drawable/ic_white_balance_cloudy_holo_light_large</item> - <item name="ic_white_balance_fluorescent_holo_light" type="drawable">@drawable/ic_white_balance_fluorescent_holo_light_large</item> - <item name="ic_white_balance_incandescent_holo_light" type="drawable">@drawable/ic_white_balance_incandescent_holo_light_large</item> - <item name="ic_white_balance_sunlight_holo_light" type="drawable">@drawable/ic_white_balance_sunlight_holo_light_large</item> - <item name="ic_zoom_in_holo_dark" type="drawable">@drawable/ic_zoom_in_holo_dark_large</item> - <item name="ic_zoom_in_holo_light" type="drawable">@drawable/ic_zoom_in_holo_light_large</item> - <item name="ic_zoom_out_holo_dark" type="drawable">@drawable/ic_zoom_out_holo_dark_large</item> - <item name="ic_zoom_out_holo_light" type="drawable">@drawable/ic_zoom_out_holo_light_large</item> - <item name="ic_zoom_slider" type="drawable">@drawable/ic_zoom_slider_large</item> <item name="list_divider" type="drawable">@drawable/list_divider_large</item> </resources> diff --git a/res/values-large-land-hdpi/drawable.xml b/res/values-large-land-hdpi/drawable.xml deleted file mode 100644 index fee275a2..00000000 --- a/res/values-large-land-hdpi/drawable.xml +++ /dev/null @@ -1,19 +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. ---> -<resources> - <item name="ic_zoom_big" type="drawable">@drawable/ic_zoom_big_large</item> - <item name="ic_zoom_big_dark" type="drawable">@drawable/ic_zoom_big_dark_large</item> -</resources> diff --git a/res/values-large-port-hdpi/drawable.xml b/res/values-large-port-hdpi/drawable.xml deleted file mode 100644 index fee275a2..00000000 --- a/res/values-large-port-hdpi/drawable.xml +++ /dev/null @@ -1,19 +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. ---> -<resources> - <item name="ic_zoom_big" type="drawable">@drawable/ic_zoom_big_large</item> - <item name="ic_zoom_big_dark" type="drawable">@drawable/ic_zoom_big_dark_large</item> -</resources> diff --git a/res/values-sw600dp-hdpi/drawable.xml b/res/values-sw600dp-hdpi/drawable.xml index b66e963e..119ab1de 100644 --- a/res/values-sw600dp-hdpi/drawable.xml +++ b/res/values-sw600dp-hdpi/drawable.xml @@ -14,17 +14,6 @@ limitations under the License. --> <resources> - <item name="btn_camera_shutter_holo" type="drawable">@drawable/btn_camera_shutter_holo_large</item> - <item name="btn_camera_shutter_pressed_holo" type="drawable">@drawable/btn_camera_shutter_pressed_holo_large</item> - <item name="btn_close_settings" type="drawable">@drawable/btn_close_settings_large</item> - <item name="btn_pan_shutter_holo" type="drawable">@drawable/btn_pan_shutter_holo_large</item> - <item name="btn_pan_shutter_pressed_holo" type="drawable">@drawable/btn_pan_shutter_pressed_holo_large</item> - <item name="btn_pan_shutter_recording_holo" type="drawable">@drawable/btn_pan_shutter_recording_holo_large</item> - <item name="btn_pan_shutter_recording_pressed_holo" type="drawable">@drawable/btn_pan_shutter_recording_pressed_holo_large</item> - <item name="btn_retake_shutter_holo" type="drawable">@drawable/btn_retake_shutter_holo_large</item> - <item name="btn_retake_shutter_pressed_holo" type="drawable">@drawable/btn_retake_shutter_pressed_holo_large</item> - <item name="btn_video_shutter_holo" type="drawable">@drawable/btn_video_shutter_holo_large</item> - <item name="btn_video_shutter_pressed_holo" type="drawable">@drawable/btn_video_shutter_pressed_holo_large</item> <item name="btn_video_shutter_recording_holo" type="drawable">@drawable/btn_video_shutter_recording_holo_large</item> <item name="btn_video_shutter_recording_pressed_holo" type="drawable">@drawable/btn_video_shutter_recording_pressed_holo_large</item> <item name="ic_effects_holo_light" type="drawable">@drawable/ic_effects_holo_light_large</item> @@ -32,17 +21,6 @@ <item name="ic_flash_auto_holo_light" type="drawable">@drawable/ic_flash_auto_holo_light_large</item> <item name="ic_flash_off_holo_light" type="drawable">@drawable/ic_flash_off_holo_light_large</item> <item name="ic_flash_on_holo_light" type="drawable">@drawable/ic_flash_on_holo_light_large</item> - <item name="ic_gallery" type="drawable">@drawable/ic_gallery_large</item> - <item name="ic_indicators_cloudy" type="drawable">@drawable/ic_indicators_cloudy_large</item> - <item name="ic_indicators_fluorescent" type="drawable">@drawable/ic_indicators_fluorescent_large</item> - <item name="ic_indicators_incandescent" type="drawable">@drawable/ic_indicators_incandescent_large</item> - <item name="ic_indicators_landscape_flash_auto" type="drawable">@drawable/ic_indicators_landscape_flash_auto_large</item> - <item name="ic_indicators_landscape_flash_on" type="drawable">@drawable/ic_indicators_landscape_flash_on_large</item> - <item name="ic_indicators_landscape" type="drawable">@drawable/ic_indicators_landscape_large</item> - <item name="ic_indicators_macro" type="drawable">@drawable/ic_indicators_macro_large</item> - <item name="ic_indicators_scn" type="drawable">@drawable/ic_indicators_scn_large</item> - <item name="ic_indicators_sunlight" type="drawable">@drawable/ic_indicators_sunlight_large</item> - <item name="ic_menu_overflow" type="drawable">@drawable/ic_menu_overflow_large</item> <item name="ic_pan_border_fast" type="drawable">@drawable/ic_pan_border_fast_large</item> <item name="ic_pan_left_indicator_fast" type="drawable">@drawable/ic_pan_left_indicator_fast_large</item> <item name="ic_pan_left_indicator" type="drawable">@drawable/ic_pan_left_indicator_large</item> @@ -54,25 +32,6 @@ <item name="ic_snapshot_border" type="drawable">@drawable/ic_snapshot_border_large</item> <item name="ic_switch_photo_facing_holo_light" type="drawable">@drawable/ic_switch_photo_facing_holo_light_large</item> <item name="ic_switch_video_facing_holo_light" type="drawable">@drawable/ic_switch_video_facing_holo_light_large</item> - <item name="ic_timelapse_10" type="drawable">@drawable/ic_timelapse_10_large</item> - <item name="ic_timelapse_1_5" type="drawable">@drawable/ic_timelapse_1_5_large</item> - <item name="ic_timelapse_1" type="drawable">@drawable/ic_timelapse_1_large</item> - <item name="ic_timelapse_2_5" type="drawable">@drawable/ic_timelapse_2_5_large</item> - <item name="ic_timelapse_2" type="drawable">@drawable/ic_timelapse_2_large</item> - <item name="ic_timelapse_3" type="drawable">@drawable/ic_timelapse_3_large</item> - <item name="ic_timelapse_5" type="drawable">@drawable/ic_timelapse_5_large</item> <item name="ic_timelapse_none" type="drawable">@drawable/ic_timelapse_none_large</item> - <item name="ic_white_balance_auto_holo_light" type="drawable">@drawable/ic_white_balance_auto_holo_light_large</item> - <item name="ic_white_balance_cloudy_holo_light" type="drawable">@drawable/ic_white_balance_cloudy_holo_light_large</item> - <item name="ic_white_balance_fluorescent_holo_light" type="drawable">@drawable/ic_white_balance_fluorescent_holo_light_large</item> - <item name="ic_white_balance_incandescent_holo_light" type="drawable">@drawable/ic_white_balance_incandescent_holo_light_large</item> - <item name="ic_white_balance_sunlight_holo_light" type="drawable">@drawable/ic_white_balance_sunlight_holo_light_large</item> - <item name="ic_zoom_in_holo_dark" type="drawable">@drawable/ic_zoom_in_holo_dark_large</item> - <item name="ic_zoom_in_holo_light" type="drawable">@drawable/ic_zoom_in_holo_light_large</item> - <item name="ic_zoom_out_holo_dark" type="drawable">@drawable/ic_zoom_out_holo_dark_large</item> - <item name="ic_zoom_out_holo_light" type="drawable">@drawable/ic_zoom_out_holo_light_large</item> - <item name="ic_zoom_slider" type="drawable">@drawable/ic_zoom_slider_large</item> <item name="list_divider" type="drawable">@drawable/list_divider_large</item> - <item name="ic_zoom_big" type="drawable">@drawable/ic_zoom_big_large</item> - <item name="ic_zoom_big_dark" type="drawable">@drawable/ic_zoom_big_dark_large</item> </resources> diff --git a/res/values-sw640dp/drawable.xml b/res/values-sw640dp/drawable.xml index a0f9a153..77d453c4 100644 --- a/res/values-sw640dp/drawable.xml +++ b/res/values-sw640dp/drawable.xml @@ -14,22 +14,13 @@ limitations under the License. --> <resources> + <item name="btn_video_shutter_recording_holo" type="drawable">@drawable/btn_video_shutter_recording_holo_xlarge</item> + <item name="btn_video_shutter_recording_pressed_holo" type="drawable">@drawable/btn_video_shutter_recording_pressed_holo_xlarge</item> <item name="ic_effects_holo_light" type="drawable">@drawable/ic_effects_holo_light_xlarge</item> <item name="ic_exposure_holo_light" type="drawable">@drawable/ic_exposure_holo_light_xlarge</item> <item name="ic_flash_auto_holo_light" type="drawable">@drawable/ic_flash_auto_holo_light_xlarge</item> <item name="ic_flash_off_holo_light" type="drawable">@drawable/ic_flash_off_holo_light_xlarge</item> <item name="ic_flash_on_holo_light" type="drawable">@drawable/ic_flash_on_holo_light_xlarge</item> - <item name="ic_gallery" type="drawable">@drawable/ic_gallery_xlarge</item> - <item name="ic_indicators_cloudy" type="drawable">@drawable/ic_indicators_cloudy_xlarge</item> - <item name="ic_indicators_fluorescent" type="drawable">@drawable/ic_indicators_fluorescent_xlarge</item> - <item name="ic_indicators_incandescent" type="drawable">@drawable/ic_indicators_incandescent_xlarge</item> - <item name="ic_indicators_landscape_flash_auto" type="drawable">@drawable/ic_indicators_landscape_flash_auto_xlarge</item> - <item name="ic_indicators_landscape_flash_on" type="drawable">@drawable/ic_indicators_landscape_flash_on_xlarge</item> - <item name="ic_indicators_landscape" type="drawable">@drawable/ic_indicators_landscape_xlarge</item> - <item name="ic_indicators_macro" type="drawable">@drawable/ic_indicators_macro_xlarge</item> - <item name="ic_indicators_scn" type="drawable">@drawable/ic_indicators_scn_xlarge</item> - <item name="ic_indicators_sunlight" type="drawable">@drawable/ic_indicators_sunlight_xlarge</item> - <item name="ic_menu_overflow" type="drawable">@drawable/ic_menu_overflow_xlarge</item> <item name="ic_pan_border_fast" type="drawable">@drawable/ic_pan_border_fast_xlarge</item> <item name="ic_pan_left_indicator_fast" type="drawable">@drawable/ic_pan_left_indicator_fast_xlarge</item> <item name="ic_pan_left_indicator" type="drawable">@drawable/ic_pan_left_indicator_xlarge</item> @@ -38,38 +29,8 @@ <item name="ic_pan_right_indicator" type="drawable">@drawable/ic_pan_right_indicator_xlarge</item> <item name="ic_scn_holo_light" type="drawable">@drawable/ic_scn_holo_light_xlarge</item> <item name="ic_settings_holo_light" type="drawable">@drawable/ic_settings_holo_light_xlarge</item> - <item name="ic_shot_border" type="drawable">@drawable/ic_shot_border_xlarge</item> <item name="ic_snapshot_border" type="drawable">@drawable/ic_snapshot_border_xlarge</item> <item name="ic_switch_photo_facing_holo_light" type="drawable">@drawable/ic_switch_photo_facing_holo_light_xlarge</item> <item name="ic_switch_video_facing_holo_light" type="drawable">@drawable/ic_switch_video_facing_holo_light_xlarge</item> - <item name="ic_timelapse_10" type="drawable">@drawable/ic_timelapse_10_xlarge</item> - <item name="ic_timelapse_1_5" type="drawable">@drawable/ic_timelapse_1_5_xlarge</item> - <item name="ic_timelapse_1" type="drawable">@drawable/ic_timelapse_1_xlarge</item> - <item name="ic_timelapse_2_5" type="drawable">@drawable/ic_timelapse_2_5_xlarge</item> - <item name="ic_timelapse_2" type="drawable">@drawable/ic_timelapse_2_xlarge</item> - <item name="ic_timelapse_3" type="drawable">@drawable/ic_timelapse_3_xlarge</item> - <item name="ic_timelapse_5" type="drawable">@drawable/ic_timelapse_5_xlarge</item> <item name="ic_timelapse_none" type="drawable">@drawable/ic_timelapse_none_xlarge</item> - <item name="ic_white_balance_auto_holo_light" type="drawable">@drawable/ic_white_balance_auto_holo_light_xlarge</item> - <item name="ic_white_balance_cloudy_holo_light" type="drawable">@drawable/ic_white_balance_cloudy_holo_light_xlarge</item> - <item name="ic_white_balance_fluorescent_holo_light" type="drawable">@drawable/ic_white_balance_fluorescent_holo_light_xlarge</item> - <item name="ic_white_balance_incandescent_holo_light" type="drawable">@drawable/ic_white_balance_incandescent_holo_light_xlarge</item> - <item name="ic_white_balance_sunlight_holo_light" type="drawable">@drawable/ic_white_balance_sunlight_holo_light_xlarge</item> - <item name="ic_zoom_in_holo_dark" type="drawable">@drawable/ic_zoom_in_holo_dark_xlarge</item> - <item name="ic_zoom_in_holo_light" type="drawable">@drawable/ic_zoom_in_holo_light_xlarge</item> - <item name="ic_zoom_out_holo_dark" type="drawable">@drawable/ic_zoom_out_holo_dark_xlarge</item> - <item name="ic_zoom_out_holo_light" type="drawable">@drawable/ic_zoom_out_holo_light_xlarge</item> - <item name="btn_camera_shutter_holo" type="drawable">@drawable/btn_camera_shutter_holo_xlarge</item> - <item name="btn_camera_shutter_pressed_holo" type="drawable">@drawable/btn_camera_shutter_pressed_holo_xlarge</item> - <item name="btn_pan_shutter_holo" type="drawable">@drawable/btn_pan_shutter_holo_xlarge</item> - <item name="btn_pan_shutter_pressed_holo" type="drawable">@drawable/btn_pan_shutter_pressed_holo_xlarge</item> - <item name="btn_pan_shutter_recording_holo" type="drawable">@drawable/btn_pan_shutter_recording_holo_xlarge</item> - <item name="btn_pan_shutter_recording_pressed_holo" type="drawable">@drawable/btn_pan_shutter_recording_pressed_holo_xlarge</item> - <item name="btn_retake_shutter_holo" type="drawable">@drawable/btn_retake_shutter_holo_xlarge</item> - <item name="btn_retake_shutter_pressed_holo" type="drawable">@drawable/btn_retake_shutter_pressed_holo_xlarge</item> - <item name="btn_video_shutter_holo" type="drawable">@drawable/btn_video_shutter_holo_xlarge</item> - <item name="btn_video_shutter_pressed_holo" type="drawable">@drawable/btn_video_shutter_pressed_holo_xlarge</item> - <item name="btn_video_shutter_recording_holo" type="drawable">@drawable/btn_video_shutter_recording_holo_xlarge</item> - <item name="btn_video_shutter_recording_pressed_holo" type="drawable">@drawable/btn_video_shutter_recording_pressed_holo_xlarge</item> - <item name="btn_wheel_close_settings" type="drawable">@drawable/btn_wheel_close_settings_xlarge</item> </resources> diff --git a/res/values-xlarge-land/drawable.xml b/res/values-xlarge-land/drawable.xml index a8649bf2..29944799 100644 --- a/res/values-xlarge-land/drawable.xml +++ b/res/values-xlarge-land/drawable.xml @@ -17,17 +17,6 @@ the resources listed in this file wouldn't be reloaded when device orientation changes. --> <resources> - <item name="btn_camera_shutter_holo" type="drawable">@drawable/btn_camera_shutter_holo_xlarge</item> - <item name="btn_camera_shutter_pressed_holo" type="drawable">@drawable/btn_camera_shutter_pressed_holo_xlarge</item> - <item name="btn_pan_shutter_holo" type="drawable">@drawable/btn_pan_shutter_holo_xlarge</item> - <item name="btn_pan_shutter_pressed_holo" type="drawable">@drawable/btn_pan_shutter_pressed_holo_xlarge</item> - <item name="btn_pan_shutter_recording_holo" type="drawable">@drawable/btn_pan_shutter_recording_holo_xlarge</item> - <item name="btn_pan_shutter_recording_pressed_holo" type="drawable">@drawable/btn_pan_shutter_recording_pressed_holo_xlarge</item> - <item name="btn_retake_shutter_holo" type="drawable">@drawable/btn_retake_shutter_holo_xlarge</item> - <item name="btn_retake_shutter_pressed_holo" type="drawable">@drawable/btn_retake_shutter_pressed_holo_xlarge</item> - <item name="btn_video_shutter_holo" type="drawable">@drawable/btn_video_shutter_holo_xlarge</item> - <item name="btn_video_shutter_pressed_holo" type="drawable">@drawable/btn_video_shutter_pressed_holo_xlarge</item> <item name="btn_video_shutter_recording_holo" type="drawable">@drawable/btn_video_shutter_recording_holo_xlarge</item> <item name="btn_video_shutter_recording_pressed_holo" type="drawable">@drawable/btn_video_shutter_recording_pressed_holo_xlarge</item> - <item name="btn_wheel_close_settings" type="drawable">@drawable/btn_wheel_close_settings_xlarge</item> </resources> diff --git a/res/values-xlarge-port/drawable.xml b/res/values-xlarge-port/drawable.xml index e5f6c491..caacf472 100644 --- a/res/values-xlarge-port/drawable.xml +++ b/res/values-xlarge-port/drawable.xml @@ -17,17 +17,6 @@ the resources listed in this file wouldn't be reloaded when device orientation changes. --> <resources> - <item name="btn_camera_shutter_holo" type="drawable">@drawable/btn_camera_shutter_holo_xlarge</item> - <item name="btn_camera_shutter_pressed_holo" type="drawable">@drawable/btn_camera_shutter_pressed_holo_xlarge</item> - <item name="btn_pan_shutter_holo" type="drawable">@drawable/btn_pan_shutter_holo_xlarge</item> - <item name="btn_pan_shutter_pressed_holo" type="drawable">@drawable/btn_pan_shutter_pressed_holo_xlarge</item> - <item name="btn_pan_shutter_recording_holo" type="drawable">@drawable/btn_pan_shutter_recording_holo_xlarge</item> - <item name="btn_pan_shutter_recording_pressed_holo" type="drawable">@drawable/btn_pan_shutter_recording_pressed_holo_xlarge</item> - <item name="btn_retake_shutter_holo" type="drawable">@drawable/btn_retake_shutter_holo_xlarge</item> - <item name="btn_retake_shutter_pressed_holo" type="drawable">@drawable/btn_retake_shutter_pressed_holo_xlarge</item> - <item name="btn_video_shutter_holo" type="drawable">@drawable/btn_video_shutter_holo_xlarge</item> - <item name="btn_video_shutter_pressed_holo" type="drawable">@drawable/btn_video_shutter_pressed_holo_xlarge</item> <item name="btn_video_shutter_recording_holo" type="drawable">@drawable/btn_video_shutter_recording_holo_xlarge</item> <item name="btn_video_shutter_recording_pressed_holo" type="drawable">@drawable/btn_video_shutter_recording_pressed_holo_xlarge</item> - <item name="btn_wheel_close_settings" type="drawable">@drawable/btn_wheel_close_settings_xlarge</item> </resources> diff --git a/res/values-xlarge/drawable.xml b/res/values-xlarge/drawable.xml index 4cb80d99..48436c05 100644 --- a/res/values-xlarge/drawable.xml +++ b/res/values-xlarge/drawable.xml @@ -19,17 +19,6 @@ <item name="ic_flash_auto_holo_light" type="drawable">@drawable/ic_flash_auto_holo_light_xlarge</item> <item name="ic_flash_off_holo_light" type="drawable">@drawable/ic_flash_off_holo_light_xlarge</item> <item name="ic_flash_on_holo_light" type="drawable">@drawable/ic_flash_on_holo_light_xlarge</item> - <item name="ic_gallery" type="drawable">@drawable/ic_gallery_xlarge</item> - <item name="ic_indicators_cloudy" type="drawable">@drawable/ic_indicators_cloudy_xlarge</item> - <item name="ic_indicators_fluorescent" type="drawable">@drawable/ic_indicators_fluorescent_xlarge</item> - <item name="ic_indicators_incandescent" type="drawable">@drawable/ic_indicators_incandescent_xlarge</item> - <item name="ic_indicators_landscape_flash_auto" type="drawable">@drawable/ic_indicators_landscape_flash_auto_xlarge</item> - <item name="ic_indicators_landscape_flash_on" type="drawable">@drawable/ic_indicators_landscape_flash_on_xlarge</item> - <item name="ic_indicators_landscape" type="drawable">@drawable/ic_indicators_landscape_xlarge</item> - <item name="ic_indicators_macro" type="drawable">@drawable/ic_indicators_macro_xlarge</item> - <item name="ic_indicators_scn" type="drawable">@drawable/ic_indicators_scn_xlarge</item> - <item name="ic_indicators_sunlight" type="drawable">@drawable/ic_indicators_sunlight_xlarge</item> - <item name="ic_menu_overflow" type="drawable">@drawable/ic_menu_overflow_xlarge</item> <item name="ic_pan_border_fast" type="drawable">@drawable/ic_pan_border_fast_xlarge</item> <item name="ic_pan_left_indicator_fast" type="drawable">@drawable/ic_pan_left_indicator_fast_xlarge</item> <item name="ic_pan_left_indicator" type="drawable">@drawable/ic_pan_left_indicator_xlarge</item> @@ -38,25 +27,8 @@ <item name="ic_pan_right_indicator" type="drawable">@drawable/ic_pan_right_indicator_xlarge</item> <item name="ic_scn_holo_light" type="drawable">@drawable/ic_scn_holo_light_xlarge</item> <item name="ic_settings_holo_light" type="drawable">@drawable/ic_settings_holo_light_xlarge</item> - <item name="ic_shot_border" type="drawable">@drawable/ic_shot_border_xlarge</item> <item name="ic_snapshot_border" type="drawable">@drawable/ic_snapshot_border_xlarge</item> <item name="ic_switch_photo_facing_holo_light" type="drawable">@drawable/ic_switch_photo_facing_holo_light_xlarge</item> <item name="ic_switch_video_facing_holo_light" type="drawable">@drawable/ic_switch_video_facing_holo_light_xlarge</item> - <item name="ic_timelapse_10" type="drawable">@drawable/ic_timelapse_10_xlarge</item> - <item name="ic_timelapse_1_5" type="drawable">@drawable/ic_timelapse_1_5_xlarge</item> - <item name="ic_timelapse_1" type="drawable">@drawable/ic_timelapse_1_xlarge</item> - <item name="ic_timelapse_2_5" type="drawable">@drawable/ic_timelapse_2_5_xlarge</item> - <item name="ic_timelapse_2" type="drawable">@drawable/ic_timelapse_2_xlarge</item> - <item name="ic_timelapse_3" type="drawable">@drawable/ic_timelapse_3_xlarge</item> - <item name="ic_timelapse_5" type="drawable">@drawable/ic_timelapse_5_xlarge</item> <item name="ic_timelapse_none" type="drawable">@drawable/ic_timelapse_none_xlarge</item> - <item name="ic_white_balance_auto_holo_light" type="drawable">@drawable/ic_white_balance_auto_holo_light_xlarge</item> - <item name="ic_white_balance_cloudy_holo_light" type="drawable">@drawable/ic_white_balance_cloudy_holo_light_xlarge</item> - <item name="ic_white_balance_fluorescent_holo_light" type="drawable">@drawable/ic_white_balance_fluorescent_holo_light_xlarge</item> - <item name="ic_white_balance_incandescent_holo_light" type="drawable">@drawable/ic_white_balance_incandescent_holo_light_xlarge</item> - <item name="ic_white_balance_sunlight_holo_light" type="drawable">@drawable/ic_white_balance_sunlight_holo_light_xlarge</item> - <item name="ic_zoom_in_holo_dark" type="drawable">@drawable/ic_zoom_in_holo_dark_xlarge</item> - <item name="ic_zoom_in_holo_light" type="drawable">@drawable/ic_zoom_in_holo_light_xlarge</item> - <item name="ic_zoom_out_holo_dark" type="drawable">@drawable/ic_zoom_out_holo_dark_xlarge</item> - <item name="ic_zoom_out_holo_light" type="drawable">@drawable/ic_zoom_out_holo_light_xlarge</item> </resources> diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 6d090cb7..70279783 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1475,15 +1475,6 @@ public class PhotoModule } } - // onClick handler for R.id.btn_retake - @OnClickAttr - public void onReviewRetakeClicked(View v) { - if (mPaused) return; - - hidePostCaptureAlert(); - setupPreview(); - } - // onClick handler for R.id.btn_done @OnClickAttr public void onReviewDoneClicked(View v) { diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 57f7b16d..4ebeee90 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -147,7 +147,6 @@ public class VideoModule implements CameraModule, private Rotatable mReviewCancelButton; private Rotatable mReviewDoneButton; private RotateImageView mReviewPlayButton; - private View mReviewRetakeButton; private ShutterButton mShutterButton; private TextView mRecordingTimeView; private RotateLayout mBgLearningMessageRotater; @@ -658,12 +657,6 @@ public class VideoModule implements CameraModule, } @OnClickAttr - public void onReviewRetakeClicked(View v) { - deleteCurrentVideo(); - hideAlert(); - } - - @OnClickAttr public void onReviewPlayClicked(View v) { startPlayVideoActivity(); } diff --git a/src/com/android/camera/ui/FocusIndicatorRotateLayout.java b/src/com/android/camera/ui/FocusIndicatorRotateLayout.java deleted file mode 100644 index ff8932f2..00000000 --- a/src/com/android/camera/ui/FocusIndicatorRotateLayout.java +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright (C) 2010 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. - */ - -package com.android.camera.ui; - -import android.view.animation.Animation; -import android.view.animation.Transformation; -import android.content.Context; -import android.util.AttributeSet; - -import com.android.camera.R; - -// A view that indicates the focus area or the metering area. -public class FocusIndicatorRotateLayout extends RotateLayout implements FocusIndicator { - // Sometimes continuous autofucus starts and stops several times quickly. - // These states are used to make sure the animation is run for at least some - // time. - private int mState; - private ScaleAnimation mAnimation = new ScaleAnimation(); - private static final int STATE_IDLE = 0; - private static final int STATE_FOCUSING = 1; - private static final int STATE_FINISHING = 2; - - private Runnable mDisappear = new Disappear(); - private Animation.AnimationListener mEndAction = new EndAction(); - private static final int SCALING_UP_TIME = 1000; - private static final int SCALING_DOWN_TIME = 200; - private static final int DISAPPEAR_TIMEOUT = 200; - private static final float MAX_SCALE = 1.5f; - - public FocusIndicatorRotateLayout(Context context, AttributeSet attrs) { - super(context, attrs); - } - - @Override - public void showStart() { - if (mState == STATE_IDLE) { - startAnimation(R.drawable.ic_focus_focusing, SCALING_UP_TIME, - false, 1f, MAX_SCALE); - mState = STATE_FOCUSING; - } - } - - @Override - public void showSuccess(boolean timeout) { - if (mState == STATE_FOCUSING) { - startAnimation(R.drawable.ic_focus_focused, SCALING_DOWN_TIME, - timeout, 1f); - mState = STATE_FINISHING; - } - } - - @Override - public void showFail(boolean timeout) { - if (mState == STATE_FOCUSING) { - startAnimation(R.drawable.ic_focus_failed, SCALING_DOWN_TIME, - timeout, 1f); - mState = STATE_FINISHING; - } - } - - @Override - public void clear() { - mAnimation.cancel(); - removeCallbacks(mDisappear); - mDisappear.run(); - } - - private void startAnimation(int resid, long duration, boolean timeout, - float toScale) { - startAnimation(resid, duration, timeout, mAnimation.getCurrentScale(), - toScale); - } - - private void startAnimation(int resid, long duration, boolean timeout, - float fromScale, float toScale) { - mChild.setBackgroundDrawable(getResources().getDrawable(resid)); - mAnimation.cancel(); - mAnimation.reset(); - mAnimation.setDuration(duration); - mAnimation.setScale(fromScale, toScale); - mAnimation.setAnimationListener(timeout ? mEndAction : null); - startAnimation(mAnimation); - } - - private class EndAction implements Animation.AnimationListener { - @Override - public void onAnimationEnd(Animation animation) { - // Keep the focus indicator for some time. - postDelayed(mDisappear, DISAPPEAR_TIMEOUT); - } - - @Override - public void onAnimationRepeat(Animation animation) { - } - - @Override - public void onAnimationStart(Animation animation) { - } - } - - private class Disappear implements Runnable { - @Override - public void run() { - mChild.setBackgroundDrawable(null); - mState = STATE_IDLE; - } - } - - private class ScaleAnimation extends Animation { - private float mFrom = 1f; - private float mTo = 1f; - private float mCurrentScale = 1f; - - public ScaleAnimation() { - setFillAfter(true); - } - - public void setScale(float from, float to) { - mFrom = from; - mTo = to; - } - - public float getCurrentScale() { - return mCurrentScale; - } - - @Override - protected void applyTransformation(float interpolatedTime, Transformation t) { - mCurrentScale = mFrom + (mTo - mFrom) * interpolatedTime; - t.getMatrix().setScale(mCurrentScale, mCurrentScale, - getWidth() / 2f, getHeight() / 2f); - } - } -} |
