Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6f68f29 authored by Kurt Partridge's avatar Kurt Partridge Committed by Android (Google) Code Review
Browse files

Merge "ResearchLog refactor"

parents 2d097dd5 6b966160

java/proguard.flags

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
  <init>(...);

}



-keep class com.android.inputmethod.latin.ResearchLogger {

-keep class com.android.inputmethod.research.ResearchLogger {

  void flush();

  void publishCurrentLogUnit(...);

}

java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java

+1 −1
Original line number Diff line number Diff line
@@ -47,13 +47,13 @@ import com.android.inputmethod.latin.Constants; 
import com.android.inputmethod.latin.LatinIME;

import com.android.inputmethod.latin.LatinImeLogger;

import com.android.inputmethod.latin.R;

import com.android.inputmethod.latin.ResearchLogger;

import com.android.inputmethod.latin.StaticInnerHandlerWrapper;

import com.android.inputmethod.latin.StringUtils;

import com.android.inputmethod.latin.SubtypeLocale;

import com.android.inputmethod.latin.Utils;

import com.android.inputmethod.latin.Utils.UsabilityStudyLogUtils;

import com.android.inputmethod.latin.define.ProductionFlag;

import com.android.inputmethod.research.ResearchLogger;



import java.util.Locale;

import java.util.WeakHashMap;

java/src/com/android/inputmethod/keyboard/PointerTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ import com.android.inputmethod.keyboard.internal.GestureStroke; 
import com.android.inputmethod.keyboard.internal.PointerTrackerQueue;

import com.android.inputmethod.latin.InputPointers;

import com.android.inputmethod.latin.LatinImeLogger;

import com.android.inputmethod.latin.ResearchLogger;

import com.android.inputmethod.latin.define.ProductionFlag;

import com.android.inputmethod.research.ResearchLogger;



import java.util.ArrayList;

java/src/com/android/inputmethod/keyboard/SuddenJumpingTouchEventHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ import android.view.MotionEvent; 


import com.android.inputmethod.latin.LatinImeLogger;

import com.android.inputmethod.latin.R;

import com.android.inputmethod.latin.ResearchLogger;

import com.android.inputmethod.latin.Utils;

import com.android.inputmethod.latin.define.ProductionFlag;

import com.android.inputmethod.research.ResearchLogger;



public class SuddenJumpingTouchEventHandler {

    private static final String TAG = SuddenJumpingTouchEventHandler.class.getSimpleName();

java/src/com/android/inputmethod/latin/LatinIME.java

+2 −1
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ import com.android.inputmethod.keyboard.LatinKeyboardView; 
import com.android.inputmethod.latin.LocaleUtils.RunInLocale;

import com.android.inputmethod.latin.define.ProductionFlag;

import com.android.inputmethod.latin.suggestions.SuggestionsView;

import com.android.inputmethod.research.ResearchLogger;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -2159,7 +2160,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
        showOptionDialog(builder.create());

    }



    /* package */ void showOptionDialog(AlertDialog dialog) {

    public void showOptionDialog(AlertDialog dialog) {

        final IBinder windowToken = mKeyboardSwitcher.getKeyboardView().getWindowToken();

        if (windowToken == null) return;