Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add sysui module for logging SystemUI atoms."

Browse Source
This commit is contained in:
Muhammad Qureshi
2020-01-21 21:22:14 +00:00
committed by Android (Google) Code Review
parent 7901f7f177 9bced7d7de
commit 3ab2065deb
9 changed files with 75 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmds/statsd/src/atoms.proto
View File

@@ -95,7 +95,7 @@ message Atom {
ExcessiveCpuUsageReported excessive_cpu_usage_reported = 16;
CachedKillReported cached_kill_reported = 17;
ProcessMemoryStatReported process_memory_stat_reported = 18;
LauncherUIChanged launcher_event = 19;
LauncherUIChanged launcher_event = 19 [(module) = "sysui"];
BatterySaverModeStateChanged battery_saver_mode_state_changed = 20;
DeviceIdleModeStateChanged device_idle_mode_state_changed = 21;
DeviceIdlingModeStateChanged device_idling_mode_state_changed = 22;
@@ -138,9 +138,9 @@ message Atom {
OverlayStateChanged overlay_state_changed = 59;
ForegroundServiceStateChanged foreground_service_state_changed = 60;
CallStateChanged call_state_changed = 61;
KeyguardStateChanged keyguard_state_changed = 62;
KeyguardBouncerStateChanged keyguard_bouncer_state_changed = 63;
KeyguardBouncerPasswordEntered keyguard_bouncer_password_entered = 64;
KeyguardStateChanged keyguard_state_changed = 62 [(module) = "sysui"];
KeyguardBouncerStateChanged keyguard_bouncer_state_changed = 63 [(module) = "sysui"];
KeyguardBouncerPasswordEntered keyguard_bouncer_password_entered = 64 [(module) = "sysui"];
AppDied app_died = 65;
ResourceConfigurationChanged resource_configuration_changed = 66;
BluetoothEnabledStateChanged bluetooth_enabled_state_changed = 67;
@@ -231,7 +231,7 @@ message Atom {
UsbContaminantReported usb_contaminant_reported = 146;
WatchdogRollbackOccurred watchdog_rollback_occurred = 147;
BiometricSystemHealthIssueDetected biometric_system_health_issue_detected = 148;
BubbleUIChanged bubble_ui_changed = 149;
BubbleUIChanged bubble_ui_changed = 149 [(module) = "sysui"];
ScheduledJobConstraintChanged scheduled_job_constraint_changed = 150;
BluetoothActiveDeviceChanged bluetooth_active_device_changed = 151;
BluetoothA2dpPlaybackStateChanged bluetooth_a2dp_playback_state_changed = 152;
@@ -262,7 +262,7 @@ message Atom {
AssistGestureProgressReported assist_gesture_progress_reported = 176;
TouchGestureClassified touch_gesture_classified = 177;
HiddenApiUsed hidden_api_used = 178 [(allow_from_any_uid) = true];
StyleUIChanged style_ui_changed = 179 [(module) = "style"];
StyleUIChanged style_ui_changed = 179 [(module) = "sysui"];
PrivacyIndicatorsInteracted privacy_indicators_interacted =
180 [(module) = "permissioncontroller"];
AppInstallOnExternalStorageReported app_install_on_external_storage_reported = 181;
@@ -317,7 +317,7 @@ message Atom {
ConversationActionsEvent conversation_actions_event = 221 [(module) = "textclassifier"];
LanguageDetectionEvent language_detection_event = 222 [(module) = "textclassifier"];
ExclusionRectStateChanged exclusion_rect_state_changed = 223;
BackGesture back_gesture_reported_reported = 224;
BackGesture back_gesture_reported_reported = 224 [(module) = "sysui"];
UpdateEngineUpdateAttemptReported update_engine_update_attempt_reported = 225;
UpdateEngineSuccessfulUpdateReported update_engine_successful_update_reported = 226;
CameraActionEvent camera_action_event = 227;

19
packages/SystemUI/shared/Android.bp
View File

@@ -12,8 +12,22 @@
// See the License for the specific language governing permissions and
// limitations under the License.
android_library {
genrule {
name: "statslog-SystemUI-java-gen",
tools: ["stats-log-api-gen"],
cmd: "$(location stats-log-api-gen) --java $(out) --module sysui --javaPackage com.android.systemui.shared.system --javaClass SysUiStatsLog",
out: ["com/android/systemui/shared/system/SysUiStatsLog.java"],
}
java_library {
name: "SystemUI-statsd",
srcs: [
":statslog-SystemUI-java-gen",
],
}
android_library {
name: "SystemUISharedLib",
srcs: [
"src/**/*.java",
@@ -21,7 +35,8 @@ android_library {
],
static_libs: [
"PluginCoreLib"
"PluginCoreLib",
"SystemUI-statsd",
],
// Enforce that the library is built against java 7 so that there are

51
packages/SystemUI/shared/src/com/android/systemui/shared/system/StatsLogCompat.java
View File

@@ -1,51 +0,0 @@
/*
* Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.systemui.shared.system;
import android.util.StatsLog;
/**
* Wrapper class to make StatsLog hidden API accessible.
*/
public class StatsLogCompat {
/**
* StatsLog.write(StatsLog.LAUNCHER_EVENT, int action, int src_state, int dst_state,
* byte[] extension, boolean is_swipe_up_enabled);
*/
public static void write(int action, int srcState, int dstState, byte [] extension,
boolean swipeUpEnabled) {
StatsLog.write(19, action, srcState, dstState, extension,
swipeUpEnabled);
}
/**
* StatsLog.write(StatsLog.STYLE_EVENT, action, colorPackageHash,
* fontPackageHash, shapePackageHash, clockPackageHash,
* launcherGrid, wallpaperCategoryHash, wallpaperIdHash,
* colorPreference, locationPreference);
*/
public static void write(int action, int colorPackageHash,
int fontPackageHash, int shapePackageHash, int clockPackageHash,
int launcherGrid, int wallpaperCategoryHash, int wallpaperIdHash,
int colorPreference, int locationPreference) {
StatsLog.write(179, action, colorPackageHash,
fontPackageHash, shapePackageHash, clockPackageHash,
launcherGrid, wallpaperCategoryHash, wallpaperIdHash,
colorPreference, locationPreference);
}
}

10
packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
View File

@@ -28,7 +28,6 @@ import android.os.UserHandle;
import android.util.AttributeSet;
import android.util.Log;
import android.util.Slog;
import android.util.StatsLog;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@@ -50,6 +49,7 @@ import com.android.settingslib.utils.ThreadUtils;
import com.android.systemui.Dependency;
import com.android.systemui.R;
import com.android.systemui.SystemUIFactory;
import com.android.systemui.shared.system.SysUiStatsLog;
import com.android.systemui.statusbar.policy.KeyguardStateController;
import com.android.systemui.util.InjectionInflationController;
@@ -615,8 +615,8 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
public void reportUnlockAttempt(int userId, boolean success, int timeoutMs) {
if (success) {
StatsLog.write(StatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED,
StatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED__RESULT__SUCCESS);
SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED,
SysUiStatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED__RESULT__SUCCESS);
mLockPatternUtils.reportSuccessfulPasswordAttempt(userId);
// Force a garbage collection in an attempt to erase any lockscreen password left in
// memory. Do it asynchronously with a 5-sec delay to avoid making the keyguard
@@ -628,8 +628,8 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
Runtime.getRuntime().gc();
});
} else {
StatsLog.write(StatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED,
StatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED__RESULT__FAILURE);
SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED,
SysUiStatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED__RESULT__FAILURE);
KeyguardSecurityContainer.this.reportFailedUnlockAttempt(userId, timeoutMs);
}
mMetricsLogger.write(new LogMaker(MetricsEvent.BOUNCER)

6
packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java
View File

@@ -42,7 +42,6 @@ import android.os.RemoteException;
import android.service.notification.StatusBarNotification;
import android.util.AttributeSet;
import android.util.Log;
import android.util.StatsLog;
import android.view.View;
import android.view.WindowInsets;
import android.view.WindowManager;
@@ -52,6 +51,7 @@ import com.android.internal.policy.ScreenDecorationsUtils;
import com.android.systemui.Dependency;
import com.android.systemui.R;
import com.android.systemui.recents.TriangleShape;
import com.android.systemui.shared.system.SysUiStatsLog;
import com.android.systemui.statusbar.AlphaOptimizedButton;
/**
@@ -467,7 +467,7 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList
mStackView.collapseStack(() -> {
mContext.startActivityAsUser(intent, mBubble.getEntry().getSbn().getUser());
logBubbleClickEvent(mBubble,
StatsLog.BUBBLE_UICHANGED__ACTION__HEADER_GO_TO_SETTINGS);
SysUiStatsLog.BUBBLE_UICHANGED__ACTION__HEADER_GO_TO_SETTINGS);
});
}
}
@@ -564,7 +564,7 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList
*/
private void logBubbleClickEvent(Bubble bubble, int action) {
StatusBarNotification notification = bubble.getEntry().getSbn();
StatsLog.write(StatsLog.BUBBLE_UI_CHANGED,
SysUiStatsLog.write(SysUiStatsLog.BUBBLE_UI_CHANGED,
notification.getPackageName(),
notification.getNotification().getChannelId(),
notification.getId(),

29
packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
View File

@@ -45,7 +45,6 @@ import android.os.VibrationEffect;
import android.os.Vibrator;
import android.service.notification.StatusBarNotification;
import android.util.Log;
import android.util.StatsLog;
import android.view.Choreographer;
import android.view.DisplayCutout;
import android.view.Gravity;
@@ -73,6 +72,7 @@ import com.android.systemui.R;
import com.android.systemui.bubbles.animation.ExpandedAnimationController;
import com.android.systemui.bubbles.animation.PhysicsAnimationLayout;
import com.android.systemui.bubbles.animation.StackAnimationController;
import com.android.systemui.shared.system.SysUiStatsLog;
import java.io.FileDescriptor;
import java.io.PrintWriter;
@@ -735,7 +735,7 @@ public class BubbleStackView extends FrameLayout {
ViewClippingUtil.setClippingDeactivated(bubble.getIconView(), true, mClippingParameters);
animateInFlyoutForBubble(bubble);
requestUpdate();
logBubbleEvent(bubble, StatsLog.BUBBLE_UICHANGED__ACTION__POSTED);
logBubbleEvent(bubble, SysUiStatsLog.BUBBLE_UICHANGED__ACTION__POSTED);
updatePointerPosition();
}
@@ -749,7 +749,7 @@ public class BubbleStackView extends FrameLayout {
if (removedIndex >= 0) {
mBubbleContainer.removeViewAt(removedIndex);
bubble.cleanupExpandedState();
logBubbleEvent(bubble, StatsLog.BUBBLE_UICHANGED__ACTION__DISMISSED);
logBubbleEvent(bubble, SysUiStatsLog.BUBBLE_UICHANGED__ACTION__DISMISSED);
} else {
Log.d(TAG, "was asked to remove Bubble, but didn't find the view! " + bubble);
}
@@ -760,7 +760,7 @@ public class BubbleStackView extends FrameLayout {
void updateBubble(Bubble bubble) {
animateInFlyoutForBubble(bubble);
requestUpdate();
logBubbleEvent(bubble, StatsLog.BUBBLE_UICHANGED__ACTION__UPDATED);
logBubbleEvent(bubble, SysUiStatsLog.BUBBLE_UICHANGED__ACTION__UPDATED);
}
public void updateBubbleOrder(List<Bubble> bubbles) {
@@ -800,8 +800,9 @@ public class BubbleStackView extends FrameLayout {
updateExpandedBubble();
updatePointerPosition();
requestUpdate();
logBubbleEvent(previouslySelected, StatsLog.BUBBLE_UICHANGED__ACTION__COLLAPSED);
logBubbleEvent(bubbleToSelect, StatsLog.BUBBLE_UICHANGED__ACTION__EXPANDED);
logBubbleEvent(previouslySelected,
SysUiStatsLog.BUBBLE_UICHANGED__ACTION__COLLAPSED);
logBubbleEvent(bubbleToSelect, SysUiStatsLog.BUBBLE_UICHANGED__ACTION__EXPANDED);
notifyExpansionChanged(previouslySelected, false /* expanded */);
notifyExpansionChanged(bubbleToSelect, true /* expanded */);
});
@@ -823,12 +824,12 @@ public class BubbleStackView extends FrameLayout {
}
if (mIsExpanded) {
animateCollapse();
logBubbleEvent(mExpandedBubble, StatsLog.BUBBLE_UICHANGED__ACTION__COLLAPSED);
logBubbleEvent(mExpandedBubble, SysUiStatsLog.BUBBLE_UICHANGED__ACTION__COLLAPSED);
} else {
animateExpansion();
// TODO: move next line to BubbleData
logBubbleEvent(mExpandedBubble, StatsLog.BUBBLE_UICHANGED__ACTION__EXPANDED);
logBubbleEvent(mExpandedBubble, StatsLog.BUBBLE_UICHANGED__ACTION__STACK_EXPANDED);
logBubbleEvent(mExpandedBubble, SysUiStatsLog.BUBBLE_UICHANGED__ACTION__EXPANDED);
logBubbleEvent(mExpandedBubble, SysUiStatsLog.BUBBLE_UICHANGED__ACTION__STACK_EXPANDED);
}
notifyExpansionChanged(mExpandedBubble, mIsExpanded);
}
@@ -845,7 +846,7 @@ public class BubbleStackView extends FrameLayout {
}
mBubbleData.dismissAll(reason);
logBubbleEvent(null /* no bubble associated with bubble stack dismiss */,
StatsLog.BUBBLE_UICHANGED__ACTION__STACK_DISMISSED);
SysUiStatsLog.BUBBLE_UICHANGED__ACTION__STACK_DISMISSED);
}
/**
@@ -1093,7 +1094,7 @@ public class BubbleStackView extends FrameLayout {
final float newStackX = mStackAnimationController.flingStackThenSpringToEdge(x, velX, velY);
logBubbleEvent(null /* no bubble associated with bubble stack move */,
StatsLog.BUBBLE_UICHANGED__ACTION__STACK_MOVED);
SysUiStatsLog.BUBBLE_UICHANGED__ACTION__STACK_MOVED);
mStackOnLeftOrWillBe = newStackX <= 0;
updateBubbleZOrdersAndDotPosition(true /* animate */);
@@ -1443,7 +1444,7 @@ public class BubbleStackView extends FrameLayout {
});
mFlyout.removeCallbacks(mHideFlyout);
mFlyout.postDelayed(mHideFlyout, FLYOUT_HIDE_AFTER);
logBubbleEvent(bubble, StatsLog.BUBBLE_UICHANGED__ACTION__FLYOUT);
logBubbleEvent(bubble, SysUiStatsLog.BUBBLE_UICHANGED__ACTION__FLYOUT);
}
/** Hide the flyout immediately and cancel any pending hide runnables. */
@@ -1641,7 +1642,7 @@ public class BubbleStackView extends FrameLayout {
private void logBubbleEvent(@Nullable Bubble bubble, int action) {
if (bubble == null || bubble.getEntry() == null
|| bubble.getEntry().getSbn() == null) {
StatsLog.write(StatsLog.BUBBLE_UI_CHANGED,
SysUiStatsLog.write(SysUiStatsLog.BUBBLE_UI_CHANGED,
null /* package name */,
null /* notification channel */,
0 /* notification ID */,
@@ -1655,7 +1656,7 @@ public class BubbleStackView extends FrameLayout {
false /* isAppForeground (unused) */);
} else {
StatusBarNotification notification = bubble.getEntry().getSbn();
StatsLog.write(StatsLog.BUBBLE_UI_CHANGED,
SysUiStatsLog.write(SysUiStatsLog.BUBBLE_UI_CHANGED,
notification.getPackageName(),
notification.getNotification().getChannelId(),
notification.getId(),

28
packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java
View File

@@ -31,7 +31,6 @@ import android.os.RemoteException;
import android.os.SystemClock;
import android.os.SystemProperties;
import android.util.Log;
import android.util.StatsLog;
import android.view.ISystemGestureExclusionListener;
import android.view.InputChannel;
import android.view.InputDevice;
@@ -54,6 +53,7 @@ import com.android.systemui.plugins.PluginListener;
import com.android.systemui.recents.OverviewProxyService;
import com.android.systemui.shared.plugins.PluginManager;
import com.android.systemui.shared.system.QuickStepContract;
import com.android.systemui.shared.system.SysUiStatsLog;
import java.io.PrintWriter;
import java.util.concurrent.Executor;
@@ -133,23 +133,23 @@ public class EdgeBackGestureHandler implements DisplayListener,
mOverviewProxyService.notifyBackAction(true, (int) mDownPoint.x,
(int) mDownPoint.y, false /* isButton */, !mIsOnLeftEdge);
int backtype = (mInRejectedExclusion
? StatsLog.BACK_GESTURE__TYPE__COMPLETED_REJECTED :
StatsLog.BACK_GESTURE__TYPE__COMPLETED);
StatsLog.write(StatsLog.BACK_GESTURE_REPORTED_REPORTED, backtype,
? SysUiStatsLog.BACK_GESTURE__TYPE__COMPLETED_REJECTED :
SysUiStatsLog.BACK_GESTURE__TYPE__COMPLETED);
SysUiStatsLog.write(SysUiStatsLog.BACK_GESTURE_REPORTED_REPORTED, backtype,
(int) mDownPoint.y, mIsOnLeftEdge
? StatsLog.BACK_GESTURE__X_LOCATION__LEFT :
StatsLog.BACK_GESTURE__X_LOCATION__RIGHT);
? SysUiStatsLog.BACK_GESTURE__X_LOCATION__LEFT :
SysUiStatsLog.BACK_GESTURE__X_LOCATION__RIGHT);
}
@Override
public void cancelBack() {
mOverviewProxyService.notifyBackAction(false, (int) mDownPoint.x,
(int) mDownPoint.y, false /* isButton */, !mIsOnLeftEdge);
int backtype = StatsLog.BACK_GESTURE__TYPE__INCOMPLETE;
StatsLog.write(StatsLog.BACK_GESTURE_REPORTED_REPORTED, backtype,
int backtype = SysUiStatsLog.BACK_GESTURE__TYPE__INCOMPLETE;
SysUiStatsLog.write(SysUiStatsLog.BACK_GESTURE_REPORTED_REPORTED, backtype,
(int) mDownPoint.y, mIsOnLeftEdge
? StatsLog.BACK_GESTURE__X_LOCATION__LEFT :
StatsLog.BACK_GESTURE__X_LOCATION__RIGHT);
? SysUiStatsLog.BACK_GESTURE__X_LOCATION__LEFT :
SysUiStatsLog.BACK_GESTURE__X_LOCATION__RIGHT);
}
};
@@ -334,10 +334,10 @@ public class EdgeBackGestureHandler implements DisplayListener,
if (isInExcludedRegion) {
mOverviewProxyService.notifyBackAction(false /* completed */, -1, -1,
false /* isButton */, !mIsOnLeftEdge);
StatsLog.write(StatsLog.BACK_GESTURE_REPORTED_REPORTED,
StatsLog.BACK_GESTURE__TYPE__INCOMPLETE_EXCLUDED, y,
mIsOnLeftEdge ? StatsLog.BACK_GESTURE__X_LOCATION__LEFT :
StatsLog.BACK_GESTURE__X_LOCATION__RIGHT);
SysUiStatsLog.write(SysUiStatsLog.BACK_GESTURE_REPORTED_REPORTED,
SysUiStatsLog.BACK_GESTURE__TYPE__INCOMPLETE_EXCLUDED, y,
mIsOnLeftEdge ? SysUiStatsLog.BACK_GESTURE__X_LOCATION__LEFT :
SysUiStatsLog.BACK_GESTURE__X_LOCATION__RIGHT);
} else {
mInRejectedExclusion = mUnrestrictedExcludeRegion.contains(x, y);
}

10
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
View File

@@ -27,7 +27,6 @@ import android.os.UserManager;
import android.util.Log;
import android.util.MathUtils;
import android.util.Slog;
import android.util.StatsLog;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
@@ -47,6 +46,7 @@ import com.android.systemui.Dependency;
import com.android.systemui.R;
import com.android.systemui.keyguard.DismissCallbackRegistry;
import com.android.systemui.plugins.FalsingManager;
import com.android.systemui.shared.system.SysUiStatsLog;
import com.android.systemui.statusbar.policy.KeyguardStateController;
import java.io.PrintWriter;
@@ -248,8 +248,8 @@ public class KeyguardBouncer {
mKeyguardView.onResume();
mKeyguardView.resetSecurityContainer();
}
StatsLog.write(StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED,
StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__SHOWN);
SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_BOUNCER_STATE_CHANGED,
SysUiStatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__SHOWN);
}
};
@@ -290,8 +290,8 @@ public class KeyguardBouncer {
public void hide(boolean destroyView) {
if (isShowing()) {
StatsLog.write(StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED,
StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__HIDDEN);
SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_BOUNCER_STATE_CHANGED,
SysUiStatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__HIDDEN);
mDismissCallbackRegistry.notifyDismissCancelled();
}
mIsScrimmed = false;

18
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
View File

@@ -26,7 +26,6 @@ import android.content.Context;
import android.content.res.ColorStateList;
import android.os.Bundle;
import android.os.SystemClock;
import android.util.StatsLog;
import android.view.KeyEvent;
import android.view.View;
import android.view.ViewGroup;
@@ -48,6 +47,7 @@ import com.android.systemui.keyguard.DismissCallbackRegistry;
import com.android.systemui.plugins.FalsingManager;
import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.shared.system.QuickStepContract;
import com.android.systemui.shared.system.SysUiStatsLog;
import com.android.systemui.statusbar.CrossFadeHelper;
import com.android.systemui.statusbar.NotificationMediaManager;
import com.android.systemui.statusbar.RemoteInputController;
@@ -319,8 +319,8 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
mKeyguardStateController.notifyKeyguardState(mShowing,
mKeyguardStateController.isOccluded());
reset(true /* hideBouncerWhenShowing */);
StatsLog.write(StatsLog.KEYGUARD_STATE_CHANGED,
StatsLog.KEYGUARD_STATE_CHANGED__STATE__SHOWN);
SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_STATE_CHANGED,
SysUiStatsLog.KEYGUARD_STATE_CHANGED__STATE__SHOWN);
}
/**
@@ -501,8 +501,8 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
public void setOccluded(boolean occluded, boolean animate) {
mStatusBar.setOccluded(occluded);
if (occluded && !mOccluded && mShowing) {
StatsLog.write(StatsLog.KEYGUARD_STATE_CHANGED,
StatsLog.KEYGUARD_STATE_CHANGED__STATE__OCCLUDED);
SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_STATE_CHANGED,
SysUiStatsLog.KEYGUARD_STATE_CHANGED__STATE__OCCLUDED);
if (mStatusBar.isInLaunchTransition()) {
mOccluded = true;
mStatusBar.fadeKeyguardAfterLaunchTransition(null /* beforeFading */,
@@ -516,8 +516,8 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
return;
}
} else if (!occluded && mOccluded && mShowing) {
StatsLog.write(StatsLog.KEYGUARD_STATE_CHANGED,
StatsLog.KEYGUARD_STATE_CHANGED__STATE__SHOWN);
SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_STATE_CHANGED,
SysUiStatsLog.KEYGUARD_STATE_CHANGED__STATE__SHOWN);
}
boolean isOccluding = !mOccluded && occluded;
mOccluded = occluded;
@@ -653,8 +653,8 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
mNotificationShadeWindowController.setKeyguardShowing(false);
mViewMediatorCallback.keyguardGone();
}
StatsLog.write(StatsLog.KEYGUARD_STATE_CHANGED,
StatsLog.KEYGUARD_STATE_CHANGED__STATE__HIDDEN);
SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_STATE_CHANGED,
SysUiStatsLog.KEYGUARD_STATE_CHANGED__STATE__HIDDEN);
}
private boolean needsBypassFading() {