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

Commit 4e81bd4b authored by Jim Miller's avatar Jim Miller
Browse files

Attempt to fix missing transport control in keyguard 

This attempts to fix a bug where the transport control would sometimes be
inoperative.  The problem is that we had two transport control layouts
on some devices because they were being declared in the layout file.

The fix is to only inflate the layout once when KeyguardHostView
is created.

Also removes redundant KeyguardStatusView.

Fixes bug 7254833

Change-Id: Iab84e8326ff745ee57be5177ab2561114c8dc6f0
parent 0944d625

core/res/res/layout/keyguard_widget_region.xml

+1 −4
Original line number Original line Diff line number Diff line
@@ -32,9 +32,6 @@ 
        android:layout_weight="1"

        android:layout_weight="1"

        android:clipChildren="false"

        android:clipChildren="false"

        android:clipToPadding="false">

        android:clipToPadding="false">

            <!-- TODO: Remove this when supported as a widget -->

            <include layout="@layout/keyguard_status_view"/>

            <include layout="@layout/keyguard_transport_control_view"/>

    </com.android.internal.policy.impl.keyguard.KeyguardWidgetPager>

    </com.android.internal.policy.impl.keyguard.KeyguardWidgetPager>

    <LinearLayout

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_width="match_parent"

core/res/res/values/symbols.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -1330,6 +1330,8 @@ 
  <java-symbol type="layout" name="screen_title" />

  <java-symbol type="layout" name="screen_title" />

  <java-symbol type="layout" name="screen_title_icons" />

  <java-symbol type="layout" name="screen_title_icons" />

  <java-symbol type="layout" name="keyguard_host_view" />

  <java-symbol type="layout" name="keyguard_host_view" />

  <java-symbol type="layout" name="keyguard_transport_control_view" />

  <java-symbol type="layout" name="keyguard_status_view" />

  <java-symbol type="string" name="abbrev_wday_month_day_no_year" />

  <java-symbol type="string" name="abbrev_wday_month_day_no_year" />

  <java-symbol type="string" name="android_upgrading_title" />

  <java-symbol type="string" name="android_upgrading_title" />

  <java-symbol type="string" name="bugreport_title" />

  <java-symbol type="string" name="bugreport_title" />

policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

+48 −40
Original line number Original line Diff line number Diff line
@@ -67,6 +67,7 @@ public class KeyguardHostView extends KeyguardViewBase { 
    private AppWidgetHost mAppWidgetHost;

    private AppWidgetHost mAppWidgetHost;

    private KeyguardWidgetPager mAppWidgetContainer;

    private KeyguardWidgetPager mAppWidgetContainer;

    private ViewFlipper mSecurityViewContainer;

    private ViewFlipper mSecurityViewContainer;

    private KeyguardTransportControlView mTransportControl;

    private boolean mEnableMenuKey;

    private boolean mEnableMenuKey;

    private boolean mIsVerifyUnlockOnly;

    private boolean mIsVerifyUnlockOnly;

    private boolean mEnableFallback; // TODO: This should get the value from KeyguardPatternView

    private boolean mEnableFallback; // TODO: This should get the value from KeyguardPatternView
@@ -80,7 +81,6 @@ public class KeyguardHostView extends KeyguardViewBase { 
    private KeyguardSecurityModel mSecurityModel;

    private KeyguardSecurityModel mSecurityModel;





    private Rect mTempRect = new Rect();

    private Rect mTempRect = new Rect();

    private KeyguardTransportControlView mTransportControl;





    /*package*/ interface TransportCallback {

    /*package*/ interface TransportCallback {

        void hide();

        void hide();
@@ -145,45 +145,7 @@ public class KeyguardHostView extends KeyguardViewBase { 
        kgwr.setVisibility(VISIBLE);

        kgwr.setVisibility(VISIBLE);

        mSecurityViewContainer = (ViewFlipper) findViewById(R.id.view_flipper);

        mSecurityViewContainer = (ViewFlipper) findViewById(R.id.view_flipper);





        // This code manages showing/hiding the transport control. We keep it around and only

        addDefaultWidgets();

        // add it to the hierarchy if it needs to be present.

        mTransportControl =

                (KeyguardTransportControlView) findViewById(R.id.keyguard_transport_control);

        if (mTransportControl != null) {

            mTransportControl.setKeyguardCallback(new TransportCallback() {

                boolean mSticky = false;

                @Override

                public void hide() {

                    int page = getWidgetPosition(R.id.keyguard_transport_control);

                    if (page != -1 && !mSticky) {

                        if (page == mAppWidgetContainer.getCurrentPage()) {

                            // Switch back to clock view if music was showing.

                            mAppWidgetContainer

                                .setCurrentPage(getWidgetPosition(R.id.keyguard_status_view));

                        }

                        mAppWidgetContainer.removeView(mTransportControl);

                        // XXX keep view attached to hierarchy so we still get show/hide events

                        // from AudioManager

                        KeyguardHostView.this.addView(mTransportControl);

                        mTransportControl.setVisibility(View.GONE);

                        showAppropriateWidgetPage();

                    }

                }



                @Override

                public void show() {

                    if (getWidgetPosition(R.id.keyguard_transport_control) == -1) {

                        KeyguardHostView.this.removeView(mTransportControl);

                        mAppWidgetContainer.addView(mTransportControl,

                                getWidgetPosition(R.id.keyguard_status_view) + 1);

                        mTransportControl.setVisibility(View.VISIBLE);

                        // Once shown, leave it showing

                        mSticky = true;

                        showAppropriateWidgetPage();

                    }

                }

            });

        }

        updateSecurityViews();

        updateSecurityViews();

        setSystemUiVisibility(getSystemUiVisibility() | View.STATUS_BAR_DISABLE_BACK);

        setSystemUiVisibility(getSystemUiVisibility() | View.STATUS_BAR_DISABLE_BACK);

    }

    }
@@ -702,6 +664,52 @@ public class KeyguardHostView extends KeyguardViewBase { 
        }

        }

    }

    }





    private void addDefaultWidgets() {

        LayoutInflater inflater = LayoutInflater.from(mContext);

        inflater.inflate(R.layout.keyguard_status_view, mAppWidgetContainer, true);

        inflater.inflate(R.layout.keyguard_transport_control_view, mAppWidgetContainer, true);



        mTransportControl =

            (KeyguardTransportControlView) findViewById(R.id.keyguard_transport_control);





        // This code manages showing/hiding the transport control. We keep it around and only

        // add it to the hierarchy if it needs to be present.

        if (mTransportControl != null) {

            mTransportControl.setKeyguardCallback(new TransportCallback() {

                boolean mSticky = false;

                @Override

                public void hide() {

                    int page = getWidgetPosition(R.id.keyguard_transport_control);

                    if (page != -1 && !mSticky) {

                        if (page == mAppWidgetContainer.getCurrentPage()) {

                            // Switch back to clock view if music was showing.

                            mAppWidgetContainer

                                .setCurrentPage(getWidgetPosition(R.id.keyguard_status_view));

                        }

                        mAppWidgetContainer.removeView(mTransportControl);

                        // XXX keep view attached to hierarchy so we still get show/hide events

                        // from AudioManager

                        KeyguardHostView.this.addView(mTransportControl);

                        mTransportControl.setVisibility(View.GONE);

                    }

                }



                @Override

                public void show() {

                    if (getWidgetPosition(R.id.keyguard_transport_control) == -1) {

                        KeyguardHostView.this.removeView(mTransportControl);

                        mAppWidgetContainer.addView(mTransportControl,

                                getWidgetPosition(R.id.keyguard_status_view) + 1);

                        mTransportControl.setVisibility(View.VISIBLE);

                        // Once shown, leave it showing

                        mSticky = true;

                    }

                }

            });

        }

    }



    private void maybePopulateWidgets() {

    private void maybePopulateWidgets() {

        DevicePolicyManager dpm =

        DevicePolicyManager dpm =

                (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);

                (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);