add transparent lockscreen

Change-Id: Iaee15785d84cc058d8404658620b41971f2ab31a

Conflicts:

	core/java/android/provider/Settings.java
fix conflict