diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-10-13 16:07:48 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-13 16:07:48 -0700 |
commit | 23a2aa993c7997913f32cd5eb69e12d4f6e0e354 (patch) | |
tree | 0fbe08062089c3c305d4f1f8710e2e43ab791c33 /res | |
parent | 331201407e613e5a243b8cf6e8f3d5bdb647e6c5 (diff) | |
parent | 704530edd94ba9b5990a247d4156ec18bf6ea0eb (diff) | |
download | android_packages_apps_Snap-23a2aa993c7997913f32cd5eb69e12d4f6e0e354.tar.gz android_packages_apps_Snap-23a2aa993c7997913f32cd5eb69e12d4f6e0e354.tar.bz2 android_packages_apps_Snap-23a2aa993c7997913f32cd5eb69e12d4f6e0e354.zip |
am 704530ed: Merge "Add \'disabled\' state for when Gcam is unable to take another shot." into gb-ub-photos-carlsbad
* commit '704530edd94ba9b5990a247d4156ec18bf6ea0eb':
Add 'disabled' state for when Gcam is unable to take another shot.
Diffstat (limited to 'res')
25 files changed, 21 insertions, 0 deletions
diff --git a/res/drawable-hdpi/btn_shutter_default_disabled.png b/res/drawable-hdpi/btn_shutter_default_disabled.png Binary files differnew file mode 100644 index 000000000..a50a4ad00 --- /dev/null +++ b/res/drawable-hdpi/btn_shutter_default_disabled.png diff --git a/res/drawable-hdpi/btn_shutter_pressed_disabled.png b/res/drawable-hdpi/btn_shutter_pressed_disabled.png Binary files differnew file mode 100644 index 000000000..5dc7d9de8 --- /dev/null +++ b/res/drawable-hdpi/btn_shutter_pressed_disabled.png diff --git a/res/drawable-mdpi/btn_shutter_default_disabled.png b/res/drawable-mdpi/btn_shutter_default_disabled.png Binary files differnew file mode 100644 index 000000000..8285d095e --- /dev/null +++ b/res/drawable-mdpi/btn_shutter_default_disabled.png diff --git a/res/drawable-mdpi/btn_shutter_pressed_disabled.png b/res/drawable-mdpi/btn_shutter_pressed_disabled.png Binary files differnew file mode 100644 index 000000000..13cf5dadb --- /dev/null +++ b/res/drawable-mdpi/btn_shutter_pressed_disabled.png diff --git a/res/drawable-sw600dp-hdpi-v19/btn_shutter_default_disabled.png b/res/drawable-sw600dp-hdpi-v19/btn_shutter_default_disabled.png Binary files differnew file mode 100644 index 000000000..18071c715 --- /dev/null +++ b/res/drawable-sw600dp-hdpi-v19/btn_shutter_default_disabled.png diff --git a/res/drawable-sw600dp-hdpi-v19/btn_shutter_pressed_disabled.png b/res/drawable-sw600dp-hdpi-v19/btn_shutter_pressed_disabled.png Binary files differnew file mode 100644 index 000000000..f481f72de --- /dev/null +++ b/res/drawable-sw600dp-hdpi-v19/btn_shutter_pressed_disabled.png diff --git a/res/drawable-sw600dp-hdpi/btn_shutter_default_disabled.png b/res/drawable-sw600dp-hdpi/btn_shutter_default_disabled.png Binary files differnew file mode 100644 index 000000000..921ed5d60 --- /dev/null +++ b/res/drawable-sw600dp-hdpi/btn_shutter_default_disabled.png diff --git a/res/drawable-sw600dp-hdpi/btn_shutter_pressed_disabled.png b/res/drawable-sw600dp-hdpi/btn_shutter_pressed_disabled.png Binary files differnew file mode 100644 index 000000000..ab900c8de --- /dev/null +++ b/res/drawable-sw600dp-hdpi/btn_shutter_pressed_disabled.png diff --git a/res/drawable-sw600dp-mdpi-v19/btn_shutter_default_disabled.png b/res/drawable-sw600dp-mdpi-v19/btn_shutter_default_disabled.png Binary files differnew file mode 100644 index 000000000..a9710b651 --- /dev/null +++ b/res/drawable-sw600dp-mdpi-v19/btn_shutter_default_disabled.png diff --git a/res/drawable-sw600dp-mdpi-v19/btn_shutter_pressed_disabled.png b/res/drawable-sw600dp-mdpi-v19/btn_shutter_pressed_disabled.png Binary files differnew file mode 100644 index 000000000..cd9b7352c --- /dev/null +++ b/res/drawable-sw600dp-mdpi-v19/btn_shutter_pressed_disabled.png diff --git a/res/drawable-sw600dp-mdpi/btn_shutter_default_disabled.png b/res/drawable-sw600dp-mdpi/btn_shutter_default_disabled.png Binary files differnew file mode 100644 index 000000000..18d79558d --- /dev/null +++ b/res/drawable-sw600dp-mdpi/btn_shutter_default_disabled.png diff --git a/res/drawable-sw600dp-mdpi/btn_shutter_pressed_disabled.png b/res/drawable-sw600dp-mdpi/btn_shutter_pressed_disabled.png Binary files differnew file mode 100644 index 000000000..2b442840c --- /dev/null +++ b/res/drawable-sw600dp-mdpi/btn_shutter_pressed_disabled.png diff --git a/res/drawable-sw600dp-xhdpi-v19/btn_shutter_default_disabled.png b/res/drawable-sw600dp-xhdpi-v19/btn_shutter_default_disabled.png Binary files differnew file mode 100644 index 000000000..2aa419cce --- /dev/null +++ b/res/drawable-sw600dp-xhdpi-v19/btn_shutter_default_disabled.png diff --git a/res/drawable-sw600dp-xhdpi-v19/btn_shutter_pressed_disabled.png b/res/drawable-sw600dp-xhdpi-v19/btn_shutter_pressed_disabled.png Binary files differnew file mode 100644 index 000000000..93b73ff8b --- /dev/null +++ b/res/drawable-sw600dp-xhdpi-v19/btn_shutter_pressed_disabled.png diff --git a/res/drawable-sw600dp-xhdpi/btn_shutter_default_disabled.png b/res/drawable-sw600dp-xhdpi/btn_shutter_default_disabled.png Binary files differnew file mode 100644 index 000000000..c31ec8a07 --- /dev/null +++ b/res/drawable-sw600dp-xhdpi/btn_shutter_default_disabled.png diff --git a/res/drawable-sw600dp-xhdpi/btn_shutter_pressed_disabled.png b/res/drawable-sw600dp-xhdpi/btn_shutter_pressed_disabled.png Binary files differnew file mode 100644 index 000000000..70974eb55 --- /dev/null +++ b/res/drawable-sw600dp-xhdpi/btn_shutter_pressed_disabled.png diff --git a/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_default_disabled.png b/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_default_disabled.png Binary files differnew file mode 100644 index 000000000..93043bee4 --- /dev/null +++ b/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_default_disabled.png diff --git a/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_pressed_disabled.png b/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_pressed_disabled.png Binary files differnew file mode 100644 index 000000000..31a9788b6 --- /dev/null +++ b/res/drawable-sw600dp-xxhdpi-v19/btn_shutter_pressed_disabled.png diff --git a/res/drawable-sw600dp-xxhdpi/btn_shutter_default_disabled.png b/res/drawable-sw600dp-xxhdpi/btn_shutter_default_disabled.png Binary files differnew file mode 100644 index 000000000..93043bee4 --- /dev/null +++ b/res/drawable-sw600dp-xxhdpi/btn_shutter_default_disabled.png diff --git a/res/drawable-sw600dp-xxhdpi/btn_shutter_pressed_disabled.png b/res/drawable-sw600dp-xxhdpi/btn_shutter_pressed_disabled.png Binary files differnew file mode 100644 index 000000000..4ebc18f7c --- /dev/null +++ b/res/drawable-sw600dp-xxhdpi/btn_shutter_pressed_disabled.png diff --git a/res/drawable-xhdpi/btn_shutter_default_disabled.png b/res/drawable-xhdpi/btn_shutter_default_disabled.png Binary files differnew file mode 100644 index 000000000..1151b4b5c --- /dev/null +++ b/res/drawable-xhdpi/btn_shutter_default_disabled.png diff --git a/res/drawable-xhdpi/btn_shutter_pressed_disabled.png b/res/drawable-xhdpi/btn_shutter_pressed_disabled.png Binary files differnew file mode 100644 index 000000000..e983954f9 --- /dev/null +++ b/res/drawable-xhdpi/btn_shutter_pressed_disabled.png diff --git a/res/drawable-xxhdpi/btn_shutter_default_disabled.png b/res/drawable-xxhdpi/btn_shutter_default_disabled.png Binary files differnew file mode 100644 index 000000000..f515abf20 --- /dev/null +++ b/res/drawable-xxhdpi/btn_shutter_default_disabled.png diff --git a/res/drawable-xxhdpi/btn_shutter_pressed_disabled.png b/res/drawable-xxhdpi/btn_shutter_pressed_disabled.png Binary files differnew file mode 100644 index 000000000..e19718bea --- /dev/null +++ b/res/drawable-xxhdpi/btn_shutter_pressed_disabled.png diff --git a/res/drawable/btn_shutter_disabled.xml b/res/drawable/btn_shutter_disabled.xml new file mode 100644 index 000000000..865d83c38 --- /dev/null +++ b/res/drawable/btn_shutter_disabled.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" android:drawable="@drawable/btn_shutter_pressed_disabled" /> + <item android:drawable="@drawable/btn_shutter_default_disabled" /> +</selector> + |