Merge "SnapdragonCamera: Remove custom location permission request window" into camera.lnx.1.0-dev.1.0

1 files changed, 0 insertions, 42 deletions

diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index daec2df4c..fd4b18186 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -84,7 +84,6 @@ public class PhotoUI implements PieListener,
         PreviewGestures.SingleTapListener,
         FocusUI,
         SurfaceHolder.Callback,
-        LocationManager.Listener,
         CameraRootView.MyDisplayListener,
         CameraManager.CameraFaceDetectionCallback {
 
@@ -686,41 +685,6 @@ public class PhotoUI implements PieListener,
         muteButton.setVisibility(View.GONE);
     }
 
-    public void showLocationDialog() {
-        mLocationDialog = new AlertDialog.Builder(mActivity)
-                .setTitle(R.string.remember_location_title)
-                .setMessage(R.string.remember_location_prompt)
-                .setPositiveButton(R.string.remember_location_yes,
-                        new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int arg1) {
-                                mController.enableRecordingLocation(true);
-                                mLocationDialog = null;
-                            }
-                        })
-                .setNegativeButton(R.string.remember_location_no,
-                        new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int arg1) {
-                                dialog.cancel();
-                            }
-                        })
-                .setOnCancelListener(new DialogInterface.OnCancelListener() {
-                    @Override
-                    public void onCancel(DialogInterface dialog) {
-                        mController.enableRecordingLocation(false);
-                        mLocationDialog = null;
-                    }
-                })
-                .setOnDismissListener(new DialogInterface.OnDismissListener() {
-                    @Override
-                    public void onDismiss(DialogInterface dialog) {
-                        mActivity.setSystemBarsVisibility(false);
-                    }
-                })
-                .show();
-    }
-
     public void initializeZoom(Camera.Parameters params) {
         if ((params == null) || !params.isZoomSupported()
                 || (mZoomRenderer == null)) return;
@@ -736,12 +700,6 @@ public class PhotoUI implements PieListener,
         }
     }
 
-    @Override
-    public void showGpsOnScreenIndicator(boolean hasSignal) { }
-
-    @Override
-    public void hideGpsOnScreenIndicator() { }
-
     public void overrideSettings(final String ... keyvalues) {
         if (mMenu == null)
             return;