Merge "Log camera exception via UsageStatistics." into ub-camera-glacier
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index f7ca9ee..af9af0f 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1472,7 +1472,7 @@
mPanoramaViewHelper = new PanoramaViewHelper(this);
mPanoramaViewHelper.onCreate();
// Set up the camera preview first so the preview shows up ASAP.
- mDataAdapter = new CameraDataAdapter(mAppContext, mMainHandler, R.color.photo_placeholder);
+ mDataAdapter = new CameraDataAdapter(mAppContext, R.color.photo_placeholder);
mDataAdapter.setLocalDataListener(mLocalDataListener);
mPreloader = new Preloader<Integer, AsyncTask>(FILMSTRIP_PRELOAD_AHEAD_ITEMS, mDataAdapter,
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index b729aa9..d363591 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -460,6 +460,7 @@
}
mAppController.getCameraAppUI().transitionToCapture();
mAppController.getCameraAppUI().showModeOptions();
+ mAppController.setShutterEnabled(true);
}
@Override
@@ -1271,9 +1272,11 @@
// If we are already in the middle of taking a snapshot or the image
// save request is full then ignore.
if (mCameraDevice == null || mCameraState == SNAPSHOT_IN_PROGRESS
- || mCameraState == SWITCHING_CAMERA || !mAppController.isShutterEnabled()) {
+ || mCameraState == SWITCHING_CAMERA) {
return false;
}
+ setCameraState(SNAPSHOT_IN_PROGRESS);
+
mCaptureStartTime = System.currentTimeMillis();
mPostViewPictureCallbackTime = 0;
@@ -1297,9 +1300,6 @@
mJpegRotation = info.getJpegOrientation(orientation);
mCameraDevice.setJpegOrientation(mJpegRotation);
- // We don't want user to press the button again while taking a
- // multi-second HDR photo.
- mAppController.setShutterEnabled(false);
mCameraDevice.takePicture(mHandler,
new ShutterCallback(!animateBefore),
mRawPictureCallback, mPostViewPictureCallback,
@@ -1308,7 +1308,6 @@
mNamedImages.nameNewImage(mCaptureStartTime);
mFaceDetectionStarted = false;
- setCameraState(SNAPSHOT_IN_PROGRESS);
return true;
}
@@ -1502,7 +1501,8 @@
@Override
public void onShutterButtonClick() {
if (mPaused || (mCameraState == SWITCHING_CAMERA)
- || (mCameraState == PREVIEW_STOPPED)) {
+ || (mCameraState == PREVIEW_STOPPED)
+ || !mAppController.isShutterEnabled()) {
mVolumeButtonClickedFlag = false;
return;
}
@@ -1517,6 +1517,8 @@
Log.d(TAG, "onShutterButtonClick: mCameraState=" + mCameraState +
" mVolumeButtonClickedFlag=" + mVolumeButtonClickedFlag);
+ mAppController.setShutterEnabled(false);
+
int countDownDuration = mActivity.getSettingsManager()
.getInteger(SettingsManager.SCOPE_GLOBAL, Keys.KEY_COUNTDOWN_DURATION);
mTimerDuration = countDownDuration;
diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java
index 19ae6f6..721b213 100644
--- a/src/com/android/camera/data/CameraDataAdapter.java
+++ b/src/com/android/camera/data/CameraDataAdapter.java
@@ -20,7 +20,6 @@
import android.content.Context;
import android.net.Uri;
import android.os.AsyncTask;
-import android.os.Handler;
import android.view.View;
import com.android.camera.Storage;
@@ -41,7 +40,6 @@
private static final int DEFAULT_DECODE_SIZE = 1600;
private final Context mContext;
- private final Handler mCallbackHandler;
private LocalDataList mImages;
@@ -55,9 +53,8 @@
private LocalData mLocalDataToDelete;
- public CameraDataAdapter(Context context, Handler callbackHandler, int placeholderResource) {
+ public CameraDataAdapter(Context context, int placeholderResource) {
mContext = context;
- mCallbackHandler = callbackHandler;
mImages = new LocalDataList();
mPlaceHolderResourceId = placeholderResource;
}
@@ -147,17 +144,10 @@
}
@Override
- public void setListener(final Listener listener) {
+ public void setListener(Listener listener) {
mListener = listener;
if (mImages.size() != 0) {
- mCallbackHandler.post(new Runnable() {
- @Override
- public void run() {
- if (listener != null) {
- listener.onDataLoaded();
- }
- }
- });
+ mListener.onDataLoaded();
}
}
@@ -170,8 +160,8 @@
}
@Override
- public void removeData(final int dataID) {
- final LocalData d = mImages.remove(dataID);
+ public void removeData(int dataID) {
+ LocalData d = mImages.remove(dataID);
if (d == null) {
return;
}
@@ -179,14 +169,7 @@
// Delete previously removed data first.
executeDeletion();
mLocalDataToDelete = d;
- mCallbackHandler.post(new Runnable() {
- @Override
- public void run() {
- if (mListener != null) {
- mListener.onDataRemoved(dataID, d);
- }
- }
- });
+ mListener.onDataRemoved(dataID, d);
}
@Override
@@ -248,19 +231,12 @@
return;
}
- final LocalData data = mImages.get(pos);
+ LocalData data = mImages.get(pos);
LocalData refreshedData = data.refresh(mContext);
// Refresh failed. Probably removed already.
- if (refreshedData == null) {
- mCallbackHandler.post(new Runnable() {
- @Override
- public void run() {
- if (mListener != null) {
- mListener.onDataRemoved(pos, data);
- }
- }
- });
+ if (refreshedData == null && mListener != null) {
+ mListener.onDataRemoved(pos, data);
return;
}
updateData(pos, refreshedData);
@@ -269,27 +245,22 @@
@Override
public void updateData(final int pos, LocalData data) {
mImages.set(pos, data);
- mCallbackHandler.post(new Runnable() {
- @Override
- public void run() {
- if (mListener != null) {
- mListener.onDataUpdated(new UpdateReporter() {
- @Override
- public boolean isDataRemoved(int dataID) {
- return false;
- }
-
- @Override
- public boolean isDataUpdated(int dataID) {
- return (dataID == pos);
- }
- });
+ if (mListener != null) {
+ mListener.onDataUpdated(new UpdateReporter() {
+ @Override
+ public boolean isDataRemoved(int dataID) {
+ return false;
}
- }
- });
+
+ @Override
+ public boolean isDataUpdated(int dataID) {
+ return (dataID == pos);
+ }
+ });
+ }
}
- private void insertData(final LocalData data) {
+ private void insertData(LocalData data) {
// Since this function is mostly for adding the newest data,
// a simple linear search should yield the best performance over a
// binary search.
@@ -300,15 +271,9 @@
;
}
mImages.add(pos, data);
- final int fpos = pos;
- mCallbackHandler.post(new Runnable() {
- @Override
- public void run() {
- if (mListener != null) {
- mListener.onDataInserted(fpos, data);
- }
- }
- });
+ if (mListener != null) {
+ mListener.onDataInserted(pos, data);
+ }
}
/** Update all the data */
@@ -317,14 +282,9 @@
return;
}
mImages = list;
- mCallbackHandler.post(new Runnable() {
- @Override
- public void run() {
- if (mListener != null) {
- mListener.onDataLoaded();
- }
- }
- });
+ if (mListener != null) {
+ mListener.onDataLoaded();
+ }
}
@Override
@@ -361,7 +321,7 @@
return getTotalNumber();
}
- private class LoadNewPhotosTask extends AsyncTask<ContentResolver, Void, Void> {
+ private class LoadNewPhotosTask extends AsyncTask<ContentResolver, Void, List<LocalData>> {
private final long mMinPhotoId;
@@ -372,29 +332,34 @@
/**
* Loads any new photos added to our storage directory since our last query.
* @param contentResolvers {@link android.content.ContentResolver} to load data.
+ * @return An {@link java.util.ArrayList} containing any new data.
*/
@Override
- protected Void doInBackground(ContentResolver... contentResolvers) {
+ protected List<LocalData> doInBackground(ContentResolver... contentResolvers) {
if (mMinPhotoId != LocalMediaData.QUERY_ALL_MEDIA_ID) {
final ContentResolver cr = contentResolvers[0];
- List<LocalData> newPhotoData = LocalMediaData.PhotoData.query(cr, LocalMediaData.PhotoData.CONTENT_URI,
+ return LocalMediaData.PhotoData.query(cr, LocalMediaData.PhotoData.CONTENT_URI,
mMinPhotoId);
- if (!newPhotoData.isEmpty()) {
- LocalData newestPhoto = newPhotoData.get(0);
- // We may overlap with another load task or a query task, in which case we want
- // to be sure we never decrement the oldest seen id.
- mLastPhotoId = Math.max(mLastPhotoId, newestPhoto.getContentId());
- }
- // We may add data that is already present, but if we do, it will be deduped in addData.
- // addData does not dedupe session items, so we ignore them here
- for (LocalData localData : newPhotoData) {
- Uri sessionUri = Storage.getSessionUriFromContentUri(localData.getUri());
- if (sessionUri == null) {
- addData(localData);
- }
+ }
+ return new ArrayList<LocalData>(0);
+ }
+
+ @Override
+ protected void onPostExecute(List<LocalData> newPhotoData) {
+ if (!newPhotoData.isEmpty()) {
+ LocalData newestPhoto = newPhotoData.get(0);
+ // We may overlap with another load task or a query task, in which case we want
+ // to be sure we never decrement the oldest seen id.
+ mLastPhotoId = Math.max(mLastPhotoId, newestPhoto.getContentId());
+ }
+ // We may add data that is already present, but if we do, it will be deduped in addData.
+ // addData does not dedupe session items, so we ignore them here
+ for (LocalData localData : newPhotoData) {
+ Uri sessionUri = Storage.getSessionUriFromContentUri(localData.getUri());
+ if (sessionUri == null) {
+ addData(localData);
}
}
- return null;
}
}
diff --git a/src/com/android/camera/settings/CameraSettingsActivity.java b/src/com/android/camera/settings/CameraSettingsActivity.java
index f09f33b..db9c62c 100644
--- a/src/com/android/camera/settings/CameraSettingsActivity.java
+++ b/src/com/android/camera/settings/CameraSettingsActivity.java
@@ -50,6 +50,13 @@
* Provides the settings UI for the Camera app.
*/
public class CameraSettingsActivity extends FragmentActivity {
+ /**
+ * Used to denote a subsection of the preference tree to display in the
+ * Fragment. For instance, if 'Advanced' key is provided, the advanced
+ * preference section will be treated as the root for display. This is used
+ * to enable activity transitions between preference sections, and allows
+ * back/up stack to operate correctly.
+ */
public static final String PREF_SCREEN_EXTRA = "pref_screen_extra";
@Override
@@ -61,7 +68,10 @@
actionBar.setTitle(R.string.mode_settings);
String prefKey = getIntent().getStringExtra(PREF_SCREEN_EXTRA);
- CameraSettingsFragment dialog = new CameraSettingsFragment(prefKey);
+ CameraSettingsFragment dialog = new CameraSettingsFragment();
+ Bundle bundle = new Bundle(1);
+ bundle.putString(PREF_SCREEN_EXTRA, prefKey);
+ dialog.setArguments(bundle);
getFragmentManager().beginTransaction().replace(android.R.id.content, dialog).commit();
}
@@ -85,7 +95,7 @@
private static DecimalFormat sMegaPixelFormat = new DecimalFormat("##0.0");
private String[] mCamcorderProfileNames;
private CameraDeviceInfo mInfos;
- private final String mPrefKey;
+ private String mPrefKey;
private boolean mGetSubPrefAsRoot = true;
// Selected resolutions for the different cameras and sizes.
@@ -96,13 +106,13 @@
private SelectedVideoQualities mVideoQualitiesBack;
private SelectedVideoQualities mVideoQualitiesFront;
- public CameraSettingsFragment(String prefKey) {
- mPrefKey = prefKey;
- }
-
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ Bundle arguments = getArguments();
+ if (arguments != null) {
+ mPrefKey = arguments.getString(PREF_SCREEN_EXTRA);
+ }
Context context = this.getActivity().getApplicationContext();
addPreferencesFromResource(R.xml.camera_preferences);