diff options
-rw-r--r-- | res/values-et/strings.xml | 1 | ||||
-rw-r--r-- | res/values-ms/strings.xml | 1 | ||||
-rw-r--r-- | res/values/arrays.xml | 4 | ||||
-rw-r--r-- | res/values/qcomstrings.xml | 8 | ||||
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 25 | ||||
-rw-r--r-- | src/com/android/camera/CameraSettings.java | 2 |
6 files changed, 0 insertions, 41 deletions
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index 7873ccde3..e3fcf3b29 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -40,7 +40,6 @@ <string name="save_error" msgid="6857408774183654970">"Kärbitud kujutist ei saanud salvestada."</string> <string name="crop_label" msgid="521114301871349328">"Kärbi pilti"</string> <string name="trim_label" msgid="274203231381209979">"Kärbi videot"</string> - <string name="select_image" msgid="7841406150484742140">"Valige foto"</string> <string name="select_video" msgid="4859510992798615076">"Vali video"</string> <string name="select_item" msgid="2816923896202086390">"Valige üksus"</string> <string name="select_album" msgid="1557063764849434077">"Albumi valimine"</string> diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index b1ed9b39f..cb514d854 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -40,7 +40,6 @@ <string name="save_error" msgid="6857408774183654970">"Tidak dapat menyimpan imej yang dipangkas."</string> <string name="crop_label" msgid="521114301871349328">"Pangkas gambar"</string> <string name="trim_label" msgid="274203231381209979">"Potong video"</string> - <string name="select_image" msgid="7841406150484742140">"Pilih foto"</string> <string name="select_video" msgid="4859510992798615076">"Pilih video"</string> <string name="select_item" msgid="2816923896202086390">"Pilih item"</string> <string name="select_album" msgid="1557063764849434077">"Pilih album"</string> diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 4be73392a..20ae7c3a1 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -23,11 +23,7 @@ <item>@string/pref_video_quality_entry_1080p</item> <item>@string/pref_video_quality_entry_720p</item> <item>@string/pref_video_quality_entry_480p</item> - <item>@string/pref_video_quality_entry_fwvga</item> - <item>@string/pref_video_quality_entry_wvga</item> <item>@string/pref_video_quality_entry_vga</item> - <item>@string/pref_video_quality_entry_hvga</item> - <item>@string/pref_video_quality_entry_wqvga</item> <item>@string/pref_video_quality_entry_cif</item> <item>@string/pref_video_quality_entry_qvga</item> <item>@string/pref_video_quality_entry_qcif</item> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index c2af56e64..8d50008ff 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -22,16 +22,8 @@ <resources> <!-- Preferences --> - <!-- Video quality setting entry. Videos will be recorded in FWVGA quality. [CHAR LIMIT=24] --> - <string name="pref_video_quality_entry_fwvga" translatable="false">FWVGA</string> - <!-- Video quality setting entry. Videos will be recorded in WVGA quality. [CHAR LIMIT=24] --> - <string name="pref_video_quality_entry_wvga" translatable="false">WVGA</string> <!-- Video quality setting entry. Videos will be recorded in VGA quality. [CHAR LIMIT=24] --> <string name="pref_video_quality_entry_vga" translatable="false">VGA</string> - <!-- Video quality setting entry. Videos will be recorded in HVGA quality. [CHAR LIMIT=24] --> - <string name="pref_video_quality_entry_hvga" translatable="false">HVGA</string> - <!-- Video quality setting entry. Videos will be recorded in WQVGA quality. [CHAR LIMIT=24] --> - <string name="pref_video_quality_entry_wqvga" translatable="false">WQVGA</string> <!-- Video quality setting entry. Videos will be recorded in CIF quality. [CHAR LIMIT=24] --> <string name="pref_video_quality_entry_cif" translatable="false">CIF</string> <!-- Video quality setting entry. Videos will be recorded in QVGA quality. [CHAR LIMIT=24] --> diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 65d0eaf03..79030c1b3 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -119,8 +119,6 @@ import java.io.IOException; import static com.android.camera.CameraManager.CameraOpenErrorCallback; import com.android.camera.SDCard; -import android.media.AudioManager; - public class CameraActivity extends Activity implements ModuleSwitcher.ModuleSwitchListener, ActionBar.OnMenuVisibilityListener, @@ -247,9 +245,6 @@ public class CameraActivity extends Activity // Keep track of data request here to avoid creating useless UpdateThumbnailTask. private boolean mDataRequested; - private AudioManager mAudioManager; - private int mShutterVol; - private int mOriginalMasterVol; private WakeLock mWakeLock; private Context mContext; @@ -1413,14 +1408,6 @@ public class CameraActivity extends Activity mContext = getApplicationContext(); SDCard.initialize(mContext); -/* - mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); - mOriginalMasterVol = mAudioManager.getMasterVolume(); - mShutterVol = SystemProperties.getInt("persist.camera.snapshot.volume", -1); - if (mShutterVol >= 0 && mShutterVol <= 100 ) - mAudioManager.setMasterVolume(mShutterVol,0); -*/ - getWindow().requestFeature(Window.FEATURE_ACTION_BAR); LayoutInflater inflater = getLayoutInflater(); @@ -1607,10 +1594,6 @@ public class CameraActivity extends Activity @Override public void onPause() { -/* - if (mShutterVol >= 0 && mShutterVol <= 100) - mAudioManager.setMasterVolume(mOriginalMasterVol,0); -*/ // Delete photos that are pending deletion performDeletion(); mOrientationListener.disable(); @@ -1635,10 +1618,6 @@ public class CameraActivity extends Activity @Override public void onResume() { -/* - if (mShutterVol >= 0 && mShutterVol <= 100) - mAudioManager.setMasterVolume(mShutterVol,0); -*/ UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA, UsageStatistics.ACTION_FOREGROUNDED, this.getClass().getSimpleName()); @@ -1700,10 +1679,6 @@ public class CameraActivity extends Activity mWakeLock.release(); Log.d(TAG, "wake lock release"); } -/* - if (mShutterVol >= 0 && mShutterVol <= 100) - mAudioManager.setMasterVolume(mOriginalMasterVol,0); -*/ if (mSecureCamera) { unregisterReceiver(mScreenOffReceiver); } diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 2567e89c0..4d8a13aeb 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -1305,13 +1305,11 @@ public class CameraSettings { @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2) private static void getFineResolutionQuality(ArrayList<String> supported, int cameraId,Parameters parameters) { - if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_4KDCI)) { if (checkSupportedVideoQuality(parameters,4096,2160)) { supported.add(Integer.toString(CamcorderProfile.QUALITY_4KDCI)); } } - if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_2160P)) { if (checkSupportedVideoQuality(parameters,3840,2160)) { supported.add(Integer.toString(CamcorderProfile.QUALITY_2160P)); |