summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/WideAnglePanoramaModule.java
diff options
context:
space:
mode:
authorJay Wang <jaywang@codeaurora.org>2016-07-19 18:11:05 -0700
committerJay Wang <jaywang@codeaurora.org>2016-07-19 18:33:27 -0700
commit56aabdf703779b97ef40cbef8fcde2620a379028 (patch)
tree6710a435e25aff3cda02545658f023151e93f896 /src/com/android/camera/WideAnglePanoramaModule.java
parentd8f8770adb894d7ccdedde05512be91885fec07f (diff)
downloadandroid_packages_apps_Snap-56aabdf703779b97ef40cbef8fcde2620a379028.tar.gz
android_packages_apps_Snap-56aabdf703779b97ef40cbef8fcde2620a379028.tar.bz2
android_packages_apps_Snap-56aabdf703779b97ef40cbef8fcde2620a379028.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/WideAnglePanoramaModule.java')
-rw-r--r--src/com/android/camera/WideAnglePanoramaModule.java18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index 3f825dd39..210fe3600 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -896,6 +896,24 @@ public class WideAnglePanoramaModule
}
@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);
+ }
+
+ @Override
public void onPauseBeforeSuper() {
mPaused = true;
if (mLocationManager != null) mLocationManager.recordLocation(false);