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

Merge "Don't skip falsing on non-foldable devices" into tm-qpr-dev

Browse Source
This commit is contained in:
András Kurucz
2023-02-17 21:52:09 +00:00
committed by Android (Google) Code Review
parent 8649923e12 58649a6c1b
commit 55940174fd
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/classifier/BrightLineFalsingManager.java
View File

@@ -402,7 +402,7 @@ public class BrightLineFalsingManager implements FalsingManager {
|| mAccessibilityManager.isTouchExplorationEnabled()
|| mDataProvider.isA11yAction()
|| (mFeatureFlags.isEnabled(Flags.FALSING_OFF_FOR_UNFOLDED)
&& !mDataProvider.isFolded());
&& mDataProvider.isUnfolded());
}
@Override

4
packages/SystemUI/src/com/android/systemui/classifier/FalsingDataProvider.java
View File

@@ -380,8 +380,8 @@ public class FalsingDataProvider {
return mBatteryController.isWirelessCharging() || mDockManager.isDocked();
}
public boolean isFolded() {
return Boolean.TRUE.equals(mFoldStateListener.getFolded());
public boolean isUnfolded() {
return Boolean.FALSE.equals(mFoldStateListener.getFolded());
}
/** Implement to be alerted abotu the beginning and ending of falsing tracking. */

2
packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineClassifierTest.java
View File

@@ -106,7 +106,7 @@ public class BrightLineClassifierTest extends SysuiTestCase {
mClassifiers.add(mClassifierB);
when(mFalsingDataProvider.getRecentMotionEvents()).thenReturn(mMotionEventList);
when(mKeyguardStateController.isShowing()).thenReturn(true);
when(mFalsingDataProvider.isFolded()).thenReturn(true);
when(mFalsingDataProvider.isUnfolded()).thenReturn(false);
mBrightLineFalsingManager = new BrightLineFalsingManager(mFalsingDataProvider,
mMetricsLogger, mClassifiers, mSingleTapClassfier, mLongTapClassifier,
mDoubleTapClassifier, mHistoryTracker, mKeyguardStateController,

4
packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineFalsingManagerTest.java
View File

@@ -89,7 +89,7 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase {
mClassifiers.add(mClassifierA);
when(mFalsingDataProvider.getRecentMotionEvents()).thenReturn(mMotionEventList);
when(mKeyguardStateController.isShowing()).thenReturn(true);
when(mFalsingDataProvider.isFolded()).thenReturn(true);
when(mFalsingDataProvider.isUnfolded()).thenReturn(false);
mBrightLineFalsingManager = new BrightLineFalsingManager(mFalsingDataProvider,
mMetricsLogger, mClassifiers, mSingleTapClassifier, mLongTapClassifier,
mDoubleTapClassifier, mHistoryTracker, mKeyguardStateController,
@@ -185,7 +185,7 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase {
@Test
public void testSkipUnfolded() {
assertThat(mBrightLineFalsingManager.isFalseTouch(Classifier.GENERIC)).isTrue();
when(mFalsingDataProvider.isFolded()).thenReturn(false);
when(mFalsingDataProvider.isUnfolded()).thenReturn(true);
assertThat(mBrightLineFalsingManager.isFalseTouch(Classifier.GENERIC)).isFalse();
}
}

10
packages/SystemUI/tests/src/com/android/systemui/classifier/FalsingDataProviderTest.java
View File

@@ -324,12 +324,18 @@ public class FalsingDataProviderTest extends ClassifierTest {
@Test
public void test_FoldedState_Folded() {
when(mFoldStateListener.getFolded()).thenReturn(true);
assertThat(mDataProvider.isFolded()).isTrue();
assertThat(mDataProvider.isUnfolded()).isFalse();
}
@Test
public void test_FoldedState_Unfolded() {
when(mFoldStateListener.getFolded()).thenReturn(false);
assertThat(mDataProvider.isFolded()).isFalse();
assertThat(mDataProvider.isUnfolded()).isTrue();
}
@Test
public void test_FoldedState_NotFoldable() {
when(mFoldStateListener.getFolded()).thenReturn(null);
assertThat(mDataProvider.isUnfolded()).isFalse();
}
}