PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch back to sync IInputMethodManager" into sc-dev am: d5f9f65390

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177777

Change-Id: I553c1327ab3557bd15c8fd332158a958b5a9bdb1
This commit is contained in:
TreeHugger Robot
2021-07-02 16:40:08 +00:00
committed by Automerger Merge Worker
parent 9064037c38 d5f9f65390
commit 502bd5a438
2 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/development/qstile/DevelopmentTiles.java
View File

@@ -48,8 +48,6 @@ import android.widget.Toast;
import androidx.annotation.VisibleForTesting;
import com.android.internal.app.LocalePicker;
import com.android.internal.inputmethod.Completable;
import com.android.internal.inputmethod.ResultCallbacks;
import com.android.internal.statusbar.IStatusBarService;
import com.android.internal.view.IInputMethodManager;
import com.android.settings.R;
@@ -262,13 +260,9 @@ public abstract class DevelopmentTiles extends TileService {
return false;
}
@VisibleForTesting
boolean isImeTraceEnabled() {
private boolean isImeTraceEnabled() {
try {
// TODO(b/175742251): Get rid of dependency on IInputMethodManager
final Completable.Boolean value = Completable.createBoolean();
mInputMethodManager.isImeTraceEnabled(ResultCallbacks.of(value));
return Completable.getResult(value);
return mInputMethodManager.isImeTraceEnabled();
} catch (RemoteException e) {
Log.e(TAG, "Could not get ime trace status, defaulting to false.", e);
}
@@ -328,16 +322,13 @@ public abstract class DevelopmentTiles extends TileService {
}
}
protected void setImeTraceEnabled(boolean isEnabled) {
private void setImeTraceEnabled(boolean isEnabled) {
try {
// TODO(b/175742251): Get rid of dependency on IInputMethodManager
final Completable.Void value = Completable.createVoid();
if (isEnabled) {
mInputMethodManager.startImeTrace(ResultCallbacks.of(value));
mInputMethodManager.startImeTrace();
} else {
mInputMethodManager.stopImeTrace(ResultCallbacks.of(value));
mInputMethodManager.stopImeTrace();
}
Completable.getResult(value);
} catch (RemoteException e) {
Log.e(TAG, "Could not set ime trace status." + e.toString());
}