diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-10-06 18:07:07 -0700 |
---|---|---|
committer | Sascha Haeberling <haeberling@google.com> | 2013-10-06 18:08:30 -0700 |
commit | 4de788063b51cc2d3f65122bdcc7f862170ba761 (patch) | |
tree | 9dbee7f3ddf40d2065ec8554cf483ed2631536ee /src | |
parent | 4ab4879eec785faf40ccb346b96963f04af9b0e6 (diff) | |
download | android_packages_apps_Snap-4de788063b51cc2d3f65122bdcc7f862170ba761.tar.gz android_packages_apps_Snap-4de788063b51cc2d3f65122bdcc7f862170ba761.tar.bz2 android_packages_apps_Snap-4de788063b51cc2d3f65122bdcc7f862170ba761.zip |
Revert CL that added broadcast receivers for shutter control.
Bug: 11006189
This was added for Gem support but causes us trouble. As it's not
essential, we'll remove it now.
Original CL was http://ag/342589
Change-Id: I9e137411cf5beb0fbdad611ee85803960feef14a
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index c0693deea..88fb72a43 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -342,18 +342,6 @@ public class PhotoModule } } - private BroadcastReceiver mReceiver = null; - - private class ShutterBroadcastReceiver extends BroadcastReceiver { - @Override - public void onReceive(Context context, Intent intent) { - String action = intent.getAction(); - if (action.equals(CameraUtil.ACTION_CAMERA_SHUTTER_CLICK)) { - onShutterButtonFocus(true); - onShutterButtonClick(); - } - } - } @Override public void init(CameraActivity activity, View parent) { @@ -1132,11 +1120,7 @@ public class PhotoModule @Override public void installIntentFilter() { - // Install an intent filter to receive remote shutter events. - IntentFilter intentFilter = - new IntentFilter(CameraUtil.ACTION_CAMERA_SHUTTER_CLICK); - mReceiver = new ShutterBroadcastReceiver(); - mActivity.registerReceiver(mReceiver, intentFilter); + // Do nothing. } @Override @@ -1211,23 +1195,10 @@ public class PhotoModule if (msensor != null) { mSensorManager.registerListener(this, msensor, SensorManager.SENSOR_DELAY_NORMAL); } - - installIntentFilter(); - Intent intent = new Intent(CameraUtil.ACTION_CAMERA_STARTED); - mActivity.sendBroadcast(intent); } @Override public void onPauseBeforeSuper() { - - Intent intent = new Intent(CameraUtil.ACTION_CAMERA_STOPPED); - mActivity.sendBroadcast(intent); - - if (mReceiver != null) { - mActivity.unregisterReceiver(mReceiver); - mReceiver = null; - } - mPaused = true; Sensor gsensor = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER); if (gsensor != null) { |