diff options
| -rw-r--r-- | res/values/styles.xml | 4 | ||||
| -rw-r--r-- | src/com/android/camera/app/CameraApp.java | 42 |
2 files changed, 39 insertions, 7 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 655c65932..8af034474 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -42,8 +42,6 @@ </style> <style name="DialogPickerTheme" parent="Theme.Gallery"> </style> - <style name="Theme.ProxyLauncher" parent="@android:Theme.Translucent.NoTitleBar"> - </style> <bool name="picker_is_dialog">false</bool> <color name="darker_transparent">#C1000000</color> <style name="ActionBarTwoLinePrimary" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title"></style> @@ -53,6 +51,8 @@ </style> --> <!-- Camera resources below --> + <style name="Theme.ProxyLauncher" parent="@android:Theme.Translucent.NoTitleBar"> + </style> <style name="Theme.Camera" parent="Theme.CameraBase"> <item name="android:windowBackground">@android:color/black</item> diff --git a/src/com/android/camera/app/CameraApp.java b/src/com/android/camera/app/CameraApp.java index f020a8441..a72581531 100644 --- a/src/com/android/camera/app/CameraApp.java +++ b/src/com/android/camera/app/CameraApp.java @@ -1,11 +1,43 @@ +/* + * 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 com.android.camera.Util; +import com.android.camera.util.PhotoSphereHelper; + import android.app.Application; +import android.content.Context; public class CameraApp extends Application { - @Override - public void onCreate() { - super.onCreate(); - com.android.camera.Util.initialize(this); - } + + private StitchingProgressManager mStitchingProgressManager; + + @Override + public void onCreate() { + super.onCreate(); + Util.initialize(this); + mStitchingProgressManager = PhotoSphereHelper.createStitchingManagerInstance(this); + } + + public Context getAndroidContext() { + return this; + } + + public StitchingProgressManager getStitchingProgressManager() { + return mStitchingProgressManager; + } } |