[Android Builders Collective] ezio84:
Preamble: i realized now yoy are using lsW commits in the Slim Gerrit, me and a lot of people here are using fusionjack's commits with bug fixes and improvements, try them too (links are in my 6th post). ;)

Btw:

import android.content.res.Resources;
<<<<<<< HEAD
import android.graphics.BitmapFactory;
import android.database.ContentObserver;
=======
import android.database.ContentObserver;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
>>>>>>> 0f465a0... Lockscreen Wallpaper [2/2]
import android.graphics.Canvas;

Above you have

"import android.graphics.BitmapFactory;"

and

"import android.database.ContentObserver;"

twice, so remove one line for each of them. You already have "import android.graphics.Bitmap;" too at the beginning of the file, so no need to add it again and you can remove the line here.

Then:

void observe() {
ContentResolver resolver = mContext.getContentResolver();
resolver.registerContentObserver(Settings.System.getUriFor(
<<<<<<< HEAD
Settings.System.LOCKSCREEN_NOTIFICATIONS), false, this);
=======
Settings.System.LOCKSCREEN_SEE_THROUGH), false, this, UserHandle.USER_ALL);
resolver.registerContentObserver(Settings.System.getUriFor(
Settings.System.LOCKSCREEN_BLUR_RADIUS), false, this, UserHandle.USER_ALL);
>>>>>>> 0f465a0... Lockscreen Wallpaper [2/2]
}

You can see two things:

- you still need

"Settings.System.LOCKSCREEN_NOTIFICATIONS), false, this);"

because you want to use lsn too;

- before the "Setting.System..." line there's always "resolver.register...".

So you have to solve the conflict in this way:

void observe() {
ContentResolver resolver = mContext.getContentResolver();
resolver.registerContentObserver(Settings.System.getUriFor(
Settings.System.LOCKSCREEN_NOTIFICATIONS), false, this);
resolver.registerContentObserver(Settings.System.getUriFor(
Settings.System.LOCKSCREEN_SEE_THROUGH), false, this, UserHandle.USER_ALL);
resolver.registerContentObserver(Settings.System.getUriFor(
Settings.System.LOCKSCREEN_BLUR_RADIUS), false, this, UserHandle.USER_ALL);
}

Then:

@Override
public void onChange(boolean selfChange) {
updateSettings();
<<<<<<< HEAD
=======
if (mKeyguardHost == null) {
maybeCreateKeyguardLocked(shouldEnableScreenRotation(), false, null);
hide();
}
mViewManager.updateViewLayout(mKeyguardHost, mWindowLayoutParams);
>>>>>>> 0f465a0... Lockscreen Wallpaper [2/2]
}
}

it's an addition, so you just have to remove unuseful lines ("<<<<<<< HEAD", "=======", ">>>>>>>0f465a0...LockscreenWallpaper[2/2]")

Then:

<<<<<<< HEAD
mLockscreenNotifications = Settings.System.getInt(mContext.getContentResolver(),
Settings.System.LOCKSCREEN_NOTIFICATIONS, mLockscreenNotifications ? 1 : 0) == 1;
if(mLockscreenNotifications && mNotificationViewManager == null) {
mNotificationViewManager = new NotificationViewManager(mContext, this);
} else if(!mLockscreenNotifications && mNotificationViewManager != null) {
mNotificationViewManager.unregisterListeners();
mNotificationViewManager = null;
}
}

=======
mSeeThrough = Settings.System.getIntForUser(mContext.getContentResolver(),
Settings.System.LOCKSCREEN_SEE_THROUGH, 0, UserHandle.USER_CURRENT) == 1;
mBlurRadius = Settings.System.getIntForUser(mContext.getContentResolver(),
Settings.System.LOCKSCREEN_BLUR_RADIUS, mBlurRadius, UserHandle.USER_CURRENT);

if(!mSeeThrough) {
mCustomImage = null;
}
}

public void onUserSwitching(int userId) {
mUserId = userId;
customLockscreen();
}

>>>>>>> 0f465a0... Lockscreen Wallpaper [2/2]
/**

you still have some lsn lines you need, and the new lsW lines.

Here you can just create a new

"private void updateSettings() {"

for the new lsW code, so just change "=======" with

"private void updateSettings() {"

to have this:

private void updateSettings() {
mLockscreenNotifications = Settings.System.getInt(mContext.getContentResolver(),
Settings.System.LOCKSCREEN_NOTIFICATIONS, mLockscreenNotifications ? 1 : 0) == 1;
if(mLockscreenNotifications && mNotificationViewManager == null) {
mNotificationViewManager = new NotificationViewManager(mContext, this);
} else if(!mLockscreenNotifications && mNotificationViewManager != null) {
mNotificationViewManager.unregisterListeners();
mNotificationViewManager = null;
}
}

private void updateSettings() {
mSeeThrough = Settings.System.getIntForUser(mContext.getContentResolver(),
Settings.System.LOCKSCREEN_SEE_THROUGH, 0, UserHandle.USER_CURRENT) == 1;
mBlurRadius = Settings.System.getIntForUser(mContext.getContentResolver(),
Settings.System.LOCKSCREEN_BLUR_RADIUS, mBlurRadius, UserHandle.USER_CURRENT);

if(!mSeeThrough) {
mCustomImage = null;
}
}

public void onUserSwitching(int userId) {
mUserId = userId;
customLockscreen();
}

/**

Yes.