 +        });
 +
 +        // Alert the user of the failure.
-+        ((TextView) findViewById(R.id.title)).setText(R.string.crypt_keeper_failed_title);
-+        ((TextView) findViewById(R.id.status)).setText(R.string.crypt_keeper_failed_summary);
++        ((TextView) findViewById(R.id.title)).setText(R.string.encrypt_user_failed_title);
++        ((TextView) findViewById(R.id.status)).setText(R.string.encrypt_user_failed_summary);
 +
 +        final View view = findViewById(R.id.bottom_divider);
 +        // TODO(viki): Why would the bottom divider be missing in certain layouts? Investigate.
 +        if (view != null) {
 +            view.setVisibility(View.VISIBLE);
 +        }
-+    }
-+
-+    private void updateProgress() {
-+        final int size = Integer.parseInt(SystemProperties.get("efs.encrypt.size"));
-+        int progress = Integer.parseInt(SystemProperties.get("efs.encrypt.progress"));
-+
-+        progress = progress / size * 100;
-+        final CharSequence status = getText(R.string.crypt_keeper_setup_description);
-+        Log.v(TAG, "Encryption progress: " + progress);
-+        final TextView tv = (TextView) findViewById(R.id.status);
-+        if (tv != null) {
-+            tv.setText(TextUtils.expandTemplate(status, Integer.toString(progress)));
-+        }
-+        // Check the progress every 5 seconds
-+        mHandler.removeMessages(MESSAGE_UPDATE_PROGRESS);
-+        mHandler.sendEmptyMessageDelayed(MESSAGE_UPDATE_PROGRESS, 5000);
 +    }
 +
 +    /** Disable password input for a while to force the user to waste time between retries */

From 7ac72fd85b2b8946d23d4ffac222dcd95bb09573 Mon Sep 17 00:00:00 2001
From: Nicolae-Alexandru Ivan <alexandru.ivan@intel.com>
Date: Mon, 21 Jul 2014 11:47:28 +0300
Subject: [PATCH] Integrate EFS with settings

---

+        }
+    }
+
+    private void showFactoryReset() {
+        // Hide the encryption-bot to make room for the "factory reset" button
+        findViewById(R.id.encroid).setVisibility(View.GONE);
