Settings: Remove "Make pattern visible" regardless.

  - Previous logic depended on all pattern lock elements to be
    null prior to removing the preferences. Remove them one by
    one if they exist now.

  - PS daproy#3: Add braces.

Change-Id: If34bc305eddda2985b37bd55349e4bb5d9b63154

Author: Adnan Begovic

src/com/android/settings/SecuritySettings.java

@@ -287,11 +287,16 @@ private PreferenceScreen createPreferenceHierarchy() {
                 DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
             PreferenceGroup securityCategory = (PreferenceGroup)
                     root.findPreference(KEY_SECURITY_CATEGORY);
-            if (securityCategory != null && mVisiblePattern != null &&
-                    mVisibleErrorPattern != null && mVisibleDots != null) {
-                securityCategory.removePreference(mVisiblePattern);
-                securityCategory.removePreference(mVisibleErrorPattern);
-                securityCategory.removePreference(mVisibleDots);
+            if (securityCategory != null) {
+                if (mVisiblePattern != null) {
+                    securityCategory.removePreference(mVisiblePattern);
+                }
+                if (mVisibleErrorPattern != null) {
+                    securityCategory.removePreference(mVisibleErrorPattern);
+                }
+                if (mVisibleDots != null) {
+                    securityCategory.removePreference(mVisibleDots);
+                }
             }
         }