summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/app/CameraAppUI.java4
-rw-r--r--src/com/android/camera/ui/ModeTransitionView.java2
-rw-r--r--src/com/android/camera/util/CameraUtil.java19
3 files changed, 22 insertions, 3 deletions
diff --git a/src/com/android/camera/app/CameraAppUI.java b/src/com/android/camera/app/CameraAppUI.java
index 4827763e6..064f6ebd8 100644
--- a/src/com/android/camera/app/CameraAppUI.java
+++ b/src/com/android/camera/app/CameraAppUI.java
@@ -730,7 +730,7 @@ public class CameraAppUI implements ModeListView.ModeSwitchListener,
mAppRootView.redirectTouchEventsTo(mModeTransitionView);
int shadeColorId = R.color.mode_cover_default_color;
- int iconRes = CameraUtil.getCameraModeIconResId(moduleToTransitionTo,
+ int iconRes = CameraUtil.getCameraModeCoverIconResId(moduleToTransitionTo,
mController.getAndroidContext());
AnimationFinishedListener listener = new AnimationFinishedListener() {
@@ -791,7 +791,7 @@ public class CameraAppUI implements ModeListView.ModeSwitchListener,
private void showModeCoverUntilPreviewReady() {
int modeId = mController.getCurrentModuleIndex();
int colorId = R.color.mode_cover_default_color;;
- int iconId = CameraUtil.getCameraModeIconResId(modeId, mController.getAndroidContext());
+ int iconId = CameraUtil.getCameraModeCoverIconResId(modeId, mController.getAndroidContext());
mModeTransitionView.setupModeCover(colorId, iconId);
mHideCoverRunnable = new Runnable() {
@Override
diff --git a/src/com/android/camera/ui/ModeTransitionView.java b/src/com/android/camera/ui/ModeTransitionView.java
index 0d0f46520..14b46ff04 100644
--- a/src/com/android/camera/ui/ModeTransitionView.java
+++ b/src/com/android/camera/ui/ModeTransitionView.java
@@ -48,7 +48,7 @@ public class ModeTransitionView extends View {
private static final int PEEP_HOLE_ANIMATION_DURATION_MS = 300;
private static final int ICON_FADE_OUT_DURATION_MS = 850;
- private static final int FADE_OUT_DURATION_MS = 100;
+ private static final int FADE_OUT_DURATION_MS = 250;
private static final int IDLE = 0;
private static final int PULL_UP_SHADE = 1;
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index 707a3e268..416f828a6 100644
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -1211,4 +1211,23 @@ public class CameraUtil {
}
return cameraModeParent[modeIndex];
}
+
+ /**
+ * Gets the mode cover icon resource id of a specific mode.
+ *
+ * @param modeIndex index of the mode
+ * @param context current context
+ * @return icon resource id if the index is valid, otherwise 0
+ */
+ public static int getCameraModeCoverIconResId(int modeIndex, Context context) {
+ // Find the camera mode icon using id
+ TypedArray cameraModesIcons = context.getResources()
+ .obtainTypedArray(R.array.camera_mode_cover_icon);
+ if (modeIndex >= cameraModesIcons.length() || modeIndex < 0) {
+ // Mode index not found
+ Log.e(TAG, "Invalid mode index: " + modeIndex);
+ return 0;
+ }
+ return cameraModesIcons.getResourceId(modeIndex, 0);
+ }
}