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

Commit d91a1eeb authored by Beverly's avatar Beverly Committed by android-build-merger
Browse files

Merge "Add metric to log use of hush gesture" into pi-dev am: 2b0ead73 

am: a3cb0ae7

Change-Id: I132929f9218013bffe904b69c549070816486428
parents 44aaa2a0 a3cb0ae7

proto/src/metrics_constants.proto

+5 −0
Original line number Diff line number Diff line
@@ -5969,6 +5969,11 @@ message MetricsEvent { 
    // OS: P

    FIELD_BATTERY_CHARGE_CYCLES = 1439;



    // ACTION: Hush gesture - volume up + power button

    // CATEGORY: GLOBAL_SYSTEM_UI

    // OS: P

    ACTION_HUSH_GESTURE = 1440;



    // ---- End P Constants, all P constants go above this line ----



    // First Q constant in master goes here:

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

+4 −0
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ import com.android.internal.accessibility.AccessibilityShortcutController; 
import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto;

import com.android.internal.policy.IKeyguardDismissCallback;

import com.android.internal.policy.IShortcutService;

import com.android.internal.policy.KeyguardDismissCallback;
@@ -621,6 +622,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    boolean mUseTvRouting;

    int mVeryLongPressTimeout;

    boolean mAllowStartActivityForLongPressOnPowerDuringSetup;

    MetricsLogger mLogger;



    private boolean mHandleVolumeKeysInWM;
@@ -1136,6 +1138,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        }

        getAudioManagerInternal();

        mAudioManagerInternal.silenceRingerModeInternal("volume_hush");

        mLogger.action(MetricsProto.MetricsEvent.ACTION_HUSH_GESTURE, mRingerToggleChord);

    }



    IStatusBarService getStatusBarService() {
@@ -2003,6 +2006,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        mHasFeatureLeanback = mContext.getPackageManager().hasSystemFeature(FEATURE_LEANBACK);

        mAccessibilityShortcutController =

                new AccessibilityShortcutController(mContext, new Handler(), mCurrentUserId);

        mLogger = new MetricsLogger();

        // Init display burn-in protection

        boolean burnInProtectionEnabled = context.getResources().getBoolean(

                com.android.internal.R.bool.config_enableBurnInProtection);