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

Commit 00b5ed8f authored by Baligh Uddin's avatar Baligh Uddin
Browse files

Merge commit 'b3f87c24' into jb-mr1-dev

parents db426cc0 b3f87c24

core/java/android/app/admin/DevicePolicyManager.java

+6 −3
Original line number Diff line number Diff line
@@ -1228,7 +1228,7 @@ public class DevicePolicyManager { 
    public static final int KEYGUARD_DISABLE_SECURE_CAMERA = 1 << 1;



    /**

     * Disable all current and future keyguard customizations

     * Disable all current and future keyguard customizations.

     */

    public static final int KEYGUARD_DISABLE_FEATURES_ALL = 0x7fffffff;
@@ -1381,8 +1381,9 @@ public class DevicePolicyManager { 
     * this method; if it has not, a security exception will be thrown.

     *

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with.

     * @param which {@link DevicePolicyManager#KEYGUARD_DISABLE_WIDGETS_ALL} or

     * {@link DevicePolicyManager#KEYGUARD_DISABLE_FEATURES_NONE} (the default).

     * @param which {@link #KEYGUARD_DISABLE_FEATURES_NONE} (default),

     * {@link #KEYGUARD_DISABLE_WIDGETS_ALL}, {@link #KEYGUARD_DISABLE_SECURE_CAMERA},

     * {@link #KEYGUARD_DISABLE_FEATURES_ALL}

     */

    public void setKeyguardDisabledFeatures(ComponentName admin, int which) {

        if (mService != null) {
@@ -1399,6 +1400,8 @@ public class DevicePolicyManager { 
     * admin, if specified, or all admins.

     * @param admin The name of the admin component to check, or null to check if any admins

     * have disabled features in keyguard.

     * @return bitfield of flags. See {@link #setKeyguardDisabledFeatures(ComponentName, int)}

     * for a list.

     */

    public int getKeyguardDisabledFeatures(ComponentName admin) {

        return getKeyguardDisabledFeatures(admin, UserHandle.myUserId());

core/java/android/appwidget/AppWidgetHostView.java

+4 −1
Original line number Diff line number Diff line
@@ -553,7 +553,10 @@ public class AppWidgetHostView extends FrameLayout { 
                if (options.containsKey(AppWidgetManager.OPTION_APPWIDGET_HOST_CATEGORY)) {

                    int category = options.getInt(AppWidgetManager.OPTION_APPWIDGET_HOST_CATEGORY);

                    if (category == AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD) {

                        layoutId = mInfo.initialKeyguardLayout;

                        int kgLayoutId = mInfo.initialKeyguardLayout;

                        // If a default keyguard layout is not specified, use the standard

                        // default layout.

                        layoutId = kgLayoutId == 0 ? layoutId : kgLayoutId;

                    }

                }

                defaultView = inflater.inflate(layoutId, this, false);

core/java/android/appwidget/AppWidgetProviderInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ public class AppWidgetProviderInfo implements Parcelable { 
        that.minResizeWidth = this.minResizeHeight;

        that.minResizeHeight = this.minResizeHeight;

        that.updatePeriodMillis = this.updatePeriodMillis;

        that.initialLayout = that.initialLayout;

        that.initialLayout = this.initialLayout;

        that.initialKeyguardLayout = this.initialKeyguardLayout;

        that.configure = this.configure == null ? null : this.configure.clone();

        that.label = this.label == null ? null : this.label.substring(0);

core/java/android/view/accessibility/AccessibilityRecord.java

+11 −0
Original line number Diff line number Diff line
@@ -167,6 +167,17 @@ public class AccessibilityRecord { 
                mSourceNodeId, GET_SOURCE_PREFETCH_FLAGS);

    }



    /**

     * Sets the window id.

     *

     * @param windowId The window id.

     *

     * @hide

     */

    public void setWindowId(int windowId) {

        mSourceWindowId = windowId;

    }



    /**

     * Gets the id of the window from which the event comes from.

     *

core/res/res/layout-port/keyguard_host_view.xml

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ 
            android:layout_width="wrap_content"

            android:layout_height="@dimen/keyguard_security_height"

            androidprv:layout_childType="challenge"

            android:background="@drawable/kg_bouncer_bg_white"

            android:padding="0dp"

            android:gravity="bottom|center_horizontal">

            <com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper