am 01c3f7ad: am e25f675a: Shorten location startup dialog string

* commit '01c3f7adc5ee35ecd6ad226ad91a03017c0ad4a0':
  Shorten location startup dialog string

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b8816a6..0498a26 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -46,7 +46,8 @@
         android:largeHeap="true"
         android:restoreAnyVersion="true"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Camera" >
+        android:theme="@style/Theme.Camera"
+        android:usesCleartextTraffic="false" >
         <activity
             android:name="com.android.camera.CameraActivity"
             android:clearTaskOnLaunch="true"

diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index d41c761..15d59ec 100644 (file)
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -68,6 +68,8 @@
     <string name="error_cannot_connect_camera" msgid="2713059773224193128">"Kamera qoşula bilmir."</string>
     <string name="error_camera_disabled" msgid="5582398275657419692">"Təhlükəsizlik siyasətinə görə kamera deaktiv edilib."</string>
     <string name="error_media_storage_failure" msgid="7711687330673245629">"Şəkil və ya videonuzu saxlamaqda problem baş verdi."</string>
+    <!-- no translation found for error_permissions (3454167403425651254) -->
+    <skip />
     <string name="reason_storage_failure" msgid="6818898304774654969">"Şəkil yaddaşı səhvi."</string>
     <string name="wait" msgid="765601745709933047">"Lütfən, gözləyin..."</string>
     <string name="no_storage" product="default" msgid="5922012950780548098">"Kamera istifadə etməzdən əvvəl SD kartı daxil edin."</string>

diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index c37d0e1..2e862ff 100644 (file)
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -68,6 +68,8 @@
     <string name="error_cannot_connect_camera" msgid="2713059773224193128">"કૅમેરા સાથે કનેક્ટ કરી શકાતું નથી."</string>
     <string name="error_camera_disabled" msgid="5582398275657419692">"સુરક્ષા નીતિઓને કારણે કૅમેરો અક્ષમ કરવામાં આવ્યો છે."</string>
     <string name="error_media_storage_failure" msgid="7711687330673245629">"તમારો ફોટો અથવા વિડિઓ સાચવવામાં સમસ્યા હતી."</string>
+    <!-- no translation found for error_permissions (3454167403425651254) -->
+    <skip />
     <string name="reason_storage_failure" msgid="6818898304774654969">"ફોટો સ્ટોરેજ નિષ્ફળતા."</string>
     <string name="wait" msgid="765601745709933047">"કૃપા કરીને રાહ જુઓ..."</string>
     <string name="no_storage" product="default" msgid="5922012950780548098">"કૅમેરાનો ઉપયોગ કરતાં પહેલાં એક SD કાર્ડ દાખલ કરો."</string>

diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 4851cbc..62b0efb 100644 (file)
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -68,6 +68,8 @@
     <string name="error_cannot_connect_camera" msgid="2713059773224193128">"ਕੈਮਰੇ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string>
     <string name="error_camera_disabled" msgid="5582398275657419692">"ਕੈਮਰਾ ਸੁਰੱਖਿਆ ਨੀਤੀਆਂ ਦੇ ਕਾਰਨ ਅਸਮਰੱਥ ਬਣਾਇਆ ਗਿਆ ਹੈ।"</string>
     <string name="error_media_storage_failure" msgid="7711687330673245629">"ਤੁਹਾਡੀ ਫੋਟੋ ਜਾਂ ਵੀਡੀਓ ਨੂੰ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਇੱਕ ਸਮੱਸਿਆ ਹੋਈ ਸੀ।"</string>
+    <!-- no translation found for error_permissions (3454167403425651254) -->
+    <skip />
     <string name="reason_storage_failure" msgid="6818898304774654969">"ਫੋਟੋ ਸਟੋਰੇਜ ਅਸਫਲਤਾ।"</string>
     <string name="wait" msgid="765601745709933047">"ਕਿਰਪਾ ਕਰਕੇ ਠਹਿਰੋ..."</string>
     <string name="no_storage" product="default" msgid="5922012950780548098">"ਕੈਮਰਾ ਵਰਤਣ ਤੋਂ ਪਹਿਲਾਂ ਇੱਕ SD ਕਾਰਡ ਪਾਓ।"</string>

diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 9213b48..ddb284f 100644 (file)
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -68,6 +68,8 @@
     <string name="error_cannot_connect_camera" msgid="2713059773224193128">"Nuk mund të lidhet me kamerën."</string>
     <string name="error_camera_disabled" msgid="5582398275657419692">"Kamera është çaktivizuar për shkak të politikave të sigurisë."</string>
     <string name="error_media_storage_failure" msgid="7711687330673245629">"Kishte një problem në ruajtjen e fotografisë ose videos."</string>
+    <!-- no translation found for error_permissions (3454167403425651254) -->
+    <skip />
     <string name="reason_storage_failure" msgid="6818898304774654969">"Ruajtja e fotografisë dështoi."</string>
     <string name="wait" msgid="765601745709933047">"Qëndro në pritje..."</string>
     <string name="no_storage" product="default" msgid="5922012950780548098">"Fut një kartë SD para se të përdorësh kamerën."</string>
@@ -158,7 +160,7 @@
     <string name="dialog_ok" msgid="774141340500181131">"Në rregull!"</string>
     <string name="dialog_cancel" msgid="692365061128351656">"Anulo"</string>
     <string name="dialog_report" msgid="7616428760369876209">"Raporto"</string>
-    <string name="dialog_dismiss" msgid="1382550604990470119">"Hiq dorë"</string>
+    <string name="dialog_dismiss" msgid="1382550604990470119">"Injoro"</string>
     <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"Hapësira e kartës tënde SD po mbaron. Ndrysho parametrin e cilësisë ose fshi disa imazhe apo skedarë të tjerë."</string>
     <string name="video_reach_size_limit" msgid="9196836111505731836">"Kufiri i madhësisë u arrit."</string>
     <string name="pano_too_fast_prompt" msgid="2503148095578052177">"Shumë e shpejtë"</string>
@@ -367,8 +369,8 @@
     <string name="setting_summary_aspect_ratio_and_megapixels" msgid="5828440902461064821">"(%1$d:%2$d) %3$s megapikëza"</string>
     <string name="cling_text_for_refocus_editor_button" msgid="4785017397116829802">"Për ta ri-fokusuar, prek këtu"</string>
     <string name="pref_category_advanced" msgid="5921085080077574872">"Të përparuara"</string>
-    <string name="pref_camera_exposure_compensation" msgid="4143245817259719147">"Ekspozim manual"</string>
-    <string name="settings_cling_text" msgid="5368054627268181292">"Te \"Cilësimet\", ndrysho rezolucionin dhe cilësinë ose provo funksionet e përparuara."</string>
+    <string name="pref_camera_exposure_compensation" msgid="4143245817259719147">"Ekspozimi manual"</string>
+    <string name="settings_cling_text" msgid="5368054627268181292">"Te Cilësimet, ndrysho rezolucionin dhe cilësinë ose provo funksionet e përparuara."</string>
     <string name="photo_size_selection_title" msgid="2789753590719172645">"Zgjidh madhësinë e fotografisë"</string>
     <string name="photo_aspect_ratio_selection_content" msgid="6668224437962196229">"Këtë mund ta ndryshosh më vonë te \"Cilësimet\""</string>
     <string name="share_to" msgid="5144911209144798122">"Shpërnda në"</string>

diff --git a/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java b/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
index 8d0b387..0cedb18 100644 (file)
--- a/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
+++ b/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
@@ -40,10 +40,8 @@ public class OneCameraFeatureConfigCreator {
      */
     public static OneCameraFeatureConfig createDefault(ContentResolver contentResolver,
             MemoryManager memoryManager) {
-        // Enable CaptureModule on all L devices unless the device is
-        // black-listed.
-        boolean useCaptureModule = ApiHelper.HAS_CAMERA_2_API
-                && !GservicesHelper.isCaptureModuleDisabled(contentResolver);
+        // Enable CaptureModule on all M devices.
+        boolean useCaptureModule = true;
         Log.i(TAG, "CaptureModule? " + useCaptureModule);
 
         // HDR+ has multiple levels of support.