diff options
25 files changed, 33 insertions, 4 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 9d2c7ebf4..56ed37dc1 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -610,6 +610,16 @@ <item>""</item> </string-array> + <array name="camera_mode_cover_icon"> + <item>@drawable/ic_camera_blanket</item> + <item>@drawable/ic_video_blanket</item> + <item>@drawable/ic_refocus_blanket</item> + <item>@drawable/ic_photo_sphere_blanket</item> + <item>@drawable/ic_pano_blanket</item> + <item>@drawable/ic_camera_blanket</item> + <item>@drawable/ic_camera_blanket</item> + </array> + <array name="camera_mode_icon"> <item>@drawable/ic_camera_normal</item> <item>@drawable/ic_video_normal</item> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 4a46cb6b8..224629518 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -174,7 +174,7 @@ <dimen name="camera_controls_padding_start">36dp</dimen> <dimen name="camera_controls_padding_end">36dp</dimen> - <dimen name="mode_transition_view_icon_size">48dp</dimen> + <dimen name="mode_transition_view_icon_size">144dp</dimen> <dimen name="flash_circle_size_after_shrink">36dp</dimen> <dimen name="mode_options_height">72dp</dimen> diff --git a/res_p/drawable-hdpi/ic_camera_blanket.png b/res_p/drawable-hdpi/ic_camera_blanket.png Binary files differnew file mode 100644 index 000000000..29d955678 --- /dev/null +++ b/res_p/drawable-hdpi/ic_camera_blanket.png diff --git a/res_p/drawable-hdpi/ic_pano_blanket.png b/res_p/drawable-hdpi/ic_pano_blanket.png Binary files differnew file mode 100644 index 000000000..eecd5cbc8 --- /dev/null +++ b/res_p/drawable-hdpi/ic_pano_blanket.png diff --git a/res_p/drawable-hdpi/ic_photo_sphere_blanket.png b/res_p/drawable-hdpi/ic_photo_sphere_blanket.png Binary files differnew file mode 100644 index 000000000..c667cc654 --- /dev/null +++ b/res_p/drawable-hdpi/ic_photo_sphere_blanket.png diff --git a/res_p/drawable-hdpi/ic_refocus_blanket.png b/res_p/drawable-hdpi/ic_refocus_blanket.png Binary files differnew file mode 100644 index 000000000..b260afef6 --- /dev/null +++ b/res_p/drawable-hdpi/ic_refocus_blanket.png diff --git a/res_p/drawable-hdpi/ic_video_blanket.png b/res_p/drawable-hdpi/ic_video_blanket.png Binary files differnew file mode 100644 index 000000000..7c6ad3e3d --- /dev/null +++ b/res_p/drawable-hdpi/ic_video_blanket.png diff --git a/res_p/drawable-mdpi/ic_camera_blanket.png b/res_p/drawable-mdpi/ic_camera_blanket.png Binary files differnew file mode 100644 index 000000000..bcf041faf --- /dev/null +++ b/res_p/drawable-mdpi/ic_camera_blanket.png diff --git a/res_p/drawable-mdpi/ic_pano_blanket.png b/res_p/drawable-mdpi/ic_pano_blanket.png Binary files differnew file mode 100644 index 000000000..42c0c37a4 --- /dev/null +++ b/res_p/drawable-mdpi/ic_pano_blanket.png diff --git a/res_p/drawable-mdpi/ic_photo_sphere_blanket.png b/res_p/drawable-mdpi/ic_photo_sphere_blanket.png Binary files differnew file mode 100644 index 000000000..1db0e499e --- /dev/null +++ b/res_p/drawable-mdpi/ic_photo_sphere_blanket.png diff --git a/res_p/drawable-mdpi/ic_refocus_blanket.png b/res_p/drawable-mdpi/ic_refocus_blanket.png Binary files differnew file mode 100644 index 000000000..8cfaa2c77 --- /dev/null +++ b/res_p/drawable-mdpi/ic_refocus_blanket.png diff --git a/res_p/drawable-mdpi/ic_video_blanket.png b/res_p/drawable-mdpi/ic_video_blanket.png Binary files differnew file mode 100644 index 000000000..0b331b718 --- /dev/null +++ b/res_p/drawable-mdpi/ic_video_blanket.png diff --git a/res_p/drawable-xhdpi/ic_camera_blanket.png b/res_p/drawable-xhdpi/ic_camera_blanket.png Binary files differnew file mode 100644 index 000000000..043d9d081 --- /dev/null +++ b/res_p/drawable-xhdpi/ic_camera_blanket.png diff --git a/res_p/drawable-xhdpi/ic_pano_blanket.png b/res_p/drawable-xhdpi/ic_pano_blanket.png Binary files differnew file mode 100644 index 000000000..9f313e268 --- /dev/null +++ b/res_p/drawable-xhdpi/ic_pano_blanket.png diff --git a/res_p/drawable-xhdpi/ic_photo_sphere_blanket.png b/res_p/drawable-xhdpi/ic_photo_sphere_blanket.png Binary files differnew file mode 100644 index 000000000..e7306d3c5 --- /dev/null +++ b/res_p/drawable-xhdpi/ic_photo_sphere_blanket.png diff --git a/res_p/drawable-xhdpi/ic_refocus_blanket.png b/res_p/drawable-xhdpi/ic_refocus_blanket.png Binary files differnew file mode 100644 index 000000000..156c8f4e7 --- /dev/null +++ b/res_p/drawable-xhdpi/ic_refocus_blanket.png diff --git a/res_p/drawable-xhdpi/ic_video_blanket.png b/res_p/drawable-xhdpi/ic_video_blanket.png Binary files differnew file mode 100644 index 000000000..28c313c4c --- /dev/null +++ b/res_p/drawable-xhdpi/ic_video_blanket.png diff --git a/res_p/drawable-xxhdpi/ic_camera_blanket.png b/res_p/drawable-xxhdpi/ic_camera_blanket.png Binary files differnew file mode 100644 index 000000000..4b6d857ee --- /dev/null +++ b/res_p/drawable-xxhdpi/ic_camera_blanket.png diff --git a/res_p/drawable-xxhdpi/ic_pano_blanket.png b/res_p/drawable-xxhdpi/ic_pano_blanket.png Binary files differnew file mode 100644 index 000000000..ff33adcd2 --- /dev/null +++ b/res_p/drawable-xxhdpi/ic_pano_blanket.png diff --git a/res_p/drawable-xxhdpi/ic_photo_sphere_blanket.png b/res_p/drawable-xxhdpi/ic_photo_sphere_blanket.png Binary files differnew file mode 100644 index 000000000..54d0360a3 --- /dev/null +++ b/res_p/drawable-xxhdpi/ic_photo_sphere_blanket.png diff --git a/res_p/drawable-xxhdpi/ic_refocus_blanket.png b/res_p/drawable-xxhdpi/ic_refocus_blanket.png Binary files differnew file mode 100644 index 000000000..b4c4239cb --- /dev/null +++ b/res_p/drawable-xxhdpi/ic_refocus_blanket.png diff --git a/res_p/drawable-xxhdpi/ic_video_blanket.png b/res_p/drawable-xxhdpi/ic_video_blanket.png Binary files differnew file mode 100644 index 000000000..ce2badd72 --- /dev/null +++ b/res_p/drawable-xxhdpi/ic_video_blanket.png 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); + } } |
