diff options
author | Spike Sprague <spikuru@google.com> | 2014-03-27 15:41:28 -0700 |
---|---|---|
committer | Doris Liu <tianliu@google.com> | 2014-04-04 22:23:21 -0700 |
commit | abf54e2994961395a0feb0b08353e62718443f23 (patch) | |
tree | c7590bc6a9fc74988f74b03be440a74a55690908 /res/drawable | |
parent | 3cd228a2cce5ec89ddedd52d88fa5488e0e47bd9 (diff) | |
download | android_packages_apps_Camera2-abf54e2994961395a0feb0b08353e62718443f23.tar.gz android_packages_apps_Camera2-abf54e2994961395a0feb0b08353e62718443f23.tar.bz2 android_packages_apps_Camera2-abf54e2994961395a0feb0b08353e62718443f23.zip |
exposure compensation control is back
bug: 13607051
Change-Id: Ib4920ba3f8f3a548651a2d07613ccfdc28ca1d6e
Diffstat (limited to 'res/drawable')
-rw-r--r-- | res/drawable/button_background_selected_photo.xml | 24 | ||||
-rw-r--r-- | res/drawable/ic_exposure.xml | 39 |
2 files changed, 63 insertions, 0 deletions
diff --git a/res/drawable/button_background_selected_photo.xml b/res/drawable/button_background_selected_photo.xml new file mode 100644 index 000000000..bab8bde8d --- /dev/null +++ b/res/drawable/button_background_selected_photo.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval"> + <size + android:width="@dimen/option_button_circle_size" + android:height="@dimen/option_button_circle_size" /> + <solid + android:color="@color/camera_mode_color" /> +</shape> diff --git a/res/drawable/ic_exposure.xml b/res/drawable/ic_exposure.xml new file mode 100644 index 000000000..14f840053 --- /dev/null +++ b/res/drawable/ic_exposure.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android" + android:constantSize="true"> + <item android:state_enabled="false"> + <bitmap + android:gravity="center" + android:src="@drawable/ic_exposure_disabled" /> + </item> + <item android:state_pressed="true"> + <layer-list> + <item android:drawable="@drawable/button_background_pressed_dark" /> + <item> + <bitmap + android:gravity="center" + android:src="@drawable/ic_exposure_normal" /> + </item> + </layer-list> + </item> + <item> + <bitmap + android:gravity="center" + android:src="@drawable/ic_exposure_normal" /> + </item> +</selector> |