Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 554e6be1 authored by Sascha Haeberling's avatar Sascha Haeberling Committed by Android (Google) Code Review
Browse files

Merge "Refocus integration phase 1." into gb-ub-photos-carlsbad

parents b9b95fb7 c46978c4

res/drawable-xhdpi/ic_switch_refocus.png

0 → 100644
+833 B
Loading image diff...

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -942,6 +942,8 @@ 
    <string name="accessibility_switch_to_panorama">Switch to panorama</string>

    <!-- The button to switch to new Panorama mode. [CHAR LIMIT = NONE] -->

    <string name="accessibility_switch_to_new_panorama">Switch to new panorama</string>

    <!-- The button to switch to the Re-Focus mode. [CHAR LIMIT = NONE] -->

    <string name="accessibility_switch_to_refocus">Switch to Refocus</string>

    <!-- The button in review mode indicating that the photo taking, video recording, and panorama saving session should be canceled [CHAR LIMIT = NONE] -->

    <string name="accessibility_review_cancel">Review cancel</string>

    <!-- The button in review mode indicating that the taken photo/video is OK to be attached/uploaded [CHAR LIMIT = NONE] -->

src/com/android/camera/CameraActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.camera.ui.FilmStripView; 
import com.android.gallery3d.R;

import com.android.gallery3d.common.ApiHelper;

import com.android.gallery3d.util.LightCycleHelper;

import com.android.gallery3d.util.RefocusHelper;



public class CameraActivity extends Activity

    implements CameraSwitchListener {
@@ -477,6 +478,9 @@ public class CameraActivity extends Activity 
            case CameraSwitcher.LIGHTCYCLE_MODULE_INDEX:

                mCurrentModule = LightCycleHelper.createPanoramaModule();

                break;

            case CameraSwitcher.REFOCUS_MODULE_INDEX:

                mCurrentModule = RefocusHelper.createRefocusModule();

                break;

           default:

               break;

        }

src/com/android/camera/ui/CameraSwitcher.java

+7 −1
Original line number Diff line number Diff line
@@ -49,10 +49,12 @@ public class CameraSwitcher extends RotateImageView 
    public static final int PHOTO_MODULE_INDEX = 0;

    public static final int VIDEO_MODULE_INDEX = 1;

    public static final int LIGHTCYCLE_MODULE_INDEX = 2;

    public static final int REFOCUS_MODULE_INDEX = 3;

    private static final int[] DRAW_IDS = {

            R.drawable.ic_switch_camera,

            R.drawable.ic_switch_video,

            R.drawable.ic_switch_photosphere

            R.drawable.ic_switch_photosphere,

            R.drawable.ic_switch_refocus

    };

    public interface CameraSwitchListener {

        public void onCameraSelected(int i);
@@ -186,6 +188,10 @@ public class CameraSwitcher extends RotateImageView 
                    item.setContentDescription(getContext().getResources().getString(

                            R.string.accessibility_switch_to_new_panorama));

                    break;

                case R.drawable.ic_switch_refocus:

                    item.setContentDescription(getContext().getResources().getString(

                            R.string.accessibility_switch_to_refocus));

                    break;

                default:

                    break;

            }

src_pd/com/android/gallery3d/util/RefocusHelper.java

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * 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.

 */



package com.android.gallery3d.util;



import com.android.camera.CameraModule;



public class RefocusHelper {

    public static CameraModule createRefocusModule() {

        return null;

    }

}