resolved conflicts for merge of 382b384e to master

35 files changed, 0 insertions, 364 deletions

diff --git a/res/drawable/ic_btn_default.png b/res/drawable/ic_btn_default.png
deleted file mode 100644
index b5da102..0000000
--- a/res/drawable/ic_btn_default.png
+++ /dev/null
diff --git a/res/drawable/ic_btn_pressed.png b/res/drawable/ic_btn_pressed.png
deleted file mode 100644
index cf6a996..0000000
--- a/res/drawable/ic_btn_pressed.png
+++ /dev/null
diff --git a/res/drawable/ic_btn_selected.png b/res/drawable/ic_btn_selected.png
deleted file mode 100644
index 1326fac..0000000
--- a/res/drawable/ic_btn_selected.png
+++ /dev/null
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index d4e7dbc..0909620 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -57,7 +57,6 @@
     <string name="review_share">"SDÍLET"</string>
     <string name="review_set">"POUŽÍT JAKO"</string>
     <string name="review_play">"PŘEHRÁT"</string>
-    <string name="review_attach">"PŘIPOJIT"</string>
     <string name="review_cancel">"ZRUŠIT"</string>
     <string name="review_done">"Hotovo"</string>
     <string name="review_ok">"OK"</string>
@@ -194,7 +193,6 @@
     <string name="multiselect_delete">"Smazat"</string>
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <string name="progress_dialog_title">"Probíhá"</string>
     <string name="delete_images_message">"Probíhá mazání obrázků, počkejte prosím..."</string>
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
     <skip />
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 9c8f260..c6d5537 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -64,8 +64,6 @@
     <skip />
     <!-- no translation found for review_play (6015456244323302817) -->
     <skip />
-    <!-- no translation found for review_attach (7957325229025880473) -->
-    <skip />
     <!-- no translation found for review_cancel (8188009385853399254) -->
     <skip />
     <!-- no translation found for review_done (5417465988786728114) -->
@@ -237,8 +235,6 @@
     <skip />
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <!-- no translation found for progress_dialog_title (4771577387849747804) -->
-    <skip />
     <!-- no translation found for delete_images_message (4504926868037899430) -->
     <skip />
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 23e6efb..f0e17e2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -57,7 +57,6 @@
     <string name="review_share">"SENDEN"</string>
     <string name="review_set">"FESTLEGEN ALS"</string>
     <string name="review_play">"WIEDERGEBEN"</string>
-    <string name="review_attach">"ANHÄNGEN"</string>
     <string name="review_cancel">"ABBRECHEN"</string>
     <string name="review_done">"FERTIG"</string>
     <string name="review_ok">"OK"</string>
@@ -194,7 +193,6 @@
     <string name="multiselect_delete">"Löschen"</string>
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <string name="progress_dialog_title">"Vorgang läuft."</string>
     <string name="delete_images_message">"Bilder werden gelöscht. Bitte warten..."</string>
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
     <skip />
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f20eaee..6fd6774 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -64,8 +64,6 @@
     <skip />
     <!-- no translation found for review_play (6015456244323302817) -->
     <skip />
-    <!-- no translation found for review_attach (7957325229025880473) -->
-    <skip />
     <!-- no translation found for review_cancel (8188009385853399254) -->
     <skip />
     <!-- no translation found for review_done (5417465988786728114) -->
@@ -237,8 +235,6 @@
     <skip />
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <!-- no translation found for progress_dialog_title (4771577387849747804) -->
-    <skip />
     <!-- no translation found for delete_images_message (4504926868037899430) -->
     <skip />
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index cea8aaf..6a0ec61 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -64,8 +64,6 @@
     <skip />
     <!-- no translation found for review_play (6015456244323302817) -->
     <skip />
-    <!-- no translation found for review_attach (7957325229025880473) -->
-    <skip />
     <!-- no translation found for review_cancel (8188009385853399254) -->
     <skip />
     <!-- no translation found for review_done (5417465988786728114) -->
@@ -237,8 +235,6 @@
     <skip />
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <!-- no translation found for progress_dialog_title (4771577387849747804) -->
-    <skip />
     <!-- no translation found for delete_images_message (4504926868037899430) -->
     <skip />
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 97b2191..d991884 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -57,7 +57,6 @@
     <string name="review_share">"COMPARTIR"</string>
     <string name="review_set">"ESTABLECER COMO"</string>
     <string name="review_play">"REPRODUCIR"</string>
-    <string name="review_attach">"ADJUNTAR"</string>
     <string name="review_cancel">"CANCELAR"</string>
     <string name="review_done">"HECHO"</string>
     <string name="review_ok">"Aceptar"</string>
@@ -194,7 +193,6 @@
     <string name="multiselect_delete">"Suprimir"</string>
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <string name="progress_dialog_title">"En curso"</string>
     <string name="delete_images_message">"Eliminando imágenes; por favor, espera…"</string>
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
     <skip />
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 4524a23..4e0e73c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -57,7 +57,6 @@
     <string name="review_share">"PARTAGER"</string>
     <string name="review_set">"DÉFINIR COMME"</string>
     <string name="review_play">"LIRE"</string>
-    <string name="review_attach">"JOINDRE"</string>
     <string name="review_cancel">"ANNULER"</string>
     <string name="review_done">"FERMER"</string>
     <string name="review_ok">"OK"</string>
@@ -194,7 +193,6 @@
     <string name="multiselect_delete">"Supprimer"</string>
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <string name="progress_dialog_title">"En cours…"</string>
     <string name="delete_images_message">"Suppression des images en cours, veuillez patienter..."</string>
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
     <skip />
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c436c87..174b597 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -57,7 +57,6 @@
     <string name="review_share">"CONDIVIDI"</string>
     <string name="review_set">"IMPOSTA COME"</string>
     <string name="review_play">"RIPRODUCI"</string>
-    <string name="review_attach">"ALLEGA"</string>
     <string name="review_cancel">"ANNULLA"</string>
     <string name="review_done">"FINE"</string>
     <string name="review_ok">"OK"</string>
@@ -194,7 +193,6 @@
     <string name="multiselect_delete">"Elimina"</string>
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <string name="progress_dialog_title">"In corso"</string>
     <string name="delete_images_message">"Eliminazione immagini, attendi..."</string>
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
     <skip />
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 0188dca..c0940de 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -64,8 +64,6 @@
     <skip />
     <!-- no translation found for review_play (6015456244323302817) -->
     <skip />
-    <!-- no translation found for review_attach (7957325229025880473) -->
-    <skip />
     <!-- no translation found for review_cancel (8188009385853399254) -->
     <skip />
     <!-- no translation found for review_done (5417465988786728114) -->
@@ -237,8 +235,6 @@
     <skip />
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <!-- no translation found for progress_dialog_title (4771577387849747804) -->
-    <skip />
     <!-- no translation found for delete_images_message (4504926868037899430) -->
     <skip />
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index b4066cd..64e6d22 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -64,8 +64,6 @@
     <skip />
     <!-- no translation found for review_play (6015456244323302817) -->
     <skip />
-    <!-- no translation found for review_attach (7957325229025880473) -->
-    <skip />
     <!-- no translation found for review_cancel (8188009385853399254) -->
     <skip />
     <!-- no translation found for review_done (5417465988786728114) -->
@@ -237,8 +235,6 @@
     <skip />
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <!-- no translation found for progress_dialog_title (4771577387849747804) -->
-    <skip />
     <!-- no translation found for delete_images_message (4504926868037899430) -->
     <skip />
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 3bfad6b..ae8dd59 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -64,8 +64,6 @@
     <skip />
     <!-- no translation found for review_play (6015456244323302817) -->
     <skip />
-    <!-- no translation found for review_attach (7957325229025880473) -->
-    <skip />
     <!-- no translation found for review_cancel (8188009385853399254) -->
     <skip />
     <!-- no translation found for review_done (5417465988786728114) -->
@@ -237,8 +235,6 @@
     <skip />
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <!-- no translation found for progress_dialog_title (4771577387849747804) -->
-    <skip />
     <!-- no translation found for delete_images_message (4504926868037899430) -->
     <skip />
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 60b52e2..3280fb7 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -57,7 +57,6 @@
     <string name="review_share">"DELEN"</string>
     <string name="review_set">"INSTELLEN ALS"</string>
     <string name="review_play">"AFSPELEN"</string>
-    <string name="review_attach">"BIJVOEGEN"</string>
     <string name="review_cancel">"ANNULEREN"</string>
     <string name="review_done">"GEREED"</string>
     <string name="review_ok">"OK"</string>
@@ -194,7 +193,6 @@
     <string name="multiselect_delete">"Verwijderen"</string>
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <string name="progress_dialog_title">"In behandeling"</string>
     <string name="delete_images_message">"Afbeeldingen verwijderen. Een ogenblik geduld…"</string>
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
     <skip />
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4817a3a..b0a1831 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -57,7 +57,6 @@
     <string name="review_share">"UDOSTĘPNIJ"</string>
     <string name="review_set">"USTAW JAKO"</string>
     <string name="review_play">"ODTWÓRZ"</string>
-    <string name="review_attach">"DOŁĄCZ"</string>
     <string name="review_cancel">"ANULUJ"</string>
     <string name="review_done">"GOTOWE"</string>
     <string name="review_ok">"OK"</string>
@@ -194,7 +193,6 @@
     <string name="multiselect_delete">"Usuń"</string>
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <string name="progress_dialog_title">"W toku"</string>
     <string name="delete_images_message">"Trwa usuwanie zdjęć, czekaj…"</string>
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
     <skip />
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e318960..5d75756 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -64,8 +64,6 @@
     <skip />
     <!-- no translation found for review_play (6015456244323302817) -->
     <skip />
-    <!-- no translation found for review_attach (7957325229025880473) -->
-    <skip />
     <!-- no translation found for review_cancel (8188009385853399254) -->
     <skip />
     <!-- no translation found for review_done (5417465988786728114) -->
@@ -237,8 +235,6 @@
     <skip />
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <!-- no translation found for progress_dialog_title (4771577387849747804) -->
-    <skip />
     <!-- no translation found for delete_images_message (4504926868037899430) -->
     <skip />
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1e9569d..3b7ce7d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -64,8 +64,6 @@
     <skip />
     <!-- no translation found for review_play (6015456244323302817) -->
     <skip />
-    <!-- no translation found for review_attach (7957325229025880473) -->
-    <skip />
     <!-- no translation found for review_cancel (8188009385853399254) -->
     <skip />
     <!-- no translation found for review_done (5417465988786728114) -->
@@ -237,8 +235,6 @@
     <skip />
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <!-- no translation found for progress_dialog_title (4771577387849747804) -->
-    <skip />
     <!-- no translation found for delete_images_message (4504926868037899430) -->
     <skip />
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9d3d33d..f75e242 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -64,8 +64,6 @@
     <skip />
     <!-- no translation found for review_play (6015456244323302817) -->
     <skip />
-    <!-- no translation found for review_attach (7957325229025880473) -->
-    <skip />
     <!-- no translation found for review_cancel (8188009385853399254) -->
     <skip />
     <!-- no translation found for review_done (5417465988786728114) -->
@@ -237,8 +235,6 @@
     <skip />
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <!-- no translation found for progress_dialog_title (4771577387849747804) -->
-    <skip />
     <!-- no translation found for delete_images_message (4504926868037899430) -->
     <skip />
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 10c3a55..940bc95 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -64,8 +64,6 @@
     <skip />
     <!-- no translation found for review_play (6015456244323302817) -->
     <skip />
-    <!-- no translation found for review_attach (7957325229025880473) -->
-    <skip />
     <!-- no translation found for review_cancel (8188009385853399254) -->
     <skip />
     <!-- no translation found for review_done (5417465988786728114) -->
@@ -237,8 +235,6 @@
     <skip />
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <!-- no translation found for progress_dialog_title (4771577387849747804) -->
-    <skip />
     <!-- no translation found for delete_images_message (4504926868037899430) -->
     <skip />
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 483d839..77e4e40 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -64,8 +64,6 @@
     <skip />
     <!-- no translation found for review_play (6015456244323302817) -->
     <skip />
-    <!-- no translation found for review_attach (7957325229025880473) -->
-    <skip />
     <!-- no translation found for review_cancel (8188009385853399254) -->
     <skip />
     <!-- no translation found for review_done (5417465988786728114) -->
@@ -237,8 +235,6 @@
     <skip />
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <!-- no translation found for progress_dialog_title (4771577387849747804) -->
-    <skip />
     <!-- no translation found for delete_images_message (4504926868037899430) -->
     <skip />
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 6d5e6cd..1208012 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -64,8 +64,6 @@
     <skip />
     <!-- no translation found for review_play (6015456244323302817) -->
     <skip />
-    <!-- no translation found for review_attach (7957325229025880473) -->
-    <skip />
     <!-- no translation found for review_cancel (8188009385853399254) -->
     <skip />
     <!-- no translation found for review_done (5417465988786728114) -->
@@ -237,8 +235,6 @@
     <skip />
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <!-- no translation found for progress_dialog_title (4771577387849747804) -->
-    <skip />
     <!-- no translation found for delete_images_message (4504926868037899430) -->
     <skip />
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index dd2a0d5..b5db3a4 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -57,7 +57,6 @@
     <string name="review_share">"分享"</string>
     <string name="review_set">"設為"</string>
     <string name="review_play">"播放"</string>
-    <string name="review_attach">"附加"</string>
     <string name="review_cancel">"取消"</string>
     <string name="review_done">"完成"</string>
     <string name="review_ok">"確定"</string>
@@ -194,7 +193,6 @@
     <string name="multiselect_delete">"刪除"</string>
     <!-- no translation found for multiselect_cancel (5969428692864002165) -->
     <skip />
-    <string name="progress_dialog_title">"進行中"</string>
     <string name="delete_images_message">"正在刪除圖片，請稍候..."</string>
     <!-- no translation found for video_reach_size_limit (6179877322015552390) -->
     <skip />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 95ef278..e98cdd7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -143,9 +143,6 @@
     <!-- button in review mode indicating that the video just taken should be played -->
     <string name="review_play">PLAY</string>
 
-    <!-- button in review mode indicating that the video just taken should be accepted as an attachment -->
-    <string name="review_attach">ATTACH</string>
-
     <!-- button in review mode indicating that the video recording session should be canceled -->
     <string name="review_cancel">CANCEL</string>
 
@@ -567,9 +564,6 @@
     <!-- Title shown on the button which will close the multiselction mode -->
     <string name="multiselect_cancel">Cancel</string>
 
-    <!-- The title of the progress dialog which will be shown for tasks that may take a long time -->
-    <string name="progress_dialog_title">In progress</string>
-
     <!-- The messsage shown on progress dialog when deleting images -->
     <string name="delete_images_message">Deleting images, please wait\u2026</string>
 
diff --git a/src/com/android/camera/BitmapManager.java b/src/com/android/camera/BitmapManager.java
index dbbad17..eb05d3e 100644
--- a/src/com/android/camera/BitmapManager.java
+++ b/src/com/android/camera/BitmapManager.java
@@ -105,11 +105,6 @@ public class BitmapManager {
         getOrCreateThreadStatus(t).mOptions = options;
     }
 
-    synchronized BitmapFactory.Options getDecodingOptions(Thread t) {
-        ThreadStatus status = mThreadStatus.get(t);
-        return status != null ? status.mOptions : null;
-    }
-
     synchronized void removeDecodingOptions(Thread t) {
         ThreadStatus status = mThreadStatus.get(t);
         status.mOptions = null;
@@ -161,21 +156,6 @@ public class BitmapManager {
         notifyAll();
     }
 
-    /**
-     * A debugging routine.
-     */
-    public synchronized void dump() {
-        Iterator<Map.Entry<Thread, ThreadStatus>> i =
-                mThreadStatus.entrySet().iterator();
-
-        while (i.hasNext()) {
-            Map.Entry<Thread, ThreadStatus> entry = i.next();
-            Log.v(TAG, "[Dump] Thread " + entry.getKey() + " ("
-                    + entry.getKey().getId()
-                    + ")'s status is " + entry.getValue());
-        }
-    }
-
     public static synchronized BitmapManager instance() {
         if (sManager == null) {
             sManager = new BitmapManager();
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index fe6b1c7..727b7d3 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -703,27 +703,6 @@ public class Camera extends Activity implements View.OnClickListener,
         return DateFormat.format("yyyy-MM-dd kk.mm.ss", dateTaken).toString();
     }
 
-    public static Matrix getDisplayMatrix(Bitmap b, ImageView v) {
-        Matrix m = new Matrix();
-        float bw = b.getWidth();
-        float bh = b.getHeight();
-        float vw = v.getWidth();
-        float vh = v.getHeight();
-        float scale, x, y;
-        if (bw * vh > vw * bh) {
-            scale = vh / bh;
-            x = (vw - scale * bw) * 0.5F;
-            y = 0;
-        } else {
-            scale = vw / bw;
-            x = 0;
-            y = (vh - scale * bh) * 0.5F;
-        }
-        m.setScale(scale, scale, 0.5F, 0.5F);
-        m.postTranslate(x, y);
-        return m;
-    }
-
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
diff --git a/src/com/android/camera/HighlightView.java b/src/com/android/camera/HighlightView.java
index ee2e129..c05a4b2 100644
--- a/src/com/android/camera/HighlightView.java
+++ b/src/com/android/camera/HighlightView.java
@@ -166,10 +166,6 @@ class HighlightView {
         }
     }
 
-    public ModifyMode getMode() {
-        return mMode;
-    }
-
     public void setMode(ModifyMode mode) {
         if (mode != mMode) {
             mMode = mode;
diff --git a/src/com/android/camera/ImageManager.java b/src/com/android/camera/ImageManager.java
index 3fdc0ab..fbcca6f 100644
--- a/src/com/android/camera/ImageManager.java
+++ b/src/com/android/camera/ImageManager.java
@@ -110,10 +110,6 @@ public class ImageManager {
         }
     }
 
-    public static DataLocation getDefaultDataLocation() {
-        return DataLocation.EXTERNAL;
-    }
-
     public static int roundOrientation(int orientationInput) {
         int orientation = orientationInput;
         if (orientation == -1) {
diff --git a/src/com/android/camera/OnScreenHint.java b/src/com/android/camera/OnScreenHint.java
index 792631c..e0a0eb1 100644
--- a/src/com/android/camera/OnScreenHint.java
+++ b/src/com/android/camera/OnScreenHint.java
@@ -113,69 +113,6 @@ public class OnScreenHint {
     }
 
     /**
-     * Set the margins of the view.
-     *
-     * @param horizontalMargin The horizontal margin, in percentage of the
-     *        container width, between the container's edges and the
-     *        notification
-     * @param verticalMargin The vertical margin, in percentage of the
-     *        container height, between the container's edges and the
-     *        notification
-     */
-    public void setMargin(float horizontalMargin, float verticalMargin) {
-        mHorizontalMargin = horizontalMargin;
-        mVerticalMargin = verticalMargin;
-    }
-
-    /**
-     * Return the horizontal margin.
-     */
-    public float getHorizontalMargin() {
-        return mHorizontalMargin;
-    }
-
-    /**
-     * Return the vertical margin.
-     */
-    public float getVerticalMargin() {
-        return mVerticalMargin;
-    }
-
-    /**
-     * Set the location at which the notification should appear on the screen.
-     * @see android.view.Gravity
-     * @see #getGravity
-     */
-    public void setGravity(int gravity, int xOffset, int yOffset) {
-        mGravity = gravity;
-        mX = xOffset;
-        mY = yOffset;
-    }
-
-     /**
-     * Get the location at which the notification should appear on the screen.
-     * @see android.view.Gravity
-     * @see #getGravity
-     */
-    public int getGravity() {
-        return mGravity;
-    }
-
-    /**
-     * Return the X offset in pixels to apply to the gravity's location.
-     */
-    public int getXOffset() {
-        return mX;
-    }
-
-    /**
-     * Return the Y offset in pixels to apply to the gravity's location.
-     */
-    public int getYOffset() {
-        return mY;
-    }
-
-    /**
      * Make a standard hint that just contains a text view.
      *
      * @param context  The context to use.  Usually your
diff --git a/src/com/android/camera/TimeCounter.java b/src/com/android/camera/TimeCounter.java
deleted file mode 100644
index d21df0f..0000000
--- a/src/com/android/camera/TimeCounter.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.camera;
-
-import android.util.Log;
-
-// A simple counter to measure the time to run a code fragment. Example:
-//
-// TimeCounter mDrawCounter = TimeCounter("Draw", 128);
-// ...
-// mDrawCounter.begin()
-// // drawing code
-// mDrawCounter.end()
-//
-// In this example, the counter will report (using Log.d) average time
-// between begin() and end() every 128 times.
-public class TimeCounter {
-    private static final String TAG = "TimeCounter";
-    private final String mName;
-    private int mSamples;
-    private final int mPeriod;
-
-    // To avoid overflow, these values are in microseconds.
-    private long mSum;
-    private long mSumSquare;
-    private long mBeginTime;
-    private long mMax;
-    private long mMin;
-
-    public TimeCounter(String name, int period) {
-        mName = name;
-        mPeriod = period;
-        reset();
-    }
-
-    public void reset() {
-        mSamples = 0;
-        mSum = 0;
-        mSumSquare = 0;
-        mMax = Long.MIN_VALUE;
-        mMin = Long.MAX_VALUE;
-    }
-
-    public void begin() {
-        mBeginTime = System.nanoTime();
-    }
-
-    public void end() {
-        long delta = (System.nanoTime() - mBeginTime) / 1000;
-        mSum += delta;
-        mSumSquare += delta * delta;
-        if (delta > mMax) mMax = delta;
-        if (delta < mMin) mMin = delta;
-        mSamples++;
-        if (mSamples == mPeriod) {
-            report();
-            reset();
-        }
-    }
-
-    public void report() {
-        double avg = mSum / (double) mSamples;
-        double stddev = Math.sqrt(mSumSquare / (double) mSamples - avg * avg);
-        Log.d(TAG, "Counter " + mName
-                + ": Avg = " + avg
-                + ", StdDev = " + stddev
-                + ", Max = " + mMax
-                + ", Min = " + mMin);
-    }
-}
diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java
index 7c4420b..9e5c74e 100644
--- a/src/com/android/camera/Util.java
+++ b/src/com/android/camera/Util.java
@@ -384,20 +384,6 @@ public class Util {
         }
     }
 
-    public static void debugWhere(String tag, String msg) {
-        Log.d(tag, msg + " --- stack trace begins: ");
-        StackTraceElement elements[] = Thread.currentThread().getStackTrace();
-        // skip first 3 element, they are not related to the caller
-        for (int i = 3, n = elements.length; i < n; ++i) {
-            StackTraceElement st = elements[i];
-            String message = String.format("    at %s.%s(%s:%s)",
-                    st.getClassName(), st.getMethodName(), st.getFileName(),
-                    st.getLineNumber());
-            Log.d(tag, message);
-        }
-        Log.d(tag, msg + " --- stack trace ends.");
-    }
-
     public static synchronized OnClickListener getNullOnClickListener() {
         if (sNullOnClickListener == null) {
             sNullOnClickListener = new OnClickListener() {
diff --git a/src/com/android/camera/VideoPreview.java b/src/com/android/camera/VideoPreview.java
index 50409e6..c51a265 100644
--- a/src/com/android/camera/VideoPreview.java
+++ b/src/com/android/camera/VideoPreview.java
@@ -46,16 +46,6 @@ class VideoPreview extends SurfaceView {
         super(context, attrs, defStyle);
     }
 
-    public void setTileSize(int horizontalTileSize, int verticalTileSize) {
-        if ((mHorizontalTileSize != horizontalTileSize)
-                || (mVerticalTileSize != verticalTileSize)) {
-            mHorizontalTileSize = horizontalTileSize;
-            mVerticalTileSize = verticalTileSize;
-            requestLayout();
-            invalidate();
-        }
-    }
-
     public void setAspectRatio(int width, int height) {
         setAspectRatio(((float) width) / ((float) height));
     }
diff --git a/src/com/android/camera/gallery/BaseCancelable.java b/src/com/android/camera/gallery/BaseCancelable.java
index fd9779f..4fde291 100644
--- a/src/com/android/camera/gallery/BaseCancelable.java
+++ b/src/com/android/camera/gallery/BaseCancelable.java
@@ -52,12 +52,6 @@ public abstract class BaseCancelable<T> implements Cancelable<T> {
 
     protected abstract T execute() throws Exception;
 
-    protected synchronized void interruptNow() {
-        if (isInStates(STATE_CANCELING | STATE_EXECUTING)) {
-            mThread.interrupt();
-        }
-    }
-
     /**
      * Frees the result (which is not null) when the task has been canceled.
      */
@@ -142,13 +136,6 @@ public abstract class BaseCancelable<T> implements Cancelable<T> {
     }
 
     /**
-     * Whether the task's has been requested for cancel.
-     */
-    protected synchronized boolean isCanceling() {
-        return mState == STATE_CANCELING;
-    }
-
-    /**
      * Runs a <code>Cancelable</code> subtask. This method is helpful, if the
      * task can be composed of several cancelable tasks. By using this function,
      * it will pass <code>requestCancel</code> message to those subtasks.
diff --git a/src/com/android/camera/gallery/Image.java b/src/com/android/camera/gallery/Image.java
index 437c741..aab9545 100644
--- a/src/com/android/camera/gallery/Image.java
+++ b/src/com/android/camera/gallery/Image.java
@@ -84,52 +84,6 @@ public class Image extends BaseImage implements IImage {
         return Bitmap.CompressFormat.JPEG;
     }
 
-    /**
-     * Does not replace the tag if already there. Otherwise, adds to the EXIF
-     * tags.
-     *
-     * @param tag
-     * @param value
-     */
-    public void addExifTag(String tag, String value) {
-        if (mExifData == null) {
-            loadExifData();
-        }
-        // If the key is already there, ignore it.
-        if (!mExifData.containsKey(tag)) {
-            mExifData.put(tag, value);
-        }
-    }
-
-    /**
-     * Returns the value of the EXIF tag as an integer.
-     *
-     * @param tag
-     */
-    public int getExifTagInt(String tag, int defaultValue) {
-        String tagValue = getExifTag(tag);
-        try {
-            if (tagValue != null) {
-                return Integer.parseInt(tagValue);
-            }
-        } catch (NumberFormatException ex) {
-            // Simply return defaultValue if exception is thrown.
-            Log.v(TAG, ex.toString());
-        }
-        return defaultValue;
-    }
-
-    /**
-     * Return the value of the EXIF tag as a String. It's caller's
-     * responsibility to check nullity.
-     */
-    public String getExifTag(String tag) {
-        if (mExifData == null) {
-            loadExifData();
-        }
-        return mExifData.get(tag);
-    }
-
     public boolean isReadonly() {
         String mimeType = getMimeType();
         return !"image/jpeg".equals(mimeType) && !"image/png".equals(mimeType);
@@ -140,17 +94,6 @@ public class Image extends BaseImage implements IImage {
     }
 
     /**
-     * Remove tag if already there. Otherwise, does nothing.
-     * @param tag
-     */
-    public void removeExifTag(String tag) {
-        if (mExifData == null) {
-            loadExifData();
-        }
-        mExifData.remove(tag);
-    }
-
-    /**
      * Replaces the tag if already there. Otherwise, adds to the exif tags.
      * @param tag
      * @param value
diff --git a/src/com/android/camera/gallery/UriImage.java b/src/com/android/camera/gallery/UriImage.java
index eb61e8e..a53dd79 100644
--- a/src/com/android/camera/gallery/UriImage.java
+++ b/src/com/android/camera/gallery/UriImage.java
@@ -169,10 +169,6 @@ class UriImage implements IImage {
         return 0;
     }
 
-    public int getRow() {
-        return 0;
-    }
-
     public boolean isReadonly() {
         return true;
     }