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

Commit 48e04de8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Added logs for making sure back button is pressed"

parents 12e40e4e 0ceca182

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java

+5 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.os.AsyncTask; 
import android.os.Bundle;

import android.os.SystemClock;

import android.util.AttributeSet;

import android.util.Log;

import android.util.TypedValue;

import android.view.HapticFeedbackConstants;

import android.view.InputDevice;
@@ -304,6 +305,10 @@ public class KeyButtonView extends ImageView implements ButtonInterface { 
                .setSubtype(mCode)

                .addTaggedData(MetricsEvent.FIELD_NAV_ACTION, action)

                .addTaggedData(MetricsEvent.FIELD_FLAGS, flags));

        // TODO(b/122195391): Added logs to make sure sysui is sending back button events

        if (mCode == KeyEvent.KEYCODE_BACK && flags != KeyEvent.FLAG_LONG_PRESS) {

            Log.i(TAG, "Back button event: " + KeyEvent.actionToString(action));

        }

        final int repeatCount = (flags & KeyEvent.FLAG_LONG_PRESS) != 0 ? 1 : 0;

        final KeyEvent ev = new KeyEvent(mDownTime, when, action, mCode, repeatCount,

                0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0,

services/core/java/com/android/server/policy/PhoneWindowManager.java

+2 −1
Original line number Diff line number Diff line
@@ -844,7 +844,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }



    private void interceptBackKeyDown() {

        MetricsLogger.count(mContext, "key_back_down", 1);

        mLogger.count("key_back_down", 1);

        // Reset back key state for long press

        mBackKeyHandled = false;
@@ -858,6 +858,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


    // returns true if the key was handled and should not be passed to the user

    private boolean interceptBackKeyUp(KeyEvent event) {

        mLogger.count("key_back_up", 1);

        // Cache handled state

        boolean handled = mBackKeyHandled;