[Rlog47] Replayer service, inspect-researchLog.py
multi-project commit with Ia2dd81afb4ea124094a20a39e31ffd193edff3d2 Change-Id: I80fe8f2ce137fedf48038955d5f3d9deed04f763main
parent
6b574f8056
commit
588d9b5c8d
|
@ -313,6 +313,10 @@
|
||||||
<!-- TODO: remove translatable=false attribute once text is stable -->
|
<!-- TODO: remove translatable=false attribute once text is stable -->
|
||||||
<string name="research_log_uploader_name" translatable="false">Research Uploader Service</string>
|
<string name="research_log_uploader_name" translatable="false">Research Uploader Service</string>
|
||||||
|
|
||||||
|
<!-- Name for the research replaying service to be displayed to users. [CHAR LIMIT=50] -->
|
||||||
|
<!-- TODO: remove translatable=false attribute once text is stable -->
|
||||||
|
<string name="research_log_replayer_name" translatable="false">Research Replayer Service</string>
|
||||||
|
|
||||||
<!-- Preference for input language selection -->
|
<!-- Preference for input language selection -->
|
||||||
<string name="select_language">Input languages</string>
|
<string name="select_language">Input languages</string>
|
||||||
|
|
||||||
|
|
|
@ -1,22 +1,23 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2012 The Android Open Source Project
|
* Copyright (C) 2012 The Android Open Source Project
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* use this file except in compliance with the License. You may obtain a copy of
|
* you may not use this file except in compliance with the License.
|
||||||
* the License at
|
* You may obtain a copy of the License at
|
||||||
*
|
*
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
*
|
*
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
* License for the specific language governing permissions and limitations under
|
* See the License for the specific language governing permissions and
|
||||||
* the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.android.inputmethod.research;
|
package com.android.inputmethod.research;
|
||||||
|
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
|
import android.os.Looper;
|
||||||
import android.os.Message;
|
import android.os.Message;
|
||||||
import android.os.SystemClock;
|
import android.os.SystemClock;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
@ -40,6 +41,14 @@ public class Replayer {
|
||||||
private boolean mIsReplaying = false;
|
private boolean mIsReplaying = false;
|
||||||
private KeyboardSwitcher mKeyboardSwitcher;
|
private KeyboardSwitcher mKeyboardSwitcher;
|
||||||
|
|
||||||
|
private Replayer() {
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final Replayer sInstance = new Replayer();
|
||||||
|
public static Replayer getInstance() {
|
||||||
|
return sInstance;
|
||||||
|
}
|
||||||
|
|
||||||
public void setKeyboardSwitcher(final KeyboardSwitcher keyboardSwitcher) {
|
public void setKeyboardSwitcher(final KeyboardSwitcher keyboardSwitcher) {
|
||||||
mKeyboardSwitcher = keyboardSwitcher;
|
mKeyboardSwitcher = keyboardSwitcher;
|
||||||
}
|
}
|
||||||
|
@ -49,7 +58,7 @@ public class Replayer {
|
||||||
private static final int COMPLETION_TIME_MS = 500;
|
private static final int COMPLETION_TIME_MS = 500;
|
||||||
|
|
||||||
// TODO: Support historical events and multi-touch.
|
// TODO: Support historical events and multi-touch.
|
||||||
public void replay(final ReplayData replayData) {
|
public void replay(final ReplayData replayData, final Runnable callback) {
|
||||||
if (mIsReplaying) {
|
if (mIsReplaying) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -72,7 +81,7 @@ public class Replayer {
|
||||||
// The adjustment needed to translate times from the original recorded time to the current
|
// The adjustment needed to translate times from the original recorded time to the current
|
||||||
// time.
|
// time.
|
||||||
final long timeAdjustment = currentStartTime - origStartTime;
|
final long timeAdjustment = currentStartTime - origStartTime;
|
||||||
final Handler handler = new Handler() {
|
final Handler handler = new Handler(Looper.getMainLooper()) {
|
||||||
// Track the time of the most recent DOWN event, to be passed as a parameter when
|
// Track the time of the most recent DOWN event, to be passed as a parameter when
|
||||||
// constructing a MotionEvent. It's initialized here to the origStartTime, but this is
|
// constructing a MotionEvent. It's initialized here to the origStartTime, but this is
|
||||||
// only a precaution. The value should be overwritten by the first ACTION_DOWN event
|
// only a precaution. The value should be overwritten by the first ACTION_DOWN event
|
||||||
|
@ -113,8 +122,12 @@ public class Replayer {
|
||||||
Log.d(TAG, "queuing event at " + msgTime);
|
Log.d(TAG, "queuing event at " + msgTime);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
final long presentDoneTime = replayData.mTimes.get(numActions - 1) + timeAdjustment
|
final long presentDoneTime = replayData.mTimes.get(numActions - 1) + timeAdjustment
|
||||||
+ COMPLETION_TIME_MS;
|
+ COMPLETION_TIME_MS;
|
||||||
handler.sendMessageAtTime(Message.obtain(handler, MSG_DONE), presentDoneTime);
|
handler.sendMessageAtTime(Message.obtain(handler, MSG_DONE), presentDoneTime);
|
||||||
|
if (callback != null) {
|
||||||
|
handler.postAtTime(callback, presentDoneTime + 1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,65 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2012 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
|
||||||
|
* use this file except in compliance with the License. You may obtain a copy of
|
||||||
|
* the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
* License for the specific language governing permissions and limitations under
|
||||||
|
* the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.inputmethod.research;
|
||||||
|
|
||||||
|
import android.app.IntentService;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import com.android.inputmethod.research.MotionEventReader.ReplayData;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Provide a mechanism to invoke the replayer from outside.
|
||||||
|
*
|
||||||
|
* In particular, makes access from a host possible through {@code adb am startservice}.
|
||||||
|
*/
|
||||||
|
public class ReplayerService extends IntentService {
|
||||||
|
private static final String TAG = ReplayerService.class.getSimpleName();
|
||||||
|
private static final String EXTRA_FILENAME = "com.android.inputmethod.research.extra.FILENAME";
|
||||||
|
private static final long MAX_REPLAY_TIME = TimeUnit.SECONDS.toMillis(60);
|
||||||
|
|
||||||
|
public ReplayerService() {
|
||||||
|
super(ReplayerService.class.getSimpleName());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onHandleIntent(final Intent intent) {
|
||||||
|
final String filename = intent.getStringExtra(EXTRA_FILENAME);
|
||||||
|
if (filename == null) return;
|
||||||
|
|
||||||
|
final ReplayData replayData = new MotionEventReader().readMotionEventData(
|
||||||
|
new File(filename));
|
||||||
|
synchronized (this) {
|
||||||
|
Replayer.getInstance().replay(replayData, new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
synchronized (ReplayerService.this) {
|
||||||
|
ReplayerService.this.notify();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
try {
|
||||||
|
wait(MAX_REPLAY_TIME);
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
Log.e(TAG, "Timeout while replaying.", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -187,7 +187,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
|
||||||
private LatinIME mLatinIME;
|
private LatinIME mLatinIME;
|
||||||
private final Statistics mStatistics;
|
private final Statistics mStatistics;
|
||||||
private final MotionEventReader mMotionEventReader = new MotionEventReader();
|
private final MotionEventReader mMotionEventReader = new MotionEventReader();
|
||||||
private final Replayer mReplayer = new Replayer();
|
private final Replayer mReplayer = Replayer.getInstance();
|
||||||
|
|
||||||
private Intent mUploadIntent;
|
private Intent mUploadIntent;
|
||||||
private Intent mUploadNowIntent;
|
private Intent mUploadNowIntent;
|
||||||
|
@ -783,7 +783,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
|
||||||
public void run() {
|
public void run() {
|
||||||
final ReplayData replayData =
|
final ReplayData replayData =
|
||||||
mMotionEventReader.readMotionEventData(mUserRecordingFile);
|
mMotionEventReader.readMotionEventData(mUserRecordingFile);
|
||||||
mReplayer.replay(replayData);
|
mReplayer.replay(replayData, null);
|
||||||
}
|
}
|
||||||
}, 1000);
|
}, 1000);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue