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

Commit 63cdb2e2 authored by Harry Cutts's avatar Harry Cutts Committed by Android (Google) Code Review
Browse files

Merge "InputReader: dump orientation as a string" into main

parents 427e3330 91e7fa26

services/inputflinger/reader/mapper/CursorInputMapper.cpp

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <optional>



#include <com_android_input_flags.h>

#include <ftl/enum.h>

#include <input/AccelerationCurve.h>



#include "CursorButtonAccumulator.h"
@@ -136,7 +137,7 @@ void CursorInputMapper::dump(std::string& dump) { 
    dump += StringPrintf(INDENT3 "VWheelScale: %0.3f\n", mVWheelScale);

    dump += StringPrintf(INDENT3 "HWheelScale: %0.3f\n", mHWheelScale);

    dump += StringPrintf(INDENT3 "DisplayId: %s\n", toString(mDisplayId).c_str());

    dump += StringPrintf(INDENT3 "Orientation: %d\n", mOrientation);

    dump += StringPrintf(INDENT3 "Orientation: %s\n", ftl::enum_string(mOrientation).c_str());

    dump += StringPrintf(INDENT3 "ButtonState: 0x%08x\n", mButtonState);

    dump += StringPrintf(INDENT3 "Down: %s\n", toString(isPointerDown(mButtonState)));

    dump += StringPrintf(INDENT3 "DownTime: %" PRId64 "\n", mDownTime);

services/inputflinger/reader/mapper/KeyboardInputMapper.cpp

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include "KeyboardInputMapper.h"



#include <ftl/enum.h>

#include <ui/Rotation.h>



namespace android {
@@ -143,7 +144,7 @@ void KeyboardInputMapper::dump(std::string& dump) { 
    dump += INDENT2 "Keyboard Input Mapper:\n";

    dumpParameters(dump);

    dump += StringPrintf(INDENT3 "KeyboardType: %d\n", mKeyboardType);

    dump += StringPrintf(INDENT3 "Orientation: %d\n", getOrientation());

    dump += StringPrintf(INDENT3 "Orientation: %s\n", ftl::enum_string(getOrientation()).c_str());

    dump += StringPrintf(INDENT3 "KeyDowns: %zu keys currently down\n", mKeyDowns.size());

    dump += StringPrintf(INDENT3 "MetaState: 0x%0x\n", mMetaState);

    dump += INDENT3 "KeyboardLayoutInfo: ";