From 70a29f182f6696b089d1c376fc5aadd7a20f6231 Mon Sep 17 00:00:00 2001 From: Jun Tian Date: Wed, 3 Jul 2013 13:49:38 +0800 Subject: Fix the loading library issue of panorama mode in Legacycamera app The Legacycamera app requires libjni_legacymosaic module, and this module is included in the makefile. But in the implementation code, it loads the libjni_mosaic module. This patch changed the loading library to fix crash issue when using panorama mode in the Legacycamera. Change-Id: Id7d4192b076412c674ef716c9ffcb31fe5cb6619 Signed-off-by: Jun Tian Signed-off-by: Zhu Yanglinx Signed-off-by: Chang Panfeng --- src/com/android/camera/panorama/Mosaic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/camera/panorama/Mosaic.java b/src/com/android/camera/panorama/Mosaic.java index 5064cec..90bf2ad 100644 --- a/src/com/android/camera/panorama/Mosaic.java +++ b/src/com/android/camera/panorama/Mosaic.java @@ -93,7 +93,7 @@ public class Mosaic { static { - System.loadLibrary("jni_mosaic"); + System.loadLibrary("jni_legacymosaic"); } /** -- cgit v1.1 From 2d303cacaf6606f580f040a1b03feab9483e302c Mon Sep 17 00:00:00 2001 From: Jun Tian Date: Tue, 6 Aug 2013 14:52:27 +0800 Subject: Loading the corresponding library in LegacyCamera app The LegacyCamera app is loading wrong library in MosaicRenderer.java. It causes the camera app crash in the SDK image when changing the camera to panorma mode. Change-Id: I4c20af796622dd0e76a86ed7249d9b8fa54837b9 --- src/com/android/camera/panorama/MosaicRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/camera/panorama/MosaicRenderer.java b/src/com/android/camera/panorama/MosaicRenderer.java index f055c0e..f4e9abc 100644 --- a/src/com/android/camera/panorama/MosaicRenderer.java +++ b/src/com/android/camera/panorama/MosaicRenderer.java @@ -24,7 +24,7 @@ public class MosaicRenderer { static { - System.loadLibrary("jni_mosaic"); + System.loadLibrary("jni_legacymosaic"); } /** -- cgit v1.1 From 4df99f37a4884bc57f1d1e9bf51e3bb44e7886d9 Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Mon, 9 Dec 2013 13:55:15 -0800 Subject: Remove deprecated locales Bug:11340849 Change-Id: I1c3fa9731b4d20f16bcfb88d070fba263086563e --- res/values-be/strings.xml | 132 ---------------------------------------------- res/values-et/strings.xml | 132 ---------------------------------------------- res/values-ms/strings.xml | 132 ---------------------------------------------- 3 files changed, 396 deletions(-) delete mode 100644 res/values-be/strings.xml delete mode 100644 res/values-et/strings.xml delete mode 100644 res/values-ms/strings.xml diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml deleted file mode 100644 index c4630f0..0000000 --- a/res/values-be/strings.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - - "Памылка камеры" - "Не атрымлiваецца падключыцца да камеры." - "Камера адключана з-за палітыкі бяспекі." - "Камера" - "Відэакамера" - "Фота з камеры" - "Відэа з камеры" - "Чакайце..." - "Перш чым выкарыстоўваць камеру, падключыце USB-назапашвальнiк." - "Устаўце SD-карту перад выкарыстаннем камеры." - "Ваш USB-назапашвальнiк поўны." - "Ваша SD-карта запоўненая." - "Падрыхтоўка USB-назапашвальнiка..." - "Падрыхтоўка SD-карты..." - "Немагчыма атрымаць доступ да USB-назапашвальніка." - "Немагчыма атрымаць доступ да SD-карты." - "Аднавіць налады па змаўчанні" - "Аднавіць налады камеры па змаўчанні?" - "Прайграць" - "АДМЯНІЦЬ" - "ГАТОВА" - "ЗРАБІЦЬ ЗНОЎ" - "Галерэя" - "Пераключыць камеру" - "Запіс на працягу доўгага часу" - "Выберыце камеру" - "Назад" - "Перад" - "Месцазнаходжанне крамы" - "Адключана" - "Уключана" - "Якасць відэа" - "Інтэрвал здымак на працягу доўгага часу" - "Налады камеры" - "Налады відэакамеры" - "Памер малюнка" - "5 мегапiкселяў" - "3 мегапiкселi" - "2 мегапiкселi" - "1,3 мегапікселя" - "1 мегапiксель" - "VGA" - "QVGA" - "Рэжым факусоўкі" - "Аўтаматычна" - "Бясконцасць" - "Макра" - "Рэжым успышкі" - "Аўтаматычна" - "Уключана" - "Адключана" - "Баланс белага" - "Аўтаматычна" - "Белы напал" - "Дзённае святло" - "Флюарэсцэнтны" - "Пахмурна" - "Рэжым здымкаў" - "Аўтаматычна" - "Дзеянне" - "Ноч" - "Заход" - "Вечарына" - "Немагчыма выбраць у рэжыме здымкi." - "Налады камеры" - "Усталяваць налады па змаўчанні" - "Экспазіцыя" - "ОК" - "Месца на вашым USB-назапашвальнiку заканчваецца. Змяніце параметры якасці або выдаліце некаторыя выявы цi іншыя файлы." - "Месца на вашай SD-карце заканчваецца. Змяніце параметры якасці або выдаліце некаторыя выявы цi іншыя файлы." - "Дасягнуты максімальны памер." - "Пераключэнне ў рэжым камеры" - "Пераключэнне ў рэжым відэа" - "Пераключэнне ў рэжым панарамы" - "Апублікаваць малюнак з дапам." - "Апублікаваць відэа з дапам." - "Няма выяў для публiкацыi" - "Няма відэа для публікацыі." - "Занад. хутка" - "Падрыхтоўка панарамы" - "Немагчыма захаваць панараму." - "Панарама" - "Захоп панарамы" - "Захаванне..." - "Націсніце, каб наладзiць фокус." - "Эфекты" - "Няма" - "Сцicнуць" - "Вялiкiя вочы" - "Вялiкi рот" - "Маленькi рот" - "Вялікі нос" - "Маленькiя вочы" - "У космасе" - "Заход" - "Выбірайце свой" - "Усталюйце прыладу"\n"На імгненне выйдзіце з поля зроку" - "Немагчыма выбраць, калі эфект уключаны." - "Зрабіце фота падчас запiсу вiдэа, дакрануўшыся да экрану папярэдняга прагляду." - "Капiяванне кадра з відэа адключаецца, калі ўключаны спецэфекты." - "Выдалiць эфекты" - "ПАЦЕШНЫЯ СМАЙЛIКI" - "ФОНАВЫЯ" - "Кнопка затвора" - "Апошнія фатаграфii" - "Пераключэнне пярэдняй i задняй камеры" - "Камера, вiдэа або панарама" - "Іншыя налады" - "Закрыць налады" - "Кiраванне маштабаваннем..." - "Памяншэнне на %1$s" - "Павелічэнне %1$s" - "Пераключэнне %1$s" - diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml deleted file mode 100644 index c6b0148..0000000 --- a/res/values-et/strings.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - - "Kaamera viga" - "Ei saa kaameraga ühendada." - "Kaamera on keelatud turvaeeskirjade tõttu." - "Kaamera" - "Videokaamera" - "Kaamera pildid" - "Kaamera videod" - "Oodake ..." - "Paigaldage USB-mäluseade enne kaamera kasutamist." - "Enne kaamera kasutamist sisestage SD-kaart." - "Teie USB-mäluseade on täis." - "Teie SD-kaart on täis." - "USB-seadme ettevalmistamine…" - "SD-kaardi ettevalmistamine ..." - "Juurdepääs USB-mäluseadmele ebaõnnestus." - "Juurdepääs SD-kaardile ebaõnnestus." - "Vaikeseadete taastamine" - "Kas taastada kaamera vaikeseaded?" - "Esita" - "TÜHISTA" - "VALMIS" - "TEE UUESTI" - "Galerii" - "Vaheta kaamerat" - "Aeglase filmimise salvestamine" - "Kaamera valimine" - "Tagasi" - "Eestvaade" - "Talletuse asukoht" - "Väljas" - "Sees" - "Video kvaliteet" - "Aeglase filmimise ajavahemik" - "Kaamera seaded" - "Videokaamera seaded" - "Pildi suurus" - "5 miljonit pikslit" - "3 miljonit pikslit" - "2 miljonit pikslit" - "1,3 miljonit pikslit" - "1 miljon pikslit" - "VGA" - "QVGA" - "Teravustamisrežiim" - "Automaatne" - "Lõpmatus" - "Makro" - "Välgurežiim" - "Automaatne" - "Sees" - "Väljas" - "Valge tasakaal" - "Automaatne" - "Hõõglamp" - "Päevavalgus" - "Päevavalguslamp" - "Pilves" - "Stseenirežiim" - "Automaatne" - "Toiming" - "Öö" - "Päikeseloojang" - "Pidu" - "Seda ei saa stseenirežiimis valida." - "Kaamera seaded" - "Taasta vaikeseaded" - "Säriaeg" - "OK" - "Teie USB-mäluseadme ruum on otsa saamas. Muutke kvaliteediseadeid või kustutage kujutisi või teisi faile." - "Teie SD-kaardi ruum on otsa saamas. Muutke kvaliteedi seadeid või kustutage kujutisi või teisi faile." - "Suuruspiirang on saavutatud." - "Lülitu kaamerale" - "Lülitu videole" - "Lülitu panoraamile" - "Pildi jagamine rakenduse kaudu:" - "Video jagamine rakenduse kaudu:" - "Jagatavad pildid puuduvad." - "Jagatavad videod puuduvad." - "Liiga kiire" - "Panoraami ettevalmistus" - "Panoraami ei saanud salvestada." - "Panoraam" - "Panoraami jäädvustamine" - "Salvestus ..." - "Puudutage fokuseerimiseks." - "Efektid" - "Mitte ühtegi" - "Pitsita" - "Suured silmad" - "Suur suu" - "Väike suu" - "Suur nina" - "Väiksed silmad" - "Kosmoses" - "Päikeseloojang" - "Valige ise" - "Pange seade käest"\n"Lahkuge korraks vaateväljast" - "Võimatu valida, kui efekt on sisse lülitatud." - "Videot salvestades foto jäädvustamiseks koputage eelvaate kuval." - "Kui eriefektid on sisse lülitatud, on video hetktõmmis keelatud." - "Nulli efektid" - "NALJAKAD NÄOD" - "TAUST" - "Päästiku nupp" - "Viimane foto" - "Eesmise ja tagumise kaamera lüliti" - "Kaamera, video või panoraami valija" - "Rohkem seadete juhtnuppe" - "Sule seadete juhtnupud" - "Suumi juhtimine" - "Vähenda %1$s" - "Suurenda %1$s" - "Lüliti %1$s" - diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml deleted file mode 100644 index bfbb8e1..0000000 --- a/res/values-ms/strings.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - - "Ralat kamera" - "Tidak boleh menyambung kepada kamera." - "Kamera telah dilumpuhkan kerana dasar keselamatan." - "Kamera" - "Kamkorder" - "Gambar kamera" - "Kamera video" - "Sila tunggu..." - "Lekapkan storan USB sebelum menggunakan kamera." - "Masukkan kad SD sebelum menggunakan kamera." - "Storan USB anda penuh." - "Kad SD anda penuh." - "Menyediakan storan USB..." - "Menyediakan kad SD..." - "Tidak dapat mengakses storan USB." - "Tidak dapat mengakses kad SD." - "Pulihkan lalai" - "Pulihkan tetapan lalai Kamera?" - "Main" - "BATAL" - "SELESAI" - "AMBIL SEMULA" - "Galeri" - "Tukar Kamera" - "Rakaman selang masa" - "Pilih kamera" - "Belakang" - "Depan" - "Lokasi stor" - "Mati" - "Hidup" - "Kualiti video" - "Jeda selang masa" - "Tetapan kamera" - "Tetapan kamkorder" - "Saiz gambar" - "5M piksel" - "3M piksel" - "2M piksel" - "1.3M piksel" - "1M piksel" - "VGA" - "QVGA" - "Mod fokus" - "Auto" - "Infiniti" - "Makro" - "Mod denyar" - "Auto" - "Hidup" - "Mati" - "Imbangan putih" - "Auto" - "Berpijar" - "Siang hari" - "Pendarfluor" - "Mendung" - "Mod pemandangan" - "Auto" - "Aksi" - "Malam" - "Matahari Terbenam" - "Parti" - "Tidak boleh dipilih dalam mod pemandangan." - "Tetapan kamera" - "Pulihkan lalai" - "Dedahan" - "OK" - "Storan USB anda kehabisan ruang. Tukar tetapan mutu atau padamkan beberapa imej atau fail lain." - "Kad SD anda kehabisan ruang. Tukar tetapan mutu atau padamkan beberapa imej atau fail lain." - "Had saiz dicapai." - "Tukar kepada kamera" - "Tukar kepada video" - "Tukar kepada panorama" - "Berkongsi gambar melalui" - "Berkongsi video melalui" - "Tiada gambar untuk dikongsi." - "Tiada video untuk dikongsi." - "Trlalu cepat" - "Menyediakan panorama" - "Tidak dapat menyimpan panorama." - "Panorama" - "Menangkap gambar panorama" - "Menyimpan…" - "Sentuh untuk memfokus." - "Kesan" - "Tiada" - "Picit" - "Mata besar" - "Mulut besar" - "Mulut kecil" - "Hidung besar" - "Mata kecil" - "Di angkasa" - "Matahari Terbenam" - "Plh milik sndr" - "Tetapkan peranti anda ke bawah"\n"Keluar dari pandangan seketika" - "Tidak boleh dipilih apabila kesan dihidupkan." - "Ambil gmbr semasa rakaman video dgn menyentuh pd skrin pratonton." - "Petikan video dilumpuhkan apabila kesan khas dihidupkan." - "Padamkan kesan" - "MUKA BODOH" - "LATAR BELAKANG" - "Butang pengatup" - "Foto paling terbaru" - "Suis kamera depan dan belakang" - "Pemilih kamera, video atau panorama" - "Lagi kawalan tetapan" - "Tutup kawalan tetapan" - "Kawalan zum" - "Pengurangan %1$s" - "Tingkatkan %1$s" - "Suis %1$s" - -- cgit v1.1 From fc32d24077181817888523169212809de6b6a51e Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 17 Apr 2014 18:34:46 -0700 Subject: Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs. Change-Id: I2595238a8295150a211f172d0cbef1ed6b217ea1 --- Android.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/Android.mk b/Android.mk index ec46e82..69f5fc5 100644 --- a/Android.mk +++ b/Android.mk @@ -10,8 +10,6 @@ LOCAL_PACKAGE_NAME := LegacyCamera LOCAL_JNI_SHARED_LIBRARIES := libjni_legacymosaic -LOCAL_REQUIRED_MODULES := libjni_legacymosaic - LOCAL_PROGUARD_FLAG_FILES := proguard.flags include $(BUILD_PACKAGE) -- cgit v1.1 From a33737e7827c328dda599fa18647d1a4eaebf73d Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 17 Apr 2014 18:34:46 -0700 Subject: Use just LOCAL_JNI_SHARED_LIBRARIES to install JNI libs. Change-Id: I2595238a8295150a211f172d0cbef1ed6b217ea1 --- Android.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/Android.mk b/Android.mk index ec46e82..69f5fc5 100644 --- a/Android.mk +++ b/Android.mk @@ -10,8 +10,6 @@ LOCAL_PACKAGE_NAME := LegacyCamera LOCAL_JNI_SHARED_LIBRARIES := libjni_legacymosaic -LOCAL_REQUIRED_MODULES := libjni_legacymosaic - LOCAL_PROGUARD_FLAG_FILES := proguard.flags include $(BUILD_PACKAGE) -- cgit v1.1 From 4592cbc689f68bc55274a8da1c708419bca9eecd Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Thu, 17 Jul 2014 15:43:13 -0700 Subject: Remove deprecated locales Change-Id: If35bd5efef047bcf7316c445559dfe16886ddbe6 --- res/values-rm/strings.xml | 199 ---------------------------------------------- 1 file changed, 199 deletions(-) delete mode 100644 res/values-rm/strings.xml diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml deleted file mode 100644 index 0ac244b..0000000 --- a/res/values-rm/strings.xml +++ /dev/null @@ -1,199 +0,0 @@ - - - - - "Errur da la camera" - - - - - "Camera" - "Camera da video" - "Fotos da la camera" - "Videos da la camera" - "Spetgar..." - - - - - - - "Vossa carta SD è plaina." - - - "Preparar la carta SD..." - - - - - "Restaurar ils parameters predefinids" - - - - - "INTERRUMPER" - - - "AUTRA FOTO" - "Catalog" - "Midar la camera" - - - "Tscherner la camera" - "Enavos" - "Frunt" - "Memorisar la posiziun" - "Deactivà" - "Activà" - "Qualitad dal video" - - - "Parameters da la camera" - "Parameters da la camera da video" - "Grondezza dal maletg" - - - - - - - - - - - - - "QVGA" - "Modus da focussar" - "Automatic" - "Infinit" - "Macro" - "Modus da chametg (flash)" - "Automatic" - "Activà" - "Deactivà" - "Equiliber da l\'alv" - "Automatic" - "Pair electric" - "Glisch dal di" - "Glisch da neon" - "Nivlus" - "Modus da scena" - "Automatic" - "Acziun" - "Notg" - "Rendida dal sulegl" - - - - - "Parameters da la camera" - - - "Exposiziun" - - - - - - - "Cuntanschì la grondezza maximala." - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.1 From 090283cfff2a09f1ea960fd2ef87564099027ab0 Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Sat, 19 Jul 2014 13:05:22 -0700 Subject: Remove deprecated locales - DO NOT MERGE Change-Id: I451ab9f4007679305f67f9ae657f49464caf64e0 --- res/values-rm/strings.xml | 199 ---------------------------------------------- 1 file changed, 199 deletions(-) delete mode 100644 res/values-rm/strings.xml diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml deleted file mode 100644 index 0ac244b..0000000 --- a/res/values-rm/strings.xml +++ /dev/null @@ -1,199 +0,0 @@ - - - - - "Errur da la camera" - - - - - "Camera" - "Camera da video" - "Fotos da la camera" - "Videos da la camera" - "Spetgar..." - - - - - - - "Vossa carta SD è plaina." - - - "Preparar la carta SD..." - - - - - "Restaurar ils parameters predefinids" - - - - - "INTERRUMPER" - - - "AUTRA FOTO" - "Catalog" - "Midar la camera" - - - "Tscherner la camera" - "Enavos" - "Frunt" - "Memorisar la posiziun" - "Deactivà" - "Activà" - "Qualitad dal video" - - - "Parameters da la camera" - "Parameters da la camera da video" - "Grondezza dal maletg" - - - - - - - - - - - - - "QVGA" - "Modus da focussar" - "Automatic" - "Infinit" - "Macro" - "Modus da chametg (flash)" - "Automatic" - "Activà" - "Deactivà" - "Equiliber da l\'alv" - "Automatic" - "Pair electric" - "Glisch dal di" - "Glisch da neon" - "Nivlus" - "Modus da scena" - "Automatic" - "Acziun" - "Notg" - "Rendida dal sulegl" - - - - - "Parameters da la camera" - - - "Exposiziun" - - - - - - - "Cuntanschì la grondezza maximala." - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.1 From 8a07787bd9ac0bd05016be86d1ea291226d17b76 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 20 Nov 2014 11:25:12 -0800 Subject: Use and older standard version. Bug: 18466763 Change-Id: I87f8e4c0e797caaaf7d7731ca0b2932e4aee5df6 --- jni/Android.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/jni/Android.mk b/jni/Android.mk index 882e3a7..8b81627 100755 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -10,6 +10,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/feature_mos/src/mosaic LOCAL_CFLAGS := -O3 -DNDEBUG +LOCAL_CPPFLAGS := -std=gnu++98 LOCAL_SRC_FILES := \ feature_mos_jni.cpp \ -- cgit v1.1 From 2a799a3a3149c59e554169da1e6e4c529621507b Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 26 Jan 2015 13:33:31 -0800 Subject: Add missing include. Change-Id: I985a631fcca9553e046ae63e03f1aba6f2ff812e --- jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp b/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp index 88aac36..fa56402 100755 --- a/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp +++ b/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp @@ -16,6 +16,8 @@ #include "SurfaceTextureRenderer.h" +#include + #include const GLfloat g_vVertices[] = { -1.f, -1.f, 0.0f, 1.0f, // Position 0 -- cgit v1.1