Revert "Landing https://webrtc-codereview.appspot.com/53669004/"

talk/examples/android/src/org/appspot/apprtc/SettingsActivity.java

 /*
  * libjingle
  * Copyright 2014 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 32 matching lines @@
   private String keyprefResolution;
   private String keyprefFps;
   private String keyprefStartVideoBitrateType;
   private String keyprefStartVideoBitrateValue;
   private String keyPrefVideoCodec;
   private String keyprefHwCodec;
 
   private String keyprefStartAudioBitrateType;
   private String keyprefStartAudioBitrateValue;
   private String keyPrefAudioCodec;
-  private String keyprefNoAudioProcessing;
 
   private String keyprefCpuUsageDetection;
   private String keyPrefRoomServerUrl;
   private String keyPrefDisplayHud;
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     keyprefVideoCall = getString(R.string.pref_videocall_key);
     keyprefResolution = getString(R.string.pref_resolution_key);
     keyprefFps = getString(R.string.pref_fps_key);
     keyprefStartVideoBitrateType = getString(R.string.pref_startvideobitrate_key);
     keyprefStartVideoBitrateValue = getString(R.string.pref_startvideobitratevalue_key);
     keyPrefVideoCodec = getString(R.string.pref_videocodec_key);
     keyprefHwCodec = getString(R.string.pref_hwcodec_key);
 
     keyprefStartAudioBitrateType = getString(R.string.pref_startaudiobitrate_key);
     keyprefStartAudioBitrateValue = getString(R.string.pref_startaudiobitratevalue_key);
     keyPrefAudioCodec = getString(R.string.pref_audiocodec_key);
-    keyprefNoAudioProcessing = getString(R.string.pref_noaudioprocessing_key);
 
     keyprefCpuUsageDetection = getString(R.string.pref_cpu_usage_detection_key);
     keyPrefRoomServerUrl = getString(R.string.pref_room_server_url_key);
     keyPrefDisplayHud = getString(R.string.pref_displayhud_key);
 
     // Display the fragment as the main content.
     settingsFragment = new SettingsFragment();
     getFragmentManager().beginTransaction()
         .replace(android.R.id.content, settingsFragment)
         .commit();
@@ skipping 12 matching lines @@
     updateSummary(sharedPreferences, keyprefStartVideoBitrateType);
     updateSummaryBitrate(sharedPreferences, keyprefStartVideoBitrateValue);
     setVideoBitrateEnable(sharedPreferences);
     updateSummary(sharedPreferences, keyPrefVideoCodec);
     updateSummaryB(sharedPreferences, keyprefHwCodec);
 
     updateSummary(sharedPreferences, keyprefStartAudioBitrateType);
     updateSummaryBitrate(sharedPreferences, keyprefStartAudioBitrateValue);
     setAudioBitrateEnable(sharedPreferences);
     updateSummary(sharedPreferences, keyPrefAudioCodec);
-    updateSummaryB(sharedPreferences, keyprefNoAudioProcessing);
 
     updateSummaryB(sharedPreferences, keyprefCpuUsageDetection);
     updateSummary(sharedPreferences, keyPrefRoomServerUrl);
     updateSummaryB(sharedPreferences, keyPrefDisplayHud);
   }
 
   @Override
   protected void onPause() {
     super.onPause();
     SharedPreferences sharedPreferences =
@@ skipping 10 matching lines @@
         || key.equals(keyPrefVideoCodec)
         || key.equals(keyprefStartAudioBitrateType)
         || key.equals(keyPrefAudioCodec)
         || key.equals(keyPrefRoomServerUrl)) {
       updateSummary(sharedPreferences, key);
     } else if (key.equals(keyprefStartVideoBitrateValue)
         || key.equals(keyprefStartAudioBitrateValue)) {
       updateSummaryBitrate(sharedPreferences, key);
     } else if (key.equals(keyprefVideoCall)
         || key.equals(keyprefHwCodec)
-        || key.equals(keyprefNoAudioProcessing)
         || key.equals(keyprefCpuUsageDetection)
         || key.equals(keyPrefDisplayHud)) {
       updateSummaryB(sharedPreferences, key);
     }
     if (key.equals(keyprefStartVideoBitrateType)) {
       setVideoBitrateEnable(sharedPreferences);
     }
     if (key.equals(keyprefStartAudioBitrateType)) {
       setAudioBitrateEnable(sharedPreferences);
     }
@@ skipping 37 matching lines @@
     String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_default);
     String bitrateType = sharedPreferences.getString(
         keyprefStartAudioBitrateType, bitrateTypeDefault);
     if (bitrateType.equals(bitrateTypeDefault)) {
       bitratePreferenceValue.setEnabled(false);
     } else {
       bitratePreferenceValue.setEnabled(true);
     }
   }
 }