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

Commit ca0c4054 authored by Vineeth Bhende's avatar Vineeth Bhende Committed by Android (Google) Code Review
Browse files

Merge "Clean up flag: notify_password_text_view_user_activity_in_background" into main

parents a772c750 d471180c

packages/SystemUI/aconfig/systemui.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -1390,16 +1390,6 @@ flag { 
  }

}



flag {

    name: "notify_password_text_view_user_activity_in_background"

    namespace: "systemui"

    description: "Decide whether to notify the user activity in password text view, to power manager in the background thread."

    bug: "346882515"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

   name: "non_touchscreen_devices_bypass_falsing"

   namespace: "systemui"

packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java

+1 −4
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.keyguard; 
import static com.android.internal.util.LatencyTracker.ACTION_CHECK_CREDENTIAL;

import static com.android.internal.util.LatencyTracker.ACTION_CHECK_CREDENTIAL_UNLOCKED;

import static com.android.keyguard.KeyguardAbsKeyInputView.MINIMUM_PASSWORD_LENGTH_BEFORE_REPORT;

import static com.android.systemui.Flags.notifyPasswordTextViewUserActivityInBackground;



import android.content.res.ColorStateList;

import android.os.AsyncTask;
@@ -300,10 +299,8 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey 
        getKeyguardSecurityCallback().userActivity();

        getKeyguardSecurityCallback().onUserInput();

        mMessageAreaController.setMessage("");

        if (notifyPasswordTextViewUserActivityInBackground()) {

        mUserActivityNotifier.notifyUserActivity();

    }

    }



    @Override

    public void onResume(int reason) {

packages/SystemUI/src/com/android/keyguard/PasswordTextView.java

+0 −10
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.keyguard;



import static com.android.systemui.Flags.notifyPasswordTextViewUserActivityInBackground;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.animation.AnimatorSet;
@@ -263,14 +261,6 @@ public class PasswordTextView extends BasePasswordTextView { 
        }

    }



    @Override

    protected void onUserActivity() {

        if (!notifyPasswordTextViewUserActivityInBackground()) {

            mPM.userActivity(SystemClock.uptimeMillis(), false);

        }

        super.onUserActivity();

    }



    /**

     * Reload colors from resources.

     **/