diff options
author | Chih-yu Huang <akahuang@google.com> | 2011-08-29 15:50:51 +0800 |
---|---|---|
committer | Chih-yu Huang <akahuang@google.com> | 2011-08-29 17:21:45 +0800 |
commit | 68798bfa946e812beb9190fa7c98a316392fbce6 (patch) | |
tree | 7e61c1a9a8e32598ea6d8097f0e19b77685c2523 | |
parent | 11bd0b3d63423c800050d4ff9b1f759ceb25f08c (diff) | |
download | LegacyCamera-68798bfa946e812beb9190fa7c98a316392fbce6.zip LegacyCamera-68798bfa946e812beb9190fa7c98a316392fbce6.tar.gz LegacyCamera-68798bfa946e812beb9190fa7c98a316392fbce6.tar.bz2 |
Change video recording shutter button and overflow assets
bug:5024054
Change-Id: Icd8c66bcf9be76df35852e6772ffd76f6f1013e8
19 files changed, 44 insertions, 2 deletions
diff --git a/res/drawable-hdpi/btn_video_shutter_pressed_holo.png b/res/drawable-hdpi/btn_video_shutter_pressed_holo.png Binary files differindex 9bdc2b1..8fbcd46 100644 --- a/res/drawable-hdpi/btn_video_shutter_pressed_holo.png +++ b/res/drawable-hdpi/btn_video_shutter_pressed_holo.png diff --git a/res/drawable-hdpi/btn_video_shutter_recording_holo.png b/res/drawable-hdpi/btn_video_shutter_recording_holo.png Binary files differnew file mode 100644 index 0000000..8310e89 --- /dev/null +++ b/res/drawable-hdpi/btn_video_shutter_recording_holo.png diff --git a/res/drawable-hdpi/btn_video_shutter_recording_pressed_holo.png b/res/drawable-hdpi/btn_video_shutter_recording_pressed_holo.png Binary files differnew file mode 100644 index 0000000..1fe2caf --- /dev/null +++ b/res/drawable-hdpi/btn_video_shutter_recording_pressed_holo.png diff --git a/res/drawable-hdpi/ic_menu_overflow.png b/res/drawable-hdpi/ic_menu_overflow.png Binary files differnew file mode 100644 index 0000000..2840af1 --- /dev/null +++ b/res/drawable-hdpi/ic_menu_overflow.png diff --git a/res/drawable-mdpi/btn_video_shutter_pressed_holo.png b/res/drawable-mdpi/btn_video_shutter_pressed_holo.png Binary files differindex 93610b3..cedfcea 100644 --- a/res/drawable-mdpi/btn_video_shutter_pressed_holo.png +++ b/res/drawable-mdpi/btn_video_shutter_pressed_holo.png diff --git a/res/drawable-mdpi/btn_video_shutter_recording_holo.png b/res/drawable-mdpi/btn_video_shutter_recording_holo.png Binary files differnew file mode 100644 index 0000000..10d0dc5 --- /dev/null +++ b/res/drawable-mdpi/btn_video_shutter_recording_holo.png diff --git a/res/drawable-mdpi/btn_video_shutter_recording_pressed_holo.png b/res/drawable-mdpi/btn_video_shutter_recording_pressed_holo.png Binary files differnew file mode 100644 index 0000000..2de272a --- /dev/null +++ b/res/drawable-mdpi/btn_video_shutter_recording_pressed_holo.png diff --git a/res/drawable-mdpi/ic_menu_overflow.png b/res/drawable-mdpi/ic_menu_overflow.png Binary files differnew file mode 100644 index 0000000..5fe0204 --- /dev/null +++ b/res/drawable-mdpi/ic_menu_overflow.png diff --git a/res/drawable-w1024dp-hdpi/ic_menu_overflow.png b/res/drawable-w1024dp-hdpi/ic_menu_overflow.png Binary files differnew file mode 100644 index 0000000..d5f2323 --- /dev/null +++ b/res/drawable-w1024dp-hdpi/ic_menu_overflow.png diff --git a/res/drawable-w1024dp-mdpi/btn_shutter_video_recording.xml b/res/drawable-w1024dp-mdpi/btn_shutter_video_recording.xml new file mode 100644 index 0000000..04dcec9 --- /dev/null +++ b/res/drawable-w1024dp-mdpi/btn_shutter_video_recording.xml @@ -0,0 +1,21 @@ +<?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-w1024dp-mdpi/ic_menu_overflow.png b/res/drawable-w1024dp-mdpi/ic_menu_overflow.png Binary files differnew file mode 100644 index 0000000..ac8c19f --- /dev/null +++ b/res/drawable-w1024dp-mdpi/ic_menu_overflow.png diff --git a/res/drawable-w1024dp-xhdpi/ic_menu_overflow.png b/res/drawable-w1024dp-xhdpi/ic_menu_overflow.png Binary files differnew file mode 100644 index 0000000..7024fb6 --- /dev/null +++ b/res/drawable-w1024dp-xhdpi/ic_menu_overflow.png diff --git a/res/drawable-xhdpi/btn_video_shutter_pressed_holo.png b/res/drawable-xhdpi/btn_video_shutter_pressed_holo.png Binary files differindex ab32f62..321271a 100644 --- a/res/drawable-xhdpi/btn_video_shutter_pressed_holo.png +++ b/res/drawable-xhdpi/btn_video_shutter_pressed_holo.png diff --git a/res/drawable-xhdpi/btn_video_shutter_recording_holo.png b/res/drawable-xhdpi/btn_video_shutter_recording_holo.png Binary files differnew file mode 100644 index 0000000..c4a42e0 --- /dev/null +++ b/res/drawable-xhdpi/btn_video_shutter_recording_holo.png diff --git a/res/drawable-xhdpi/btn_video_shutter_recording_pressed_holo.png b/res/drawable-xhdpi/btn_video_shutter_recording_pressed_holo.png Binary files differnew file mode 100644 index 0000000..694dcb9 --- /dev/null +++ b/res/drawable-xhdpi/btn_video_shutter_recording_pressed_holo.png diff --git a/res/drawable-xhdpi/ic_menu_overflow.png b/res/drawable-xhdpi/ic_menu_overflow.png Binary files differnew file mode 100644 index 0000000..9b99968 --- /dev/null +++ b/res/drawable-xhdpi/ic_menu_overflow.png diff --git a/res/drawable/btn_shutter_video_recording.xml b/res/drawable/btn_shutter_video_recording.xml new file mode 100644 index 0000000..55967a1 --- /dev/null +++ b/res/drawable/btn_shutter_video_recording.xml @@ -0,0 +1,21 @@ +<?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_recording_pressed_holo" /> + <item android:drawable="@drawable/btn_video_shutter_recording_holo" /> +</selector> + diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 744357a..74088d7 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -1369,7 +1369,7 @@ public class VideoCamera extends ActivityBase private void showRecordingUI(boolean recording) { if (recording) { - mShutterButton.setBackgroundResource(R.drawable.btn_shutter_video); + mShutterButton.setBackgroundResource(R.drawable.btn_shutter_video_recording); mRecordingTimeView.setText(""); mRecordingTimeView.setVisibility(View.VISIBLE); if (mReviewControl != null) mReviewControl.setVisibility(View.GONE); diff --git a/src/com/android/camera/ui/IndicatorControl.java b/src/com/android/camera/ui/IndicatorControl.java index d97646a..19ff516 100644 --- a/src/com/android/camera/ui/IndicatorControl.java +++ b/src/com/android/camera/ui/IndicatorControl.java @@ -102,7 +102,7 @@ public abstract class IndicatorControl extends RelativeLayout implements // Add other settings indicator. if (otherSettingKeys != null) { addOtherSettingIndicator(mContext, - R.drawable.ic_settings_holo_light, otherSettingKeys); + R.drawable.ic_menu_overflow, otherSettingKeys); } } |