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

Commit e4cc20d1 authored by Michael Jurka's avatar Michael Jurka Committed by Android Git Automerger
Browse files

am 7dfbe2d6: am 3eaa876c: am 08924d00: Merge "Supporting... 

am 7dfbe2d6: am 3eaa876c: am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev

* commit '7dfbe2d6':
  Supporting EXTRA_APPWIDGET_OPTIONS correctly
parents 449f48ff 7dfbe2d6

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

+4 −12
Original line number Diff line number Diff line
@@ -914,7 +914,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
@@ -927,17 +930,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) {