diff options
| author | Camera Software Integration <camswint@localhost> | 2016-09-17 07:48:03 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-17 07:48:03 -0700 |
| commit | 31ead383ba139a4040bd6912e418abb514ff45f5 (patch) | |
| tree | b95d66b71de63bef7a8d0a8f4581be9e203e267c | |
| parent | aabeefd93fd214efe478350f77bcbfa339166ffd (diff) | |
| parent | dedc488e00d580dba1525517c08b3aa3604d2f8d (diff) | |
| download | android_packages_apps_Snap-31ead383ba139a4040bd6912e418abb514ff45f5.tar.gz android_packages_apps_Snap-31ead383ba139a4040bd6912e418abb514ff45f5.tar.bz2 android_packages_apps_Snap-31ead383ba139a4040bd6912e418abb514ff45f5.zip | |
Merge "SnapdragonCamera: Fix Camera launch latency" into camera.lnx.1.0.c7-dev
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/CameraActivity.java | 6 | ||||
| -rw-r--r-- | src/com/android/camera/CaptureUI.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 01733d181..707c457c4 100644..100755 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1414,8 +1414,6 @@ public class CameraActivity extends Activity mSecureCamera = intent.getBooleanExtra(SECURE_CAMERA_EXTRA, false); } - mCursor = getContentResolver().query(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, null, null, null, null); - if (mSecureCamera) { // Change the window flags so that secure camera can show when locked Window win = getWindow(); @@ -1478,9 +1476,9 @@ public class CameraActivity extends Activity moduleIndex = ModuleSwitcher.CAPTURE_MODULE_INDEX; mOrientationListener = new MyOrientationEventListener(this); + setModuleFromIndex(moduleIndex); setContentView(R.layout.camera_filmstrip); mFilmStripView = (FilmStripView) findViewById(R.id.filmstrip_view); - setModuleFromIndex(moduleIndex); mActionBar = getActionBar(); mActionBar.addOnMenuVisibilityListener(this); @@ -1561,6 +1559,8 @@ public class CameraActivity extends Activity mLocalImagesObserver = new LocalMediaObserver(); mLocalVideosObserver = new LocalMediaObserver(); + mCursor = getContentResolver().query( + MediaStore.Images.Media.EXTERNAL_CONTENT_URI, null, null, null, null); getContentResolver().registerContentObserver( MediaStore.Images.Media.EXTERNAL_CONTENT_URI, true, mLocalImagesObserver); diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index 522d5d26e..957c5891d 100644 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -384,7 +384,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mGestures.setRenderOverlay(mRenderOverlay); mRenderOverlay.requestLayout(); - mActivity.setPreviewGestures(mGestures); ((ViewGroup)mRootView).removeView(mRecordingTimeRect); mCameraControls.setPreviewRatio(0, true); } @@ -393,6 +392,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mGestures.setCaptureUI(this); mGestures.setZoomEnabled(mSettingsManager.isZoomSupported(cameraIds)); initializeZoom(cameraIds); + mActivity.setPreviewGestures(mGestures); } public ViewGroup getSceneAndFilterLayout() { |