am 260df841: Merge "Remove unused code"
* commit '260df8419739f92d4c64abfedec448a7f447b3a1': Remove unused codemain
commit
697f6abb5d
|
@ -166,7 +166,6 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
|
||||||
private File mUserRecordingFile = null;
|
private File mUserRecordingFile = null;
|
||||||
|
|
||||||
private boolean mIsPasswordView = false;
|
private boolean mIsPasswordView = false;
|
||||||
private boolean mIsLoggingSuspended = false;
|
|
||||||
private SharedPreferences mPrefs;
|
private SharedPreferences mPrefs;
|
||||||
|
|
||||||
// digits entered by the user are replaced with this codepoint.
|
// 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");
|
Log.d(TAG, "start called");
|
||||||
}
|
}
|
||||||
maybeShowSplashScreen();
|
maybeShowSplashScreen();
|
||||||
updateSuspendedState();
|
|
||||||
requestIndicatorRedraw();
|
requestIndicatorRedraw();
|
||||||
mStatistics.reset();
|
mStatistics.reset();
|
||||||
checkForEmptyEditor();
|
checkForEmptyEditor();
|
||||||
|
@ -452,14 +450,6 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
|
||||||
start();
|
start();
|
||||||
}
|
}
|
||||||
|
|
||||||
private long mResumeTime = 0L;
|
|
||||||
private void updateSuspendedState() {
|
|
||||||
final long time = System.currentTimeMillis();
|
|
||||||
if (time > mResumeTime) {
|
|
||||||
mIsLoggingSuspended = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onSharedPreferenceChanged(final SharedPreferences prefs, final String key) {
|
public void onSharedPreferenceChanged(final SharedPreferences prefs, final String key) {
|
||||||
if (key == null || prefs == null) {
|
if (key == null || prefs == null) {
|
||||||
|
@ -745,7 +735,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isAllowedToLog() {
|
private boolean isAllowedToLog() {
|
||||||
return !mIsPasswordView && !mIsLoggingSuspended && sIsLogging && !mInFeedbackDialog;
|
return !mIsPasswordView && sIsLogging && !mInFeedbackDialog;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void requestIndicatorRedraw() {
|
public void requestIndicatorRedraw() {
|
||||||
|
|
Loading…
Reference in New Issue