am 697f6abb: am 260df841: Merge "Remove unused code"

* commit '697f6abb5d6478e0e0493ee7f821522fa4411f18':
  Remove unused code
main
Kurt Partridge 2013-05-15 12:52:59 -07:00 committed by Android Git Automerger
commit 1e0f8cffaf
1 changed files with 1 additions and 11 deletions

View File

@ -166,7 +166,6 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
private File mUserRecordingFile = null;
private boolean mIsPasswordView = false;
private boolean mIsLoggingSuspended = false;
private SharedPreferences mPrefs;
// digits entered by the user are replaced with this codepoint.
@ -411,7 +410,6 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
Log.d(TAG, "start called");
}
maybeShowSplashScreen();
updateSuspendedState();
requestIndicatorRedraw();
mStatistics.reset();
checkForEmptyEditor();
@ -452,14 +450,6 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
start();
}
private long mResumeTime = 0L;
private void updateSuspendedState() {
final long time = System.currentTimeMillis();
if (time > mResumeTime) {
mIsLoggingSuspended = false;
}
}
@Override
public void onSharedPreferenceChanged(final SharedPreferences prefs, final String key) {
if (key == null || prefs == null) {
@ -745,7 +735,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
}
private boolean isAllowedToLog() {
return !mIsPasswordView && !mIsLoggingSuspended && sIsLogging && !mInFeedbackDialog;
return !mIsPasswordView && sIsLogging && !mInFeedbackDialog;
}
public void requestIndicatorRedraw() {