re-commit refactored CameraView

closes #4529
Confirmed fixed front-camera bug in Galaxy Nexus.

// FREEBIE
This commit is contained in:
Jake McGinty
2015-11-13 17:13:40 -08:00
committed by Moxie Marlinspike
parent 66578a2c76
commit f82a7fee49
10 changed files with 392 additions and 721 deletions

View File

@@ -53,7 +53,6 @@ import android.widget.ImageButton;
import android.widget.TextView;
import android.widget.Toast;
import com.commonsware.cwac.camera.CameraHost.FailureReason;
import com.google.protobuf.ByteString;
import org.thoughtcrime.redphone.RedPhone;
@@ -1344,7 +1343,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
}
@Override
public void onCameraFail(FailureReason reason) {
public void onCameraFail() {
Toast.makeText(this, R.string.ConversationActivity_quick_camera_unavailable, Toast.LENGTH_SHORT).show();
quickAttachmentDrawer.hide(false);
quickAttachmentToggle.disable();