Revert "take off phone_lock in xfail.list"

This reverts commit c7fb4de5678b70ddb3becdd768886432defb6492.
Revert "fix Settings test and refactor folder structures"

This reverts commit 68fc98b53ad6d2ec55712a2dcb50a04e6c9e1b73.
Revert "add needed tests"

This reverts commit 2ef54412d462e47b72801adafe22649fbcc296e0.
Revert "add phone_lock_test"

This reverts commit d195acb75efb341a7766dab8f2f39e653c14af07.
Revert "refactor with SettingsListener"

This reverts commit 5f398ee0e0e6653ab54e7c56e79ecf6042a61677.
Revert "remove unnecessary line"

This reverts commit 70f87fbe349f2dc963670af651b9966ab53a574b.