diff options
author | Jay Wang <jaywang@codeaurora.org> | 2016-07-19 18:11:05 -0700 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-08-18 15:07:20 -0700 |
commit | 7d7a688e13c9ae8e958387ba0207c7a4af0e4df0 (patch) | |
tree | 666b825fc98eb5dbcb7f71bd9cd83448b7c74db8 /src/com/android/camera/VideoModule.java | |
parent | 219fbf4d3d7c47039c79822af26bace2849375e4 (diff) | |
download | android_packages_apps_Snap-7d7a688e13c9ae8e958387ba0207c7a4af0e4df0.tar.gz android_packages_apps_Snap-7d7a688e13c9ae8e958387ba0207c7a4af0e4df0.tar.bz2 android_packages_apps_Snap-7d7a688e13c9ae8e958387ba0207c7a4af0e4df0.zip |
SnapdragonCamera: Remove custom location permission request window
When user enables the GPS locaion setting, use Android's run-time
permission request interface to get the permission.
Change-Id: Ib17171aeff5ccf20e2b00da08243dee1a3383611
CRs-Fixed: 1038039
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
-rw-r--r-- | src/com/android/camera/VideoModule.java | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index a9e6074ae..ed20b9119 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -85,6 +85,7 @@ public class VideoModule implements CameraModule, FocusOverlayManager.Listener, CameraPreference.OnPreferenceChangedListener, ShutterButton.OnShutterButtonListener, + LocationManager.Listener, MediaRecorder.OnErrorListener, MediaRecorder.OnInfoListener { @@ -497,7 +498,7 @@ public class VideoModule implements CameraModule, mUI.setPrefChangedListener(this); mQuickCapture = mActivity.getIntent().getBooleanExtra(EXTRA_QUICK_CAPTURE, false); - mLocationManager = new LocationManager(mActivity, null); + mLocationManager = new LocationManager(mActivity, this); mUI.setOrientationIndicator(0, false); setDisplayOrientation(); @@ -564,6 +565,23 @@ public class VideoModule implements CameraModule, } } + @Override + public void waitingLocationPermissionResult(boolean result) { + mLocationManager.waitingLocationPermissionResult(result); + } + + @Override + public void enableRecordingLocation(boolean enable) { + String value = (enable ? RecordLocationPreference.VALUE_ON + : RecordLocationPreference.VALUE_OFF); + if (mPreferences != null) { + mPreferences.edit() + .putString(CameraSettings.KEY_RECORD_LOCATION, value) + .apply(); + } + mLocationManager.recordLocation(enable); + } + // SingleTapListener // Preview area is touched. Take a picture. @Override @@ -3011,4 +3029,10 @@ public class VideoModule implements CameraModule, resumeVideoRecording(); } + @Override + public void onErrorListener(int error) { + enableRecordingLocation(false); + } + } + |