From 6bfdb1bffac4d2e56c7c7a1522f3cc966daff072 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 9 Jan 2016 04:33:43 +0200 Subject: Snap: Remove dead code * Remove non-standard video resolutions. * Revert "camera: override shutter sound volume" commit 8a50cda8f72738e943904fdf7cae189b2b0a8ea8. Adapted from CodeAurora commit 000c6fa3b5c95297496e0ae077030132409871ea Change-Id: I167ab5ff399c4f1d306a1a7ddf94896565c9625a --- res/values-et/strings.xml | 1 - res/values-ms/strings.xml | 1 - res/values/arrays.xml | 4 ---- res/values/qcomstrings.xml | 8 -------- src/com/android/camera/CameraActivity.java | 25 ------------------------- src/com/android/camera/CameraSettings.java | 2 -- 6 files changed, 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 @@ "Kärbitud kujutist ei saanud salvestada." "Kärbi pilti" "Kärbi videot" - "Valige foto" "Vali video" "Valige üksus" "Albumi valimine" 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 @@ "Tidak dapat menyimpan imej yang dipangkas." "Pangkas gambar" "Potong video" - "Pilih foto" "Pilih video" "Pilih item" "Pilih album" 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 @@ @string/pref_video_quality_entry_1080p @string/pref_video_quality_entry_720p @string/pref_video_quality_entry_480p - @string/pref_video_quality_entry_fwvga - @string/pref_video_quality_entry_wvga @string/pref_video_quality_entry_vga - @string/pref_video_quality_entry_hvga - @string/pref_video_quality_entry_wqvga @string/pref_video_quality_entry_cif @string/pref_video_quality_entry_qvga @string/pref_video_quality_entry_qcif 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 @@ - - FWVGA - - WVGA VGA - - HVGA - - WQVGA CIF 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 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)); -- cgit v1.2.3