diff options
35 files changed, 0 insertions, 360 deletions
diff --git a/res/drawable/ic_btn_default.png b/res/drawable/ic_btn_default.png Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 7359a94..5e504ff 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -56,7 +56,6 @@ <string name="review_share" msgid="7294755861072174509">"SDÍLET"</string> <string name="review_set" msgid="8304758352155378636">"POUŽÍT JAKO"</string> <string name="review_play" msgid="6015456244323302817">"PŘEHRÁT"</string> - <string name="review_attach" msgid="7957325229025880473">"PŘIPOJIT"</string> <string name="review_cancel" msgid="8188009385853399254">"ZRUŠIT"</string> <string name="review_done" msgid="5417465988786728114">"Hotovo"</string> <string name="review_ok" msgid="5305096180300056529">"OK"</string> @@ -192,7 +191,6 @@ <string name="multiselect_share" msgid="5261644537749253581">"Sdílet"</string> <string name="multiselect_delete" msgid="9113461994546744603">"Smazat"</string> <string name="multiselect_cancel" msgid="5969428692864002165">"Zrušit"</string> - <string name="progress_dialog_title" msgid="4771577387849747804">"Probíhá"</string> <string name="delete_images_message" msgid="4504926868037899430">"Probíhá mazání obrázků, počkejte prosím..."</string> <string name="video_reach_size_limit" msgid="6179877322015552390">"Bylo dosaženo limitu velikosti."</string> </resources> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 3a1a88e..d0a5d34 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 177eb5e..7ceebc4 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -56,7 +56,6 @@ <string name="review_share" msgid="7294755861072174509">"SENDEN"</string> <string name="review_set" msgid="8304758352155378636">"FESTLEGEN ALS"</string> <string name="review_play" msgid="6015456244323302817">"WIEDERGEBEN"</string> - <string name="review_attach" msgid="7957325229025880473">"ANHÄNGEN"</string> <string name="review_cancel" msgid="8188009385853399254">"ABBRECHEN"</string> <string name="review_done" msgid="5417465988786728114">"FERTIG"</string> <string name="review_ok" msgid="5305096180300056529">"OK"</string> @@ -192,7 +191,6 @@ <string name="multiselect_share" msgid="5261644537749253581">"Senden"</string> <string name="multiselect_delete" msgid="9113461994546744603">"Löschen"</string> <string name="multiselect_cancel" msgid="5969428692864002165">"Abbrechen"</string> - <string name="progress_dialog_title" msgid="4771577387849747804">"Vorgang läuft."</string> <string name="delete_images_message" msgid="4504926868037899430">"Bilder werden gelöscht. Bitte warten..."</string> <string name="video_reach_size_limit" msgid="6179877322015552390">"Maximale Größe erreicht"</string> </resources> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index d5d00c9..724f309 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 7cb495b..35f32ae 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 281f3e1..07fada1 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -56,7 +56,6 @@ <string name="review_share" msgid="7294755861072174509">"COMPARTIR"</string> <string name="review_set" msgid="8304758352155378636">"ESTABLECER COMO"</string> <string name="review_play" msgid="6015456244323302817">"REPRODUCIR"</string> - <string name="review_attach" msgid="7957325229025880473">"ADJUNTAR"</string> <string name="review_cancel" msgid="8188009385853399254">"CANCELAR"</string> <string name="review_done" msgid="5417465988786728114">"HECHO"</string> <string name="review_ok" msgid="5305096180300056529">"Aceptar"</string> @@ -192,7 +191,6 @@ <string name="multiselect_share" msgid="5261644537749253581">"Compartir"</string> <string name="multiselect_delete" msgid="9113461994546744603">"Suprimir"</string> <string name="multiselect_cancel" msgid="5969428692864002165">"Cancelar"</string> - <string name="progress_dialog_title" msgid="4771577387849747804">"En curso"</string> <string name="delete_images_message" msgid="4504926868037899430">"Eliminando imágenes; por favor, espera…"</string> <string name="video_reach_size_limit" msgid="6179877322015552390">"Se ha alcanzado el límite de tamaño."</string> </resources> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 8a4e417..ba5bd04 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -56,7 +56,6 @@ <string name="review_share" msgid="7294755861072174509">"PARTAGER"</string> <string name="review_set" msgid="8304758352155378636">"DÉFINIR COMME"</string> <string name="review_play" msgid="6015456244323302817">"LIRE"</string> - <string name="review_attach" msgid="7957325229025880473">"JOINDRE"</string> <string name="review_cancel" msgid="8188009385853399254">"ANNULER"</string> <string name="review_done" msgid="5417465988786728114">"FERMER"</string> <string name="review_ok" msgid="5305096180300056529">"OK"</string> @@ -192,7 +191,6 @@ <string name="multiselect_share" msgid="5261644537749253581">"Partager"</string> <string name="multiselect_delete" msgid="9113461994546744603">"Supprimer"</string> <string name="multiselect_cancel" msgid="5969428692864002165">"Annuler"</string> - <string name="progress_dialog_title" msgid="4771577387849747804">"En cours…"</string> <string name="delete_images_message" msgid="4504926868037899430">"Suppression des images en cours, veuillez patienter..."</string> <string name="video_reach_size_limit" msgid="6179877322015552390">"Taille maximale atteinte."</string> </resources> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index b18a79e..34debb6 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -56,7 +56,6 @@ <string name="review_share" msgid="7294755861072174509">"CONDIVIDI"</string> <string name="review_set" msgid="8304758352155378636">"IMPOSTA COME"</string> <string name="review_play" msgid="6015456244323302817">"RIPRODUCI"</string> - <string name="review_attach" msgid="7957325229025880473">"ALLEGA"</string> <string name="review_cancel" msgid="8188009385853399254">"ANNULLA"</string> <string name="review_done" msgid="5417465988786728114">"FINE"</string> <string name="review_ok" msgid="5305096180300056529">"OK"</string> @@ -192,7 +191,6 @@ <string name="multiselect_share" msgid="5261644537749253581">"Condividi"</string> <string name="multiselect_delete" msgid="9113461994546744603">"Elimina"</string> <string name="multiselect_cancel" msgid="5969428692864002165">"Annulla"</string> - <string name="progress_dialog_title" msgid="4771577387849747804">"In corso"</string> <string name="delete_images_message" msgid="4504926868037899430">"Eliminazione immagini, attendi..."</string> <string name="video_reach_size_limit" msgid="6179877322015552390">"Limite di dimensione raggiunto."</string> </resources> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index daf3664..3154e22 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -56,7 +56,6 @@ <string name="review_share" msgid="7294755861072174509">"共有"</string> <string name="review_set" msgid="8304758352155378636">"登録"</string> <string name="review_play" msgid="6015456244323302817">"再生"</string> - <string name="review_attach" msgid="7957325229025880473">"添付"</string> <string name="review_cancel" msgid="8188009385853399254">"キャンセル"</string> <string name="review_done" msgid="5417465988786728114">"完了"</string> <string name="review_ok" msgid="5305096180300056529">"OK"</string> @@ -192,7 +191,6 @@ <string name="multiselect_share" msgid="5261644537749253581">"共有"</string> <string name="multiselect_delete" msgid="9113461994546744603">"削除"</string> <string name="multiselect_cancel" msgid="5969428692864002165">"キャンセル"</string> - <string name="progress_dialog_title" msgid="4771577387849747804">"処理中"</string> <string name="delete_images_message" msgid="4504926868037899430">"画像を削除しています。お待ちください..."</string> <string name="video_reach_size_limit" msgid="6179877322015552390">"サイズ制限に達しました。"</string> </resources> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index cd32073..45c32a5 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 e8be460..1fb54e2 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -56,7 +56,6 @@ <string name="review_share" msgid="7294755861072174509">"Del"</string> <string name="review_set" msgid="8304758352155378636">"Bruk som"</string> <string name="review_play" msgid="6015456244323302817">"Spill"</string> - <string name="review_attach" msgid="7957325229025880473">"Legg ved"</string> <string name="review_cancel" msgid="8188009385853399254">"Avbryt"</string> <string name="review_done" msgid="5417465988786728114">"Ferdig"</string> <string name="review_ok" msgid="5305096180300056529">"OK"</string> @@ -193,7 +192,6 @@ <string name="multiselect_share" msgid="5261644537749253581">"Del"</string> <string name="multiselect_delete" msgid="9113461994546744603">"Slett"</string> <string name="multiselect_cancel" msgid="5969428692864002165">"Avbryt"</string> - <string name="progress_dialog_title" msgid="4771577387849747804">"Arbeider"</string> <string name="delete_images_message" msgid="4504926868037899430">"Sletter bilder, vennligst vent…"</string> <string name="video_reach_size_limit" msgid="6179877322015552390">"Videoen ble for stor."</string> </resources> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 5588985..9179c99 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -56,7 +56,6 @@ <string name="review_share" msgid="7294755861072174509">"DELEN"</string> <string name="review_set" msgid="8304758352155378636">"INSTELLEN ALS"</string> <string name="review_play" msgid="6015456244323302817">"AFSPELEN"</string> - <string name="review_attach" msgid="7957325229025880473">"BIJVOEGEN"</string> <string name="review_cancel" msgid="8188009385853399254">"ANNULEREN"</string> <string name="review_done" msgid="5417465988786728114">"GEREED"</string> <string name="review_ok" msgid="5305096180300056529">"OK"</string> @@ -192,7 +191,6 @@ <string name="multiselect_share" msgid="5261644537749253581">"Delen"</string> <string name="multiselect_delete" msgid="9113461994546744603">"Verwijderen"</string> <string name="multiselect_cancel" msgid="5969428692864002165">"Annuleren"</string> - <string name="progress_dialog_title" msgid="4771577387849747804">"In behandeling"</string> <string name="delete_images_message" msgid="4504926868037899430">"Afbeeldingen verwijderen. Een ogenblik geduld…"</string> <string name="video_reach_size_limit" msgid="6179877322015552390">"Maximale grootte bereikt"</string> </resources> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 2fb1793..b7454d1 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -56,7 +56,6 @@ <string name="review_share" msgid="7294755861072174509">"UDOSTĘPNIJ"</string> <string name="review_set" msgid="8304758352155378636">"USTAW JAKO"</string> <string name="review_play" msgid="6015456244323302817">"ODTWÓRZ"</string> - <string name="review_attach" msgid="7957325229025880473">"DOŁĄCZ"</string> <string name="review_cancel" msgid="8188009385853399254">"ANULUJ"</string> <string name="review_done" msgid="5417465988786728114">"GOTOWE"</string> <string name="review_ok" msgid="5305096180300056529">"OK"</string> @@ -192,7 +191,6 @@ <string name="multiselect_share" msgid="5261644537749253581">"Udostępnij"</string> <string name="multiselect_delete" msgid="9113461994546744603">"Usuń"</string> <string name="multiselect_cancel" msgid="5969428692864002165">"Anuluj"</string> - <string name="progress_dialog_title" msgid="4771577387849747804">"W toku"</string> <string name="delete_images_message" msgid="4504926868037899430">"Trwa usuwanie zdjęć, czekaj…"</string> <string name="video_reach_size_limit" msgid="6179877322015552390">"Osiągnięto limit rozmiaru."</string> </resources> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 6518d40..2576305 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 d5fe1e8..9df2fee 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 4660ea8..90c4bb9 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 f479734..7d9857b 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 6ec1edf..5ff1275 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 fc723f2..718a780 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 d8cdd80..cf24c13 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -56,7 +56,6 @@ <string name="review_share" msgid="7294755861072174509">"分享"</string> <string name="review_set" msgid="8304758352155378636">"設為"</string> <string name="review_play" msgid="6015456244323302817">"播放"</string> - <string name="review_attach" msgid="7957325229025880473">"附加"</string> <string name="review_cancel" msgid="8188009385853399254">"取消"</string> <string name="review_done" msgid="5417465988786728114">"完成"</string> <string name="review_ok" msgid="5305096180300056529">"確定"</string> @@ -192,7 +191,6 @@ <string name="multiselect_share" msgid="5261644537749253581">"分享"</string> <string name="multiselect_delete" msgid="9113461994546744603">"刪除"</string> <string name="multiselect_cancel" msgid="5969428692864002165">"取消"</string> - <string name="progress_dialog_title" msgid="4771577387849747804">"進行中"</string> <string name="delete_images_message" msgid="4504926868037899430">"正在刪除圖片，請稍候..."</string> <string name="video_reach_size_limit" msgid="6179877322015552390">"已達大小上限。"</string> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 7d7761b..1a25762 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> @@ -566,9 +563,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; } |
