diff options
author | Angus Kong <shkong@google.com> | 2013-08-19 15:06:12 -0700 |
---|---|---|
committer | Angus Kong <shkong@google.com> | 2013-09-04 13:10:29 -0700 |
commit | ed15d1a140986473bbe7fffd72ec9618c41c5979 (patch) | |
tree | ad5a3fdff05b54fef1ec076d5fa4c80e1a419888 /src/com/android/camera/app | |
parent | 269c824d720b2e902c4ad6c3bb23422644da1f41 (diff) | |
download | android_packages_apps_Snap-ed15d1a140986473bbe7fffd72ec9618c41c5979.tar.gz android_packages_apps_Snap-ed15d1a140986473bbe7fffd72ec9618c41c5979.tar.bz2 android_packages_apps_Snap-ed15d1a140986473bbe7fffd72ec9618c41c5979.zip |
Bring back wide angle panorama.
bug:10293937
Change-Id: I23a977e87b7416f07ecac20025b6c142ae61be05
Diffstat (limited to 'src/com/android/camera/app')
-rw-r--r-- | src/com/android/camera/app/AppManagerFactory.java | 47 | ||||
-rw-r--r-- | src/com/android/camera/app/CameraApp.java | 1 | ||||
-rw-r--r-- | src/com/android/camera/app/OrientationManager.java | 25 | ||||
-rw-r--r-- | src/com/android/camera/app/OrientationSource.java | 6 |
4 files changed, 67 insertions, 12 deletions
diff --git a/src/com/android/camera/app/AppManagerFactory.java b/src/com/android/camera/app/AppManagerFactory.java new file mode 100644 index 000000000..9c047aa55 --- /dev/null +++ b/src/com/android/camera/app/AppManagerFactory.java @@ -0,0 +1,47 @@ +/* + * 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.camera.app; + +import android.app.Application; +import android.content.Context; + +/** + * A singleton class which provides application level utility + * classes. + */ +public class AppManagerFactory { + + private static AppManagerFactory sFactory; + + public static synchronized AppManagerFactory getInstance(Context ctx) { + if (sFactory == null) { + sFactory = new AppManagerFactory(ctx); + } + return sFactory; + } + + private PanoramaStitchingManager mPanoramaStitchingManager; + + /** No public constructor. */ + private AppManagerFactory(Context ctx) { + mPanoramaStitchingManager = new PanoramaStitchingManager(ctx); + } + + public PanoramaStitchingManager getPanoramaStitchingManager() { + return mPanoramaStitchingManager; + } +} diff --git a/src/com/android/camera/app/CameraApp.java b/src/com/android/camera/app/CameraApp.java index e4da41461..2e61fa99a 100644 --- a/src/com/android/camera/app/CameraApp.java +++ b/src/com/android/camera/app/CameraApp.java @@ -28,3 +28,4 @@ public class CameraApp extends Application { CameraUtil.initialize(this); } } + diff --git a/src/com/android/camera/app/OrientationManager.java b/src/com/android/camera/app/OrientationManager.java index 412be3024..7bf924218 100644 --- a/src/com/android/camera/app/OrientationManager.java +++ b/src/com/android/camera/app/OrientationManager.java @@ -1,5 +1,20 @@ -package com.android.camera.app; +/* + * 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.camera.app; import android.app.Activity; import android.content.ContentResolver; @@ -13,8 +28,8 @@ import android.view.Surface; import com.android.camera.util.ApiHelper; -public class OrientationManager implements OrientationSource { - private static final String TAG = "OrientationManager"; +public class OrientationManager { + private static final String TAG = "CAM_OrientationManager"; // Orientation hysteresis amount used in rounding, in degrees private static final int ORIENTATION_HYSTERESIS = 5; @@ -112,12 +127,10 @@ public class OrientationManager implements OrientationSource { } } - @Override public int getDisplayRotation() { return getDisplayRotation(mActivity); } - @Override public int getCompensation() { return 0; } @@ -148,4 +161,4 @@ public class OrientationManager implements OrientationSource { } return 0; } -}
\ No newline at end of file +} diff --git a/src/com/android/camera/app/OrientationSource.java b/src/com/android/camera/app/OrientationSource.java deleted file mode 100644 index 57dcfeb40..000000000 --- a/src/com/android/camera/app/OrientationSource.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.android.camera.app; - -public interface OrientationSource { - public int getDisplayRotation(); - public int getCompensation(); -} |