Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51e4f391 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 495bd54c: am 42b7b692: Merge "Revert "Fix dodgy states of keyguard... 

am 495bd54c: am 42b7b692: Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev

* commit '495bd54c':
  Revert "Fix dodgy states of keyguard transport controls"
parents 72950e65 495bd54c

packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java

+8 −17
Original line number Original line Diff line number Diff line
@@ -16,6 +16,10 @@ 




package com.android.keyguard;

package com.android.keyguard;





import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.keyguard.KeyguardUpdateMonitor.DisplayClientState;



import android.app.Activity;

import android.app.Activity;

import android.app.ActivityManager;

import android.app.ActivityManager;

import android.app.ActivityOptions;

import android.app.ActivityOptions;
@@ -51,9 +55,6 @@ import android.view.MotionEvent; 
import android.view.View;

import android.view.View;

import android.view.WindowManager;

import android.view.WindowManager;

import android.widget.RemoteViews.OnClickHandler;

import android.widget.RemoteViews.OnClickHandler;

import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.keyguard.KeyguardUpdateMonitor.DisplayClientState;





import java.io.File;

import java.io.File;

import java.lang.ref.WeakReference;

import java.lang.ref.WeakReference;
@@ -279,7 +280,7 @@ public class KeyguardHostView extends KeyguardViewBase { 
            if (newState != mTransportState) {

            if (newState != mTransportState) {

                mTransportState = newState;

                mTransportState = newState;

                if (DEBUGXPORT) Log.v(TAG, "update widget: transport state changed");

                if (DEBUGXPORT) Log.v(TAG, "update widget: transport state changed");

                KeyguardHostView.this.postShowAppropriateWidgetPage();

                KeyguardHostView.this.post(mSwitchPageRunnable);

            }

            }

        }

        }

        @Override

        @Override
@@ -291,7 +292,7 @@ public class KeyguardHostView extends KeyguardViewBase { 
                if (newState != mTransportState) {

                if (newState != mTransportState) {

                    mTransportState = newState;

                    mTransportState = newState;

                    if (DEBUGXPORT) Log.v(TAG, "update widget: play state changed");

                    if (DEBUGXPORT) Log.v(TAG, "update widget: play state changed");

                    KeyguardHostView.this.postShowAppropriateWidgetPage();

                    KeyguardHostView.this.post(mSwitchPageRunnable);

                }

                }

            }

            }

        }

        }
@@ -495,7 +496,6 @@ public class KeyguardHostView extends KeyguardViewBase { 
    @Override

    @Override

    protected void onDetachedFromWindow() {

    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        super.onDetachedFromWindow();

        removeCallbacks(mSwitchPageRunnable);

        mAppWidgetHost.stopListening();

        mAppWidgetHost.stopListening();

        KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mUpdateMonitorCallbacks);

        KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mUpdateMonitorCallbacks);

    }

    }
@@ -1438,7 +1438,7 @@ public class KeyguardHostView extends KeyguardViewBase { 
        mAppWidgetToShow = ss.appWidgetToShow;

        mAppWidgetToShow = ss.appWidgetToShow;

        setInsets(ss.insets);

        setInsets(ss.insets);

        if (DEBUG) Log.d(TAG, "onRestoreInstanceState, transport=" + mTransportState);

        if (DEBUG) Log.d(TAG, "onRestoreInstanceState, transport=" + mTransportState);

        postShowAppropriateWidgetPage();

        post(mSwitchPageRunnable);

    }

    }





    @Override

    @Override
@@ -1471,22 +1471,13 @@ public class KeyguardHostView extends KeyguardViewBase { 
        }

        }

    }

    }





    void showAppropriateWidgetPage() {

    private void showAppropriateWidgetPage() {

        int state = mTransportState;

        int state = mTransportState;

        ensureTransportPresentOrRemoved(state);

        ensureTransportPresentOrRemoved(state);

        if (mAppWidgetContainer.isLayoutRequested()) {

            postShowAppropriateWidgetPage();

            return;

        }

        int pageToShow = getAppropriateWidgetPage(state);

        int pageToShow = getAppropriateWidgetPage(state);

        mAppWidgetContainer.setCurrentPage(pageToShow);

        mAppWidgetContainer.setCurrentPage(pageToShow);

    }

    }





    void postShowAppropriateWidgetPage() {

        removeCallbacks(mSwitchPageRunnable);

        post(mSwitchPageRunnable);

    }



    /**

    /**

     * Examines the current state and adds the transport to the widget pager when the state changes.

     * Examines the current state and adds the transport to the widget pager when the state changes.

     *

     *

packages/Keyguard/src/com/android/keyguard/KeyguardWidgetPager.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@ import android.view.accessibility.AccessibilityManager; 
import android.view.animation.DecelerateInterpolator;

import android.view.animation.DecelerateInterpolator;

import android.widget.FrameLayout;

import android.widget.FrameLayout;

import android.widget.TextClock;

import android.widget.TextClock;



import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.LockPatternUtils;





import java.util.ArrayList;

import java.util.ArrayList;