Merge "Import translations. DO NOT MERGE" into klp-ub-dev

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d1642f3..7b372a8 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -93,6 +93,18 @@
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.APP_GALLERY" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.GET_CONTENT" />
+                <category android:name="android.intent.category.OPENABLE" />
+                <data android:mimeType="vnd.android.cursor.dir/image" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.GET_CONTENT" />
+                <category android:name="android.intent.category.OPENABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+                <data android:mimeType="video/*" />
+            </intent-filter>
             <!-- We do NOT support the PICK intent, we add these intent-filter for
                  backward compatibility. Handle it as GET_CONTENT. -->
             <intent-filter>
@@ -160,22 +172,6 @@
             </intent-filter>
         </activity>
 
-        <!-- This activity alias is added so that GET_CONTENT intent-filter
-             can be disabled for KLP+ builds. -->
-        <activity-alias android:name="com.android.gallery3d.app.GalleryPicker"
-                android:targetActivity="com.android.gallery3d.app.Gallery"
-                android:configChanges="keyboardHidden|orientation|screenSize"
-                android:label="@string/app_name"
-                android:enabled="@bool/atMostJellyBeanMR2">
-            <intent-filter>
-                <action android:name="android.intent.action.GET_CONTENT" />
-                <category android:name="android.intent.category.OPENABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="image/*" />
-                <data android:mimeType="video/*" />
-            </intent-filter>
-        </activity-alias>
-
         <!-- we add this activity-alias for shortcut backward compatibility -->
         <!-- Note: The alias must put after the target activity -->
         <activity-alias android:name="com.cooliris.media.Gallery"
@@ -196,6 +192,7 @@
             android:taskAffinity="com.android.camera.CameraActivity"
             android:theme="@style/android:Theme.NoDisplay" />
         <activity-alias android:name="com.android.camera.CameraLauncher"
+            android:enabled="true"
             android:label="@string/camera_label"
             android:targetActivity="com.android.camera.CameraActivity">
             <intent-filter>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 8461376..b372dd6 100644 (file)
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -55,7 +55,7 @@
     <item quantity="other" msgid="5874316486520635333">"የተመረጡት ንጥሎች ይሰረዙ?"</item>
   </plurals>
     <string name="confirm" msgid="8646870096527848520">"አረጋግጥ"</string>
-    <string name="cancel" msgid="3637516880917356226">"á\8b­á\89\85á\88­"</string>
+    <string name="cancel" msgid="3637516880917356226">"á\88°á\88­á\8b\9d"</string>
     <string name="share" msgid="3619042788254195341">"አጋራ"</string>
     <string name="share_panorama" msgid="2569029972820978718">"ፓኖራማ አጋራ"</string>
     <string name="share_as_photo" msgid="8959225188897026149">"እንደ ፎቶ አጋራ"</string>
@@ -227,7 +227,7 @@
     <string name="preparing_sd" product="default" msgid="2914969119574812666">"የ SD  ካርድ በማዘጋጀት ላይ..."</string>
     <string name="access_sd_fail" product="nosdcard" msgid="8147993984037859354">"USB ማከማችን መድረስ አልተቻለም፡፡"</string>
     <string name="access_sd_fail" product="default" msgid="1584968646870054352">"SD ካርድን መድረስ አልተቻለም፡፡"</string>
-    <string name="review_cancel" msgid="8188009385853399254">"á\8b­á\89\85á\88­"</string>
+    <string name="review_cancel" msgid="8188009385853399254">"á\88°á\88­á\8b\9d"</string>
     <string name="review_ok" msgid="1156261588693116433">"ተከናውኗል"</string>
     <string name="time_lapse_title" msgid="4360632427760662691">"በመቅዳት የሚፈጀውን ጊዜ"</string>
     <string name="pref_camera_id_title" msgid="4040791582294635851">"ካሜራ ምረጥ"</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 38cf766..f62f492 100644 (file)
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -365,7 +365,7 @@
     <string name="accessibility_switch_to_new_panorama" msgid="8116783308051524188">"Cambiar a nueva panorámica"</string>
     <string name="accessibility_switch_to_refocus" msgid="4539294619557299903">"Cambiar a reenfoque"</string>
     <string name="accessibility_review_cancel" msgid="9070531914908644686">"Cancelar"</string>
-    <string name="accessibility_review_ok" msgid="7793302834271343168">"Listo"</string>
+    <string name="accessibility_review_ok" msgid="7793302834271343168">"Revisión terminada"</string>
     <string name="accessibility_review_retake" msgid="659300290054705484">"Revisar repetición"</string>
     <string name="accessibility_play_video" msgid="7596298365794810207">"Ver un vídeo"</string>
     <string name="accessibility_pause_video" msgid="6526344477133046653">"Pausar vídeo"</string>

diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 8b67802..057fa98 100644 (file)
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -151,7 +151,7 @@
     <string name="ffx_bleach" msgid="8946700451603478453">"Pleekimine"</string>
     <string name="ffx_blue_crush" msgid="6034283412305561226">"Sinine"</string>
     <string name="ffx_bw_contrast" msgid="517988490066217206">"Mustvalge"</string>
-    <string name="ffx_punch" msgid="1343475517872562639">"Punch"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Punš"</string>
     <string name="ffx_x_process" msgid="4779398678661811765">"X-töötlus"</string>
     <string name="ffx_washout" msgid="4594160692176642735">"Latte"</string>
     <string name="ffx_washout_color" msgid="8034075742195795219">"Litorgaafia"</string>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index be04e1b..acf5964 100644 (file)
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -351,7 +351,7 @@
     <string name="accessibility_shutter_button" msgid="2664037763232556307">"शटर बटन"</string>
     <string name="accessibility_menu_button" msgid="7140794046259897328">"मेनू बटन"</string>
     <string name="accessibility_review_thumbnail" msgid="8961275263537513017">"हाल ही का फ़ोटो"</string>
-    <string name="accessibility_camera_picker" msgid="8807945470215734566">"à¤\85à¤\97ला à¤\94र पिà¤\9bला à¤\95à¥\88मरा स्‍विच"</string>
+    <string name="accessibility_camera_picker" msgid="8807945470215734566">"सामनà¥\87 à¤\94र पà¥\80à¤\9bà¥\87 à¤\95à¥\87 à¤\95à¥\88मरा à¤\95ा स्‍विच"</string>
     <string name="accessibility_mode_picker" msgid="3278002189966833100">"कैमरा, वीडियो या पैनोरामा चयनकर्ता"</string>
     <string name="accessibility_second_level_indicators" msgid="3855951632917627620">"अधिक सेटिंग नियंत्रण"</string>
     <string name="accessibility_back_to_first_level" msgid="5234411571109877131">"सेटिंग नियंत्रण बंद करें"</string>
@@ -424,7 +424,7 @@
     <string name="count_down_title_text" msgid="4976386810910453266">"फ़ोटो लेने के लिए उल्टी गिनती कर रहा है"</string>
     <string name="remember_location_title" msgid="9060472929006917810">"फ़ोटो के स्थान याद रखना हैं?"</string>
     <string name="remember_location_prompt" msgid="724592331305808098">"अपने फ़ोटो और वीडियो को उन स्थानों के साथ टैग करें जहां वे लिए गए हैं.\n\nअन्य एप्स आपके सहेजे गए चित्रों सहित इस जानकारी का उपयोग कर सकते हैं."</string>
-    <string name="remember_location_no" msgid="7541394381714894896">"नहà¥\80à¤\82, धनà¥\8dâ\80\8dयवाद"</string>
+    <string name="remember_location_no" msgid="7541394381714894896">"नहà¥\80à¤\82, रहनà¥\87 दà¥\87à¤\82"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"हां"</string>
     <string name="menu_camera" msgid="3476709832879398998">"कैमरा"</string>
     <string name="menu_search" msgid="7580008232297437190">"खोज"</string>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index ab733b4..09d8478 100644 (file)
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -151,7 +151,7 @@
     <string name="ffx_bleach" msgid="8946700451603478453">"Bleach"</string>
     <string name="ffx_blue_crush" msgid="6034283412305561226">"Plavo"</string>
     <string name="ffx_bw_contrast" msgid="517988490066217206">"Crno-bijelo"</string>
-    <string name="ffx_punch" msgid="1343475517872562639">"Punch"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Žućkasto"</string>
     <string name="ffx_x_process" msgid="4779398678661811765">"X Process"</string>
     <string name="ffx_washout" msgid="4594160692176642735">"Bijela kava"</string>
     <string name="ffx_washout_color" msgid="8034075742195795219">"Litografija"</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 97abfaa..5e04317 100644 (file)
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -243,8 +243,8 @@
     <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
     <skip />
     <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Bip conto alla rov."</string>
-    <string name="setting_off" msgid="4480039384202951946">"Disattivata"</string>
-    <string name="setting_on" msgid="8602246224465348901">"Attiva"</string>
+    <string name="setting_off" msgid="4480039384202951946">"OFF"</string>
+    <string name="setting_on" msgid="8602246224465348901">"ON"</string>
     <string name="pref_video_quality_title" msgid="8245379279801096922">"Qualità video"</string>
     <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Alta"</string>
     <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Bassa"</string>
@@ -273,8 +273,8 @@
     <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Modalità flash"</string>
     <string name="pref_camera_flashmode_label" msgid="7546741624882856171">"MODALITÀ FLASH"</string>
     <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automatica"</string>
-    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Attiva"</string>
-    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Non attiva"</string>
+    <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"ON"</string>
+    <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"OFF"</string>
     <string name="pref_camera_flashmode_label_auto" msgid="8854671890619026197">"FLASH AUTO"</string>
     <string name="pref_camera_flashmode_label_on" msgid="7347504762794840140">"FLASH ATTIVO"</string>
     <string name="pref_camera_flashmode_label_off" msgid="3541596735596053416">"FLASH DISATTIVATO"</string>
@@ -373,7 +373,7 @@
     <string name="accessibility_time_bar" msgid="1414029843602604531">"Barra temporale del video player"</string>
     <string name="capital_on" msgid="5491353494964003567">"ON"</string>
     <string name="capital_off" msgid="7231052688467970897">"OFF"</string>
-    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Non attivo"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"OFF"</string>
     <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"0,5 secondi"</string>
     <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"1 secondo"</string>
     <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"1,5 secondi"</string>

diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index a640de8..618cc29 100644 (file)
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -233,7 +233,7 @@
     <string name="pref_camera_id_title" msgid="4040791582294635851">"ເລືອກກ້ອງ"</string>
     <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"ກັບ"</string>
     <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"ໜ້າ"</string>
-    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"ສະàº\96າàº\99àº\97ີà»\88àº\88ັàº\94à»\80àº\81ັàº\9a"</string>
+    <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"àº\9aັàº\99àº\97ຶàº\81ສະàº\96າàº\99àº\97ີà»\88"</string>
     <string name="pref_camera_location_label" msgid="2254270920298609161">"ສະຖານທີ່"</string>
     <string name="pref_camera_timer_title" msgid="3105232208281893389">"ໂຕນັບເວລາຖອຍຫຼັງ"</string>
   <plurals name="pref_camera_timer_entry">
@@ -286,7 +286,7 @@
     <string name="pref_camera_whitebalance_entry_fluorescent" msgid="2435332872847454032">"ໄຟຟລູອໍເຣສເຊນ"</string>
     <string name="pref_camera_whitebalance_entry_cloudy" msgid="3531996716997959326">"ຟ້າຄຶ້ມ"</string>
     <string name="pref_camera_whitebalance_label_auto" msgid="1479694362310491429">"ອັດຕະໂນມັດ"</string>
-    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"à»\81ສàº\87àº\81à»\89າ"</string>
+    <string name="pref_camera_whitebalance_label_incandescent" msgid="7427628260209908900">"ຫຼອàº\94à»\84àº\9fສົà»\89ມ"</string>
     <string name="pref_camera_whitebalance_label_daylight" msgid="1859710806141461399">"ກາງເວັນ"</string>
     <string name="pref_camera_whitebalance_label_fluorescent" msgid="5173251749161337707">"ໄຟຟລູອໍເຣສເຊນ"</string>
     <string name="pref_camera_whitebalance_label_cloudy" msgid="8230173517179285320">"ຟ້າບົດ"</string>

diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 32443c1..b9aeaf4 100644 (file)
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -242,13 +242,13 @@
   </plurals>
     <!-- no translation found for pref_camera_timer_sound_default (7066624532144402253) -->
     <skip />
-    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Bip semasa kira detik"</string>
+    <string name="pref_camera_timer_sound_title" msgid="2469008631966169105">"Bip kira detik"</string>
     <string name="setting_off" msgid="4480039384202951946">"Matikan"</string>
     <string name="setting_on" msgid="8602246224465348901">"Hidupkan"</string>
     <string name="pref_video_quality_title" msgid="8245379279801096922">"Kualiti video"</string>
     <string name="pref_video_quality_entry_high" msgid="8664038216234805914">"Tinggi"</string>
     <string name="pref_video_quality_entry_low" msgid="7258507152393173784">"Rendah"</string>
-    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Selang masa"</string>
+    <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"Sela masa"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Tetapan kamera"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Tetapan kamkorder"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Saiz gambar"</string>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 35776d7..58890a5 100644 (file)
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -253,7 +253,7 @@
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Nastavenie videokamery"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Veľkosť fotografie"</string>
     <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 Mpx"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapixelov"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 Mpx"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapixlov"</string>
     <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 MP"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapixle"</string>
@@ -422,8 +422,8 @@
     <string name="set_timer_help" msgid="5007708849404589472">"Časovač odpočítavania je vypnutý. Ak chcete odpočítavať pred aktivovaním spúšte fotoaparátu, zapnite ho."</string>
     <string name="set_duration" msgid="5578035312407161304">"Nastavte dobu trvania v sekundách"</string>
     <string name="count_down_title_text" msgid="4976386810910453266">"Odpočítavanie spúšte fotoaparátu"</string>
-    <string name="remember_location_title" msgid="9060472929006917810">"Zapamätať si, kde boli fotografie vytvorené?"</string>
-    <string name="remember_location_prompt" msgid="724592331305808098">"Označte pre fotografie a videá polohy, kde boli zaznamenané.\n\nOstatné aplikácie môžu pristupovať k týmto informáciám aj k vašim uloženým snímkam."</string>
+    <string name="remember_location_title" msgid="9060472929006917810">"Zapamätať si, kde boli fotky vytvorené?"</string>
+    <string name="remember_location_prompt" msgid="724592331305808098">"Pridajte k fotkám a videám polohy, kde boli zaznamenané.\n\nOstatné aplikácie môžu pristupovať k týmto informáciám spolu s prístupom k vašim uloženým snímkam."</string>
     <string name="remember_location_no" msgid="7541394381714894896">"Nie, ďakujem"</string>
     <string name="remember_location_yes" msgid="862884269285964180">"Áno"</string>
     <string name="menu_camera" msgid="3476709832879398998">"Fotoaparát"</string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e1b8d17..54d2b83 100644 (file)
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -151,7 +151,7 @@
     <string name="ffx_bleach" msgid="8946700451603478453">"Bleach"</string>
     <string name="ffx_blue_crush" msgid="6034283412305561226">"Плаво"</string>
     <string name="ffx_bw_contrast" msgid="517988490066217206">"Црно-бело"</string>
-    <string name="ffx_punch" msgid="1343475517872562639">"Punch"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Пунч"</string>
     <string name="ffx_x_process" msgid="4779398678661811765">"X Process"</string>
     <string name="ffx_washout" msgid="4594160692176642735">"Испрано"</string>
     <string name="ffx_washout_color" msgid="8034075742195795219">"Литографски"</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index f0656a3..c14f90d 100644 (file)
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -378,7 +378,7 @@
     <string name="accessibility_time_bar" msgid="1414029843602604531">"Ubao wa muda wa kicheza video"</string>
     <string name="capital_on" msgid="5491353494964003567">"IMEWASHWA"</string>
     <string name="capital_off" msgid="7231052688467970897">"IMEZIMWA"</string>
-    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Imezimwa"</string>
+    <string name="pref_video_time_lapse_frame_interval_off" msgid="3490489191038309496">"Kimezimwa"</string>
     <string name="pref_video_time_lapse_frame_interval_500" msgid="2949719376111679816">"Sekunde 0.5"</string>
     <string name="pref_video_time_lapse_frame_interval_1000" msgid="1672458758823855874">"Sekunde 1"</string>
     <string name="pref_video_time_lapse_frame_interval_1500" msgid="3415071702490624802">"Sekunde 1.5"</string>

diff --git a/res/values-v19/bool.xml b/res/values-v19/bool.xml
deleted file mode 100644 (file)
index 143b894..0000000
--- a/res/values-v19/bool.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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.
--->
-<resources>
-    <bool name="atMostJellyBeanMR2">false</bool>
-</resources>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index fe8addc..f199482 100644 (file)
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -151,7 +151,7 @@
     <string name="ffx_bleach" msgid="8946700451603478453">"Làm phai màu"</string>
     <string name="ffx_blue_crush" msgid="6034283412305561226">"Màu xanh dương"</string>
     <string name="ffx_bw_contrast" msgid="517988490066217206">"Đen/trắng"</string>
-    <string name="ffx_punch" msgid="1343475517872562639">"Punch"</string>
+    <string name="ffx_punch" msgid="1343475517872562639">"Hơi vàng"</string>
     <string name="ffx_x_process" msgid="4779398678661811765">"Quá trình X"</string>
     <string name="ffx_washout" msgid="4594160692176642735">"Latte"</string>
     <string name="ffx_washout_color" msgid="8034075742195795219">"Litho"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3e8ac7c..725c767 100644 (file)
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -251,7 +251,7 @@
     <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"延时"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"相机设置"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"摄像机设置"</string>
-    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"ç\85§ç\89\87大å°\8f"</string>
+    <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"ç\85§ç\89\87尺寸"</string>
     <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"1300万像素"</string>
     <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"800 万像素"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"500 万像素"</string>

diff --git a/res/values/bool.xml b/res/values/bool.xml
index 4e54d7c..464842a 100644 (file)
--- a/res/values/bool.xml
+++ b/res/values/bool.xml
@@ -15,5 +15,4 @@
 -->
 <resources>
     <bool name="show_action_bar_title">false</bool>
-    <bool name="atMostJellyBeanMR2">true</bool>
-</resources>
+</resources>
\ No newline at end of file

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 533bbe8..4ed6309 100644 (file)
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -26,7 +26,7 @@ public class CameraActivity extends Activity {
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        Intent intent = IntentHelper.CAMERA_LAUNCHER_INTENT;
+        Intent intent = IntentHelper.getCameraIntent(CameraActivity.this);
         // Since this is being launched from a homescreen shorcut,
         // it's already in a new task. Start Camera activity and
         // reset the task to its initial state if needed.

diff --git a/src/com/android/gallery3d/app/Gallery.java b/src/com/android/gallery3d/app/Gallery.java
index 0c1ef79..a1b6d01 100644 (file)
--- a/src/com/android/gallery3d/app/Gallery.java
+++ b/src/com/android/gallery3d/app/Gallery.java
@@ -26,7 +26,7 @@ public class Gallery extends Activity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Intent intent = IntentHelper.GALLERY_LAUNCHER_INTENT;
+        Intent intent = IntentHelper.getGalleryIntent(Gallery.this);
         // Since this is being launched from a homescreen shortcut,
         // it's already in a new task. Start Gallery activity and
         // reset the task to its initial state if needed.

diff --git a/src_pd/com/android/gallery3d/util/IntentHelper.java b/src_pd/com/android/gallery3d/util/IntentHelper.java
index 843a39f..13f69eb 100644 (file)
--- a/src_pd/com/android/gallery3d/util/IntentHelper.java
+++ b/src_pd/com/android/gallery3d/util/IntentHelper.java
@@ -15,13 +15,18 @@
  */
 package com.android.gallery3d.util;
 
+import android.content.Context;
 import android.content.Intent;
 
 public class IntentHelper {
 
-    public static final Intent CAMERA_LAUNCHER_INTENT = new Intent(Intent.ACTION_MAIN)
-        .setClassName("com.android.camera2", "com.android.camera.CameraActivity");
+    public static Intent getCameraIntent(Context context) {
+        return new Intent(Intent.ACTION_MAIN)
+            .setClassName("com.android.camera2", "com.android.camera.CameraActivity");
+    }
 
-    public static final Intent GALLERY_LAUNCHER_INTENT = new Intent(Intent.ACTION_MAIN)
-        .setClassName("com.android.gallery3d", "com.android.gallery3d.app.GalleryActivity");
+    public static Intent getGalleryIntent(Context context) {
+        return new Intent(Intent.ACTION_MAIN)
+            .setClassName("com.android.gallery3d", "com.android.gallery3d.app.GalleryActivity");
+    }
 }