[2/2] Settings: Add lockscreen ring battery setting

also cleaned up LockScreen.java