Revert "Initial support for OnePlus in-display fingerprint sensor"

This reverts commit 339db83. Signed-off-by: sayan7848 <[email protected]>
LiquidRemix · Sep 2, 2019 · 16705bd · 16705bd
1 parent 9c7af8c
commit 16705bd
Show file tree

Hide file tree

Showing 16 changed files with 5 additions and 486 deletions.
diff --git a/core/java/com/android/internal/statusbar/IStatusBar.aidl b/core/java/com/android/internal/statusbar/IStatusBar.aidl
@@ -146,7 +146,6 @@ oneway interface IStatusBar
     void onFingerprintError(String error);
     // Used to hide the fingerprint dialog when the authenticationclient is stopped
     void hideFingerprintDialog();
-    void handleInDisplayFingerprintView(boolean show, boolean isEnrolling);
 
     /**
      * LIQUID

diff --git a/core/java/com/android/internal/statusbar/IStatusBarService.aidl b/core/java/com/android/internal/statusbar/IStatusBarService.aidl
@@ -102,7 +102,6 @@ interface IStatusBarService
     void onFingerprintError(String error);
     // Used to hide the fingerprint dialog when the authenticationclient is stopped
     void hideFingerprintDialog();
-    void handleInDisplayFingerprintView(boolean show, boolean isEnrolling);
 
     /**
      * LIQUID

diff --git a/core/res/res/values/custom_config.xml b/core/res/res/values/custom_config.xml
@@ -204,9 +204,4 @@
     <!-- Whether or not we should show vendor mismatch message -->
     <bool name="config_show_vendor_mismatch_message">false</bool>
 
-    <!-- Show a custom view for FOD -->
-    <bool name="config_needCustomFODView">false</bool>
-
-    <bool name="config_usesOnePlusFOD">false</bool>
-
 </resources>
diff --git a/core/res/res/values/custom_symbols.xml b/core/res/res/values/custom_symbols.xml
@@ -289,7 +289,4 @@
   <!-- Whether or not we should show vendor mismatch message -->
   <java-symbol type="bool" name="config_show_vendor_mismatch_message" />
 
-  <!-- FoD -->
-  <java-symbol type="bool" name="config_needCustomFODView" />
-  <java-symbol type="bool" name="config_usesOnePlusFOD" />
 </resources>
diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk
@@ -60,9 +60,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     SystemUI-proto \
     trail-drawing \
     rebound \
-    guava \
-    vendor.oneplus.fingerprint.extension-V1.0-java \
-    vendor.oneplus.hardware.display-V1.0-java
+    guava
 
 LOCAL_JAVA_LIBRARIES := telephony-common \
     android.car \

diff --git a/packages/SystemUI/res/drawable-xxhdpi/fod_icon_default.png b/packages/SystemUI/res/drawable-xxhdpi/fod_icon_default.png
diff --git a/packages/SystemUI/res/drawable-xxhdpi/fod_icon_empty.png b/packages/SystemUI/res/drawable-xxhdpi/fod_icon_empty.png
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
@@ -349,7 +349,6 @@
         <item>com.android.systemui.globalactions.GlobalActionsComponent</item>
         <item>com.android.systemui.ScreenDecorations</item>
         <item>com.android.systemui.fingerprint.FingerprintDialogImpl</item>
-        <item>com.android.systemui.fingerprint.FODCircleViewImpl</item>
         <item>com.android.systemui.SliceBroadcastRelayHandler</item>
     </string-array>
 

diff --git a/packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleView.java b/packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleView.java
diff --git a/packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleViewImpl.java b/packages/SystemUI/src/com/android/systemui/fingerprint/FODCircleViewImpl.java