diff options
22 files changed, 204 insertions, 79 deletions
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java index 07dbf93ce46e..b3465cf00bd0 100644 --- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java +++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java @@ -59,7 +59,7 @@ import com.android.systemui.Prefs; import com.android.systemui.R; import com.android.systemui.SystemUIFactory; import com.android.systemui.classifier.FalsingLog; -import com.android.systemui.classifier.FalsingManager; +import com.android.systemui.classifier.FalsingManagerFactory; import com.android.systemui.fragments.FragmentHostManager; import com.android.systemui.plugins.qs.QS; import com.android.systemui.qs.car.CarQSFragment; @@ -794,7 +794,7 @@ public class CarStatusBar extends StatusBar implements KeyguardUpdateMonitor.getInstance(mContext).dump(fd, pw, args); } - FalsingManager.getInstance(mContext).dump(pw); + FalsingManagerFactory.getInstance(mContext).dump(pw); FalsingLog.dump(pw); pw.println("SharedPreferences:"); diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/FalsingPlugin.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/FalsingPlugin.java index dce02e1a6c56..635932ea3c2b 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/FalsingPlugin.java +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/FalsingPlugin.java @@ -22,7 +22,7 @@ import com.android.systemui.plugins.annotations.ProvidesInterface; * Used to capture Falsing data (related to unlocking the screen). * * The intent is that the data can later be analyzed to validate the quality of the - * {@link com.android.systemui.classifier.FalsingManager}. + * {@link com.android.systemui.classifier.FalsingManagerFactory.FalsingManager}. */ @ProvidesInterface(action = FalsingPlugin.ACTION, version = FalsingPlugin.VERSION) public interface FalsingPlugin extends Plugin { diff --git a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java index f7ecfd7d1205..de49b92fdeb5 100644 --- a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java +++ b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java @@ -34,7 +34,8 @@ import android.view.View; import android.view.ViewConfiguration; import android.view.accessibility.AccessibilityEvent; -import com.android.systemui.classifier.FalsingManager; +import com.android.systemui.classifier.FalsingManagerFactory; +import com.android.systemui.classifier.FalsingManagerFactory.FalsingManager; import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin; import com.android.systemui.statusbar.FlingAnimationUtils; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; @@ -112,7 +113,7 @@ public class SwipeHelper implements Gefingerpoken { mDensityScale = res.getDisplayMetrics().density; mFalsingThreshold = res.getDimensionPixelSize(R.dimen.swipe_helper_falsing_threshold); mFadeDependingOnAmountSwiped = res.getBoolean(R.bool.config_fadeDependingOnAmountSwiped); - mFalsingManager = FalsingManager.getInstance(context); + mFalsingManager = FalsingManagerFactory.getInstance(context); mFlingAnimationUtils = new FlingAnimationUtils(context, getMaxEscapeAnimDuration() / 1000f); } diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java index f9926f3550ec..0fdab014439b 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java @@ -33,7 +33,7 @@ import com.android.internal.widget.LockPatternUtils; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.ViewMediatorCallback; import com.android.systemui.assist.AssistManager; -import com.android.systemui.classifier.FalsingManager; +import com.android.systemui.classifier.FalsingManagerFactory; import com.android.systemui.dock.DockManager; import com.android.systemui.fragments.FragmentService; import com.android.systemui.keyguard.DismissCallbackRegistry; @@ -129,8 +129,9 @@ public class SystemUIFactory { DismissCallbackRegistry dismissCallbackRegistry, KeyguardBouncer.BouncerExpansionCallback expansionCallback) { return new KeyguardBouncer(context, callback, lockPatternUtils, container, - dismissCallbackRegistry, FalsingManager.getInstance(context), expansionCallback, - KeyguardUpdateMonitor.getInstance(context), new Handler(Looper.getMainLooper())); + dismissCallbackRegistry, FalsingManagerFactory.getInstance(context), + expansionCallback, KeyguardUpdateMonitor.getInstance(context), + new Handler(Looper.getMainLooper())); } public ScrimController createScrimController(ScrimView scrimBehind, ScrimView scrimInFront, diff --git a/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerFactory.java b/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerFactory.java new file mode 100644 index 000000000000..0e7c65a8165d --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerFactory.java @@ -0,0 +1,116 @@ +/* + * Copyright (C) 2015 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.classifier; + +import android.content.Context; +import android.net.Uri; +import android.view.MotionEvent; + +import java.io.PrintWriter; + +/** + * When the phone is locked, listens to touch, sensor and phone events and sends them to + * DataCollector and HumanInteractionClassifier. + * + * It does not collect touch events when the bouncer shows up. + */ +public class FalsingManagerFactory { + private static FalsingManager sInstance = null; + + private FalsingManagerFactory() {} + + public static FalsingManager getInstance(Context context) { + if (sInstance == null) { + sInstance = new FalsingManagerImpl(context); + } + return sInstance; + } + + public interface FalsingManager { + void onSucccessfulUnlock(); + + void onNotificationActive(); + + void setShowingAod(boolean showingAod); + + void onNotificatonStartDraggingDown(); + + boolean isUnlockingDisabled(); + + boolean isFalseTouch(); + + void onNotificatonStopDraggingDown(); + + void setNotificationExpanded(); + + boolean isClassiferEnabled(); + + void onQsDown(); + + void setQsExpanded(boolean expanded); + + boolean shouldEnforceBouncer(); + + void onTrackingStarted(boolean secure); + + void onTrackingStopped(); + + void onLeftAffordanceOn(); + + void onCameraOn(); + + void onAffordanceSwipingStarted(boolean rightCorner); + + void onAffordanceSwipingAborted(); + + void onStartExpandingFromPulse(); + + void onExpansionFromPulseStopped(); + + Uri reportRejectedTouch(); + + void onScreenOnFromTouch(); + + boolean isReportingEnabled(); + + void onUnlockHintStarted(); + + void onCameraHintStarted(); + + void onLeftAffordanceHintStarted(); + + void onScreenTurningOn(); + + void onScreenOff(); + + void onNotificatonStopDismissing(); + + void onNotificationDismissed(); + + void onNotificatonStartDismissing(); + + void onNotificationDoubleTap(boolean accepted, float dx, float dy); + + void onBouncerShown(); + + void onBouncerHidden(); + + void onTouchEvent(MotionEvent ev, int width, int height); + + void dump(PrintWriter pw); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/classifier/FalsingManager.java b/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerImpl.java index d4e7bbca1107..9052093346cb 100644 --- a/packages/SystemUI/src/com/android/systemui/classifier/FalsingManager.java +++ b/packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2019 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. @@ -11,7 +11,7 @@ * 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 + * limitations under the License. */ package com.android.systemui.classifier; @@ -49,7 +49,7 @@ import java.io.PrintWriter; * * It does not collect touch events when the bouncer shows up. */ -public class FalsingManager implements SensorEventListener, StateListener { +public class FalsingManagerImpl implements FalsingManagerFactory.FalsingManager { private static final String ENFORCE_BOUNCER = "falsing_manager_enforce_bouncer"; private static final int[] CLASSIFIER_SENSORS = new int[] { @@ -75,8 +75,6 @@ public class FalsingManager implements SensorEventListener, StateListener { private final AccessibilityManager mAccessibilityManager; private final UiOffloadThread mUiOffloadThread; - private static FalsingManager sInstance = null; - private boolean mEnforceBouncer = false; private boolean mBouncerOn = false; private boolean mBouncerOffOnDown = false; @@ -89,6 +87,33 @@ public class FalsingManager implements SensorEventListener, StateListener { private int mIsFalseTouchCalls; private MetricsLogger mMetricsLogger; + private SensorEventListener mSensorEventListener = new SensorEventListener() { + @Override + public synchronized void onSensorChanged(SensorEvent event) { + mDataCollector.onSensorChanged(event); + mHumanInteractionClassifier.onSensorChanged(event); + } + + @Override + public void onAccuracyChanged(Sensor sensor, int accuracy) { + mDataCollector.onAccuracyChanged(sensor, accuracy); + } + }; + + public StateListener mStatusBarStateListener = new StateListener() { + @Override + public void onStateChanged(int newState) { + if (FalsingLog.ENABLED) { + FalsingLog.i("setStatusBarState", new StringBuilder() + .append("from=").append(StatusBarState.toShortString(mState)) + .append(" to=").append(StatusBarState.toShortString(newState)) + .toString()); + } + mState = newState; + updateSessionActive(); + } + }; + protected final ContentObserver mSettingsObserver = new ContentObserver(mHandler) { @Override public void onChange(boolean selfChange) { @@ -96,7 +121,7 @@ public class FalsingManager implements SensorEventListener, StateListener { } }; - private FalsingManager(Context context) { + FalsingManagerImpl(Context context) { mContext = context; mSensorManager = Dependency.get(AsyncSensorManager.class); mAccessibilityManager = context.getSystemService(AccessibilityManager.class); @@ -112,14 +137,7 @@ public class FalsingManager implements SensorEventListener, StateListener { UserHandle.USER_ALL); updateConfiguration(); - Dependency.get(StatusBarStateController.class).addCallback(this); - } - - public static FalsingManager getInstance(Context context) { - if (sInstance == null) { - sInstance = new FalsingManager(context); - } - return sInstance; + Dependency.get(StatusBarStateController.class).addCallback(mStatusBarStateListener); } private void updateConfiguration() { @@ -128,13 +146,14 @@ public class FalsingManager implements SensorEventListener, StateListener { } private boolean shouldSessionBeActive() { - if (FalsingLog.ENABLED && FalsingLog.VERBOSE) + if (FalsingLog.ENABLED && FalsingLog.VERBOSE) { FalsingLog.v("shouldBeActive", new StringBuilder() .append("enabled=").append(isEnabled() ? 1 : 0) .append(" mScreenOn=").append(mScreenOn ? 1 : 0) .append(" mState=").append(StatusBarState.toShortString(mState)) .toString() ); + } return isEnabled() && mScreenOn && (mState == StatusBarState.KEYGUARD) && !mShowingAod; } @@ -160,7 +179,7 @@ public class FalsingManager implements SensorEventListener, StateListener { // This can be expensive, and doesn't need to happen on the main thread. mUiOffloadThread.submit(() -> { - mSensorManager.unregisterListener(this); + mSensorManager.unregisterListener(mSensorEventListener); }); } } @@ -200,7 +219,8 @@ public class FalsingManager implements SensorEventListener, StateListener { // This can be expensive, and doesn't need to happen on the main thread. mUiOffloadThread.submit(() -> { - mSensorManager.registerListener(this, s, SensorManager.SENSOR_DELAY_GAME); + mSensorManager.registerListener( + mSensorEventListener, s, SensorManager.SENSOR_DELAY_GAME); }); } } @@ -284,16 +304,6 @@ public class FalsingManager implements SensorEventListener, StateListener { } } - @Override - public synchronized void onSensorChanged(SensorEvent event) { - mDataCollector.onSensorChanged(event); - mHumanInteractionClassifier.onSensorChanged(event); - } - - @Override - public void onAccuracyChanged(Sensor sensor, int accuracy) { - mDataCollector.onAccuracyChanged(sensor, accuracy); - } public boolean shouldEnforceBouncer() { return mEnforceBouncer; @@ -304,18 +314,6 @@ public class FalsingManager implements SensorEventListener, StateListener { updateSessionActive(); } - @Override - public void onStateChanged(int newState) { - if (FalsingLog.ENABLED) { - FalsingLog.i("setStatusBarState", new StringBuilder() - .append("from=").append(StatusBarState.toShortString(mState)) - .append(" to=").append(StatusBarState.toShortString(newState)) - .toString()); - } - mState = newState; - updateSessionActive(); - } - public void onScreenTurningOn() { if (FalsingLog.ENABLED) { FalsingLog.i("onScreenTurningOn", new StringBuilder() @@ -399,8 +397,8 @@ public class FalsingManager implements SensorEventListener, StateListener { if (FalsingLog.ENABLED) { FalsingLog.i("onTrackingStarted", ""); } - mHumanInteractionClassifier.setType(secure ? - Classifier.BOUNCER_UNLOCK : Classifier.UNLOCK); + mHumanInteractionClassifier.setType(secure + ? Classifier.BOUNCER_UNLOCK : Classifier.UNLOCK); mDataCollector.onTrackingStarted(); } diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java b/packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java index 5196ec639453..8694d2ad607c 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java @@ -28,7 +28,7 @@ import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.SystemUIApplication; -import com.android.systemui.classifier.FalsingManager; +import com.android.systemui.classifier.FalsingManagerFactory; import com.android.systemui.dock.DockManager; import com.android.systemui.statusbar.phone.DozeParameters; import com.android.systemui.util.AsyncSensorManager; @@ -63,7 +63,7 @@ public class DozeFactory { DozeMachine machine = new DozeMachine(wrappedService, config, wakeLock); machine.setParts(new DozeMachine.Part[]{ new DozePauser(handler, machine, alarmManager, params.getPolicy()), - new DozeFalsingManagerAdapter(FalsingManager.getInstance(context)), + new DozeFalsingManagerAdapter(FalsingManagerFactory.getInstance(context)), createDozeTriggers(context, sensorManager, host, alarmManager, config, params, handler, wakeLock, machine, dockManager), createDozeUi(context, host, wakeLock, machine, handler, alarmManager, params), diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeFalsingManagerAdapter.java b/packages/SystemUI/src/com/android/systemui/doze/DozeFalsingManagerAdapter.java index 00ca9a48386e..f6df9062d9f4 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeFalsingManagerAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeFalsingManagerAdapter.java @@ -16,7 +16,7 @@ package com.android.systemui.doze; -import com.android.systemui.classifier.FalsingManager; +import com.android.systemui.classifier.FalsingManagerFactory.FalsingManager; /** * Notifies FalsingManager of whether or not AOD is showing. diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 1fa6ad6d30ca..98f36e466ce5 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -83,7 +83,7 @@ import com.android.systemui.Dependency; import com.android.systemui.SystemUI; import com.android.systemui.SystemUIFactory; import com.android.systemui.UiOffloadThread; -import com.android.systemui.classifier.FalsingManager; +import com.android.systemui.classifier.FalsingManagerFactory; import com.android.systemui.statusbar.phone.BiometricUnlockController; import com.android.systemui.statusbar.phone.NotificationPanelView; import com.android.systemui.statusbar.phone.StatusBar; @@ -1594,7 +1594,7 @@ public class KeyguardViewMediator extends SystemUI { Trace.beginSection("KeyguardViewMediator#handleMessage START_KEYGUARD_EXIT_ANIM"); StartKeyguardExitAnimParams params = (StartKeyguardExitAnimParams) msg.obj; handleStartKeyguardExitAnimation(params.startTime, params.fadeoutDuration); - FalsingManager.getInstance(mContext).onSucccessfulUnlock(); + FalsingManagerFactory.getInstance(mContext).onSucccessfulUnlock(); Trace.endSection(); break; case KEYGUARD_DONE_PENDING_TIMEOUT: diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java index 8a86826cd01d..0dc80bf3cc6e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java @@ -29,7 +29,8 @@ import com.android.systemui.ExpandHelper; import com.android.systemui.Gefingerpoken; import com.android.systemui.Interpolators; import com.android.systemui.R; -import com.android.systemui.classifier.FalsingManager; +import com.android.systemui.classifier.FalsingManagerFactory; +import com.android.systemui.classifier.FalsingManagerFactory.FalsingManager; import com.android.systemui.statusbar.notification.row.ExpandableView; /** @@ -65,7 +66,7 @@ public class DragDownHelper implements Gefingerpoken { mCallback = callback; mDragDownCallback = dragDownCallback; mHost = host; - mFalsingManager = FalsingManager.getInstance(context); + mFalsingManager = FalsingManagerFactory.getInstance(context); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt b/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt index e5dbcd374169..952f30f9e9c0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt @@ -30,7 +30,8 @@ import android.view.ViewConfiguration import com.android.systemui.Gefingerpoken import com.android.systemui.Interpolators import com.android.systemui.R -import com.android.systemui.classifier.FalsingManager +import com.android.systemui.classifier.FalsingManagerFactory +import com.android.systemui.classifier.FalsingManagerFactory.FalsingManager import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow import com.android.systemui.statusbar.notification.row.ExpandableView @@ -81,7 +82,7 @@ constructor(context: Context, mMinDragDistance = context.resources.getDimensionPixelSize( R.dimen.keyguard_drag_down_min_distance) mTouchSlop = ViewConfiguration.get(context).scaledTouchSlop.toFloat() - mFalsingManager = FalsingManager.getInstance(context) + mFalsingManager = FalsingManagerFactory.getInstance(context) mPowerManager = context.getSystemService(PowerManager::class.java) } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java index c34d567da0be..53d6efbea4e9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java @@ -19,7 +19,6 @@ package com.android.systemui.statusbar.notification.row; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; -import android.animation.TimeAnimator; import android.animation.ValueAnimator; import android.content.Context; import android.graphics.Canvas; @@ -36,7 +35,8 @@ import android.view.animation.PathInterpolator; import com.android.systemui.Interpolators; import com.android.systemui.R; -import com.android.systemui.classifier.FalsingManager; +import com.android.systemui.classifier.FalsingManagerFactory; +import com.android.systemui.classifier.FalsingManagerFactory.FalsingManager; import com.android.systemui.statusbar.NotificationShelf; import com.android.systemui.statusbar.notification.FakeShadowView; import com.android.systemui.statusbar.notification.NotificationUtils; @@ -174,7 +174,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView setClipChildren(false); setClipToPadding(false); updateColors(); - mFalsingManager = FalsingManager.getInstance(context); + mFalsingManager = FalsingManagerFactory.getInstance(context); mAccessibilityManager = AccessibilityManager.getInstance(mContext); mDoubleTapHelper = new DoubleTapHelper(this, (active) -> { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java index 1ef29c1b8080..24c7b2917360 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java @@ -76,7 +76,8 @@ import com.android.internal.widget.CachingIconView; import com.android.systemui.Dependency; import com.android.systemui.Interpolators; import com.android.systemui.R; -import com.android.systemui.classifier.FalsingManager; +import com.android.systemui.classifier.FalsingManagerFactory; +import com.android.systemui.classifier.FalsingManagerFactory.FalsingManager; import com.android.systemui.plugins.PluginListener; import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin; import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin.MenuItem; @@ -1646,7 +1647,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView public ExpandableNotificationRow(Context context, AttributeSet attrs) { super(context, attrs); - mFalsingManager = FalsingManager.getInstance(context); + mFalsingManager = FalsingManagerFactory.getInstance(context); mNotificationInflater = new NotificationContentInflater(this); mMenuRow = new NotificationMenuRow(mContext); mImageResolver = new NotificationInlineImageResolver(context, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java index 0e7feaa30cdb..642e2e483d89 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java @@ -84,7 +84,8 @@ import com.android.systemui.ExpandHelper; import com.android.systemui.Interpolators; import com.android.systemui.R; import com.android.systemui.SwipeHelper; -import com.android.systemui.classifier.FalsingManager; +import com.android.systemui.classifier.FalsingManagerFactory; +import com.android.systemui.classifier.FalsingManagerFactory.FalsingManager; import com.android.systemui.colorextraction.SysuiColorExtractor; import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin; import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin.MenuItem; @@ -534,7 +535,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd getContext(), mMenuEventListener); mStackScrollAlgorithm = createStackScrollAlgorithm(context); initView(context); - mFalsingManager = FalsingManager.getInstance(context); + mFalsingManager = FalsingManagerFactory.getInstance(context); mShouldDrawNotificationBackground = res.getBoolean(R.bool.config_drawNotificationBackground); mFadeNotificationsOnDismiss = diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java index cd0a43ed3bf6..dd70321c8c30 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java @@ -27,7 +27,8 @@ import android.view.ViewConfiguration; import com.android.systemui.Interpolators; import com.android.systemui.R; -import com.android.systemui.classifier.FalsingManager; +import com.android.systemui.classifier.FalsingManagerFactory; +import com.android.systemui.classifier.FalsingManagerFactory.FalsingManager; import com.android.systemui.statusbar.FlingAnimationUtils; import com.android.systemui.statusbar.KeyguardAffordanceView; @@ -101,7 +102,7 @@ public class KeyguardAffordanceHelper { mHintGrowAmount = mContext.getResources().getDimensionPixelSize(R.dimen.hint_grow_amount_sideways); mFlingAnimationUtils = new FlingAnimationUtils(mContext, 0.4f); - mFalsingManager = FalsingManager.getInstance(mContext); + mFalsingManager = FalsingManagerFactory.getInstance(mContext); } private void initIcons() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java index 3c2881d14f91..1a43eec3e601 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java @@ -43,7 +43,7 @@ import com.android.keyguard.KeyguardUpdateMonitorCallback; import com.android.keyguard.R; import com.android.keyguard.ViewMediatorCallback; import com.android.systemui.DejankUtils; -import com.android.systemui.classifier.FalsingManager; +import com.android.systemui.classifier.FalsingManagerFactory.FalsingManager; import com.android.systemui.keyguard.DismissCallbackRegistry; import java.io.PrintWriter; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index d52180993b33..9d24e1efc66a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -59,7 +59,8 @@ import com.android.systemui.DejankUtils; import com.android.systemui.Dependency; import com.android.systemui.Interpolators; import com.android.systemui.R; -import com.android.systemui.classifier.FalsingManager; +import com.android.systemui.classifier.FalsingManagerFactory; +import com.android.systemui.classifier.FalsingManagerFactory.FalsingManager; import com.android.systemui.fragments.FragmentHostManager; import com.android.systemui.fragments.FragmentHostManager.FragmentListener; import com.android.systemui.plugins.qs.QS; @@ -348,7 +349,7 @@ public class NotificationPanelView extends PanelView implements super(context, attrs); setWillNotDraw(!DEBUG); mInjectionInflationController = injectionInflationController; - mFalsingManager = FalsingManager.getInstance(context); + mFalsingManager = FalsingManagerFactory.getInstance(context); mPowerManager = context.getSystemService(PowerManager.class); mWakeUpCoordinator = coordinator; mAccessibilityManager = context.getSystemService(AccessibilityManager.class); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java index 24389f2fec8e..38c5f2ec5c44 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java @@ -42,7 +42,8 @@ import com.android.systemui.DejankUtils; import com.android.systemui.Dependency; import com.android.systemui.Interpolators; import com.android.systemui.R; -import com.android.systemui.classifier.FalsingManager; +import com.android.systemui.classifier.FalsingManagerFactory; +import com.android.systemui.classifier.FalsingManagerFactory.FalsingManager; import com.android.systemui.doze.DozeLog; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.statusbar.FlingAnimationUtils; @@ -212,7 +213,7 @@ public abstract class PanelView extends FrameLayout { 0.5f /* maxLengthSeconds */, 0.2f /* speedUpFactor */, 0.6f /* x2 */, 0.84f /* y2 */); mBounceInterpolator = new BounceInterpolator(); - mFalsingManager = FalsingManager.getInstance(context); + mFalsingManager = FalsingManagerFactory.getInstance(context); mNotificationsDragEnabled = getResources().getBoolean(R.bool.config_enableNotificationShadeDrag); mVibratorHelper = Dependency.get(VibratorHelper.class); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 1fc40b42c552..c01367a4d213 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -148,7 +148,8 @@ import com.android.systemui.assist.AssistManager; import com.android.systemui.bubbles.BubbleController; import com.android.systemui.charging.WirelessChargingAnimation; import com.android.systemui.classifier.FalsingLog; -import com.android.systemui.classifier.FalsingManager; +import com.android.systemui.classifier.FalsingManagerFactory; +import com.android.systemui.classifier.FalsingManagerFactory.FalsingManager; import com.android.systemui.colorextraction.SysuiColorExtractor; import com.android.systemui.doze.DozeHost; import com.android.systemui.doze.DozeLog; @@ -760,7 +761,7 @@ public class StatusBar extends SystemUI implements DemoMode, putComponent(DozeHost.class, mDozeServiceHost); mScreenPinningRequest = new ScreenPinningRequest(mContext); - mFalsingManager = FalsingManager.getInstance(mContext); + mFalsingManager = FalsingManagerFactory.getInstance(mContext); Dependency.get(ActivityStarterDelegate.class).setActivityStarterImpl(this); @@ -2353,7 +2354,7 @@ public class StatusBar extends SystemUI implements DemoMode, mKeyguardUpdateMonitor.dump(fd, pw, args); } - FalsingManager.getInstance(mContext).dump(pw); + FalsingManagerFactory.getInstance(mContext).dump(pw); FalsingLog.dump(pw); pw.println("SharedPreferences:"); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java index 44996acafc63..6185b4c5cff7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java @@ -62,7 +62,8 @@ import com.android.internal.widget.FloatingToolbar; import com.android.systemui.Dependency; import com.android.systemui.ExpandHelper; import com.android.systemui.R; -import com.android.systemui.classifier.FalsingManager; +import com.android.systemui.classifier.FalsingManagerFactory; +import com.android.systemui.classifier.FalsingManagerFactory.FalsingManager; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.statusbar.DragDownHelper; import com.android.systemui.statusbar.StatusBarState; @@ -153,7 +154,7 @@ public class StatusBarWindowView extends FrameLayout { setMotionEventSplittingEnabled(false); mTransparentSrcPaint.setColor(0); mTransparentSrcPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC)); - mFalsingManager = FalsingManager.getInstance(context); + mFalsingManager = FalsingManagerFactory.getInstance(context); mGestureDetector = new GestureDetector(context, mGestureListener); mStatusBarStateController = Dependency.get(StatusBarStateController.class); Dependency.get(TunerService.class).addTunable(mTunable, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java index 8fe0c706b1ea..c4891ecd034b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java @@ -48,7 +48,7 @@ import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.ViewMediatorCallback; import com.android.systemui.DejankUtils; import com.android.systemui.SysuiTestCase; -import com.android.systemui.classifier.FalsingManager; +import com.android.systemui.classifier.FalsingManagerFactory.FalsingManager; import com.android.systemui.keyguard.DismissCallbackRegistry; import com.android.systemui.plugins.ActivityStarter.OnDismissAction; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java index fb16465d3486..747d75b4cdc1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java @@ -78,7 +78,7 @@ import com.android.systemui.UiOffloadThread; import com.android.systemui.appops.AppOpsController; import com.android.systemui.assist.AssistManager; import com.android.systemui.bubbles.BubbleController; -import com.android.systemui.classifier.FalsingManager; +import com.android.systemui.classifier.FalsingManagerFactory.FalsingManager; import com.android.systemui.doze.DozeHost; import com.android.systemui.doze.DozeLog; import com.android.systemui.keyguard.KeyguardViewMediator; |