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

Commit c8dc8eb3 authored by Michael Jurka's avatar Michael Jurka Committed by Android (Google) Code Review
Browse files

Merge "Use new keyguard appwidget picker" into jb-mr1-lockscreen-dev

parents 077105ba fc753c0c

core/java/android/appwidget/AppWidgetManager.java

+7 −7
Original line number Diff line number Diff line
@@ -79,6 +79,13 @@ public class AppWidgetManager { 
     */

    public static final String ACTION_APPWIDGET_PICK = "android.appwidget.action.APPWIDGET_PICK";



    /**

     * Similar to ACTION_APPWIDGET_PICK, but used from keyguard

     * @hide

     */

    public static final String

            ACTION_KEYGUARD_APPWIDGET_PICK = "android.appwidget.action.KEYGUARD_APPWIDGET_PICK";



    /**

     * Send this from your {@link AppWidgetHost} activity when you want to bind an AppWidget to

     * display and bindAppWidgetIdIfAllowed returns false.
@@ -223,13 +230,6 @@ public class AppWidgetManager { 
     */

    public static final String EXTRA_CATEGORY_FILTER = "categoryFilter";



    /**

     * An intent extra to pass to the AppWidget picker which allows the picker to filter

     * the list based on the {@link AppWidgetProviderInfo#widgetFeatures}.

     * @hide

     */

    public static final String EXTRA_FEATURES_FILTER = "featuresFilter";



    /**

     * An intent extra to pass to the AppWidget picker to specify whether or not to sort

     * the list of caller-specified extra AppWidgets along with the rest of the AppWidgets

core/java/com/android/internal/widget/LockPatternUtils.java

+5 −0
Original line number Diff line number Diff line
@@ -129,6 +129,11 @@ public class LockPatternUtils { 
     */

    public static final int ID_DEFAULT_STATUS_WIDGET = -2;



    /**

     * Intent extra that's used to tag the default widget when using the picker

     */

    public static final String EXTRA_DEFAULT_WIDGET = "com.android.settings.DEFAULT_WIDGET";



    protected final static String LOCKOUT_PERMANENT_KEY = "lockscreen.lockedoutpermanently";

    protected final static String LOCKOUT_ATTEMPT_DEADLINE = "lockscreen.lockoutattemptdeadline";

    protected final static String PATTERN_EVER_CHOSEN_KEY = "lockscreen.patterneverchosen";

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -1901,6 +1901,13 @@ 
        android:description="@string/permdesc_bindGadget"

        android:protectionLevel="signature|system" />



    <!-- Private permission, to restrict who can bring up a dialog to add a new

         keyguard widget

         @hide -->

    <permission android:name="android.permission.BIND_KEYGUARD_APPWIDGET"

        android:permissionGroup="android.permission-group.PERSONAL_INFO"

        android:protectionLevel="signature|system" />



    <!-- Internal permission allowing an application to query/set which

         applications can bind AppWidgets.

         @hide -->

core/res/res/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -2065,6 +2065,15 @@ 
    <!-- This can be used in any application wanting to disable the text "Emergency number" -->

    <string name="emergency_call_dialog_number_for_display">Emergency number</string>



    <!-- String to display if the clock status widget is selected (it is the default) [CHAR LIMIT=22] -->

    <string name="widget_default" msgid="8269383575996003796">Clock</string>



    <!-- Package name for default widget [DO NOT TRANSLATE] -->

    <string name="widget_default_package_name">com.android.deskclock</string>



    <!-- Class name for default widget [DO NOT TRANSLATE] -->

    <string name="widget_default_class_name">com.android.deskclock.DeskClock</string>



    <!--

       *** touch based lock / unlock ***

                                          --> <skip />

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -479,6 +479,9 @@ 
  <java-symbol type="string" name="emailTypeOther" />

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

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

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

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

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

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

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

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