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

Commit 5189fca3 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

Merge commit '9a962d7c' into HEAD

parents d931827f 9a962d7c

core/res/res/layout/keyguard_sim_pin_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
    android:gravity="center_horizontal">



    <ImageView

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:src="@drawable/ic_lockscreen_sim"/>

core/res/res/layout/keyguard_sim_puk_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
    android:gravity="center_horizontal">



    <ImageView

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:src="@drawable/ic_lockscreen_sim"/>

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

+10 −0
Original line number Diff line number Diff line
@@ -188,6 +188,16 @@ public class CameraWidgetFrame extends KeyguardWidgetFrame implements View.OnCli 
        return iv;

    }



    @Override

    public void setPivotX(float pivotX) {

        // don't pivot me

    }



    @Override

    public void setPivotY(float pivotY) {

        // don't pivot me

    }



    public void render() {

        final Throwable[] thrown = new Throwable[1];

        final Bitmap[] offscreen = new Bitmap[1];

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

+4 −12
Original line number Diff line number Diff line
@@ -924,7 +924,10 @@ public class KeyguardHostView extends KeyguardViewBase { 
            pickIntent.putExtra(AppWidgetManager.EXTRA_CATEGORY_FILTER,

                    AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD);



            pickIntent.putExtra(Intent.EXTRA_INTENT, getBaseIntent());

            Bundle options = new Bundle();

            options.putInt(AppWidgetManager.OPTION_APPWIDGET_HOST_CATEGORY,

                    AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD);

            pickIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_OPTIONS, options);

            pickIntent.addFlags(

                    Intent.FLAG_ACTIVITY_NEW_TASK

                    | Intent.FLAG_ACTIVITY_SINGLE_TOP
@@ -937,17 +940,6 @@ public class KeyguardHostView extends KeyguardViewBase { 
        }

    }



    private Intent getBaseIntent() {

        Intent baseIntent = new Intent(Intent.ACTION_MAIN, null);

        baseIntent.addCategory(Intent.CATEGORY_DEFAULT);



        Bundle options = new Bundle();

        options.putInt(AppWidgetManager.OPTION_APPWIDGET_HOST_CATEGORY,

                AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD);

        baseIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_OPTIONS, options);

        return baseIntent;

    }



    private void removeTransportFromWidgetPager() {

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

        if (page != -1) {

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

+3 −1
Original line number Diff line number Diff line
@@ -881,8 +881,10 @@ public class KeyguardViewMediator { 
     * Dismiss the keyguard through the security layers.

     */

    public void dismiss() {

        if (mShowing && !mHidden) {

            mKeyguardViewManager.dismiss();

        }

    }



    /**

     * Send message to keyguard telling it to reset its state.