1 files changed, 6 insertions, 63 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
index 19f2b09..96cf093 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -83,8 +83,6 @@ public class StatusBarKeyguardViewManager {
     private boolean mDeviceWillWakeUp;
     private boolean mDeferScrimFadeOut;
 
-    private View mUnlockFab;
-
     public StatusBarKeyguardViewManager(Context context, ViewMediatorCallback callback,
             LockPatternUtils lockPatternUtils) {
         mContext = context;
@@ -103,7 +101,7 @@ public class StatusBarKeyguardViewManager {
         if (mBouncer != null) mBouncer.removeView();
         mFingerprintUnlockController = fingerprintUnlockController;
         mBouncer = new KeyguardBouncer(mContext, mViewMediatorCallback, mLockPatternUtils,
-                mStatusBarWindowManager, container);
+                mStatusBarWindowManager, container, mPhoneStatusBar);
     }
 
     /**
@@ -257,8 +255,8 @@ public class StatusBarKeyguardViewManager {
         mOccluded = occluded;
         mStatusBarWindowManager.setKeyguardOccluded(occluded);
         mPhoneStatusBar.getVisualizer().setOccluded(occluded);
-        if (mUnlockFab != null && mUnlockFab.isAttachedToWindow() && !occluded) {
-            hideUnlockFab();
+        if (!occluded) {
+            mPhoneStatusBar.mKeyguardBottomArea.setVisibility(View.GONE);
         }
         reset(false);
     }
@@ -393,20 +391,9 @@ public class StatusBarKeyguardViewManager {
         }
     }
 
-    /**
-     * Dismisses the keyguard by going to the next screen or making it gone.
-     */
     public void dismiss() {
-        dismiss(false);
-    }
-
-    public void dismiss(boolean focusKeyguardExternalView) {
-        if ((mDeviceInteractive || mDeviceWillWakeUp) && !focusKeyguardExternalView) {
+        if ((mDeviceInteractive || mDeviceWillWakeUp)) {
             showBouncer();
-            hideUnlockFab();
-        } else if (focusKeyguardExternalView) {
-            showUnlockFab();
-            mStatusBarWindowManager.setKeyguardExternalViewFocus(true);
         }
     }
 
@@ -542,7 +529,7 @@ public class StatusBarKeyguardViewManager {
 
     public boolean shouldDisableWindowAnimationsForUnlock() {
         return mPhoneStatusBar.isInLaunchTransition() ||
-                mPhoneStatusBar.mNotificationPanel.hasExternalKeyguardView();
+                mPhoneStatusBar.isShowingLiveLockScreenView();
     }
 
     public boolean isGoingToNotificationShade() {
@@ -566,7 +553,7 @@ public class StatusBarKeyguardViewManager {
                 false /* delayed */, speedUpFactor);
         if (mStatusBarWindowManager.keyguardExternalViewHasFocus()) {
             mStatusBarWindowManager.setKeyguardExternalViewFocus(false);
-            dismiss(false);
+            dismiss();
         }
     }
 
@@ -591,50 +578,6 @@ public class StatusBarKeyguardViewManager {
     }
 
     public void setKeyguardExternalViewFocus(boolean hasFocus) {
-        if (hasFocus) {
-            showUnlockFab();
-        } else {
-            hideUnlockFab();
-        }
         mStatusBarWindowManager.setKeyguardExternalViewFocus(hasFocus);
     }
-
-    private void showUnlockFab() {
-        if (mUnlockFab == null) {
-            mUnlockFab = View.inflate(mContext, R.layout.unlock_fab, null);
-        }
-        if (!mUnlockFab.isAttachedToWindow()) {
-            WindowManager.LayoutParams lp = new WindowManager.LayoutParams(
-                    WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL,
-                    WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
-                            | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH
-                            | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
-                            | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
-                    PixelFormat.TRANSLUCENT);
-            lp.flags |= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;
-            lp.gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL;
-            lp.setTitle("UnlockFab");
-            lp.packageName = mContext.getPackageName();
-            lp.width = lp.height =
-                    mContext.getResources().getDimensionPixelSize(R.dimen.unlock_fab_size);
-            WindowManager wm = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
-            wm.addView(mUnlockFab, lp);
-            mUnlockFab.setOnClickListener(mUnlockFabClickListener);
-        }
-    }
-
-    private void hideUnlockFab() {
-        if (mUnlockFab != null && mUnlockFab.isAttachedToWindow()) {
-            WindowManager wm = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
-            wm.removeViewImmediate(mUnlockFab);
-        }
-    }
-
-    private View.OnClickListener mUnlockFabClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            mStatusBarWindowManager.setKeyguardExternalViewFocus(false);
-            dismiss(false);
-        }
-    };
 }