diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 90949b14e9b..91d9f59ea73 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1620,4 +1620,5 @@
"Stel rugsteunwagwoord op"
"Kanselleer"
"%d%%"
+ "Opstelling voltooi"
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 755020b44b0..f487be179df 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1620,4 +1620,5 @@
"የመጠባበቂያ ይለፍቃል አዘጋጅ"
"ይቅር"
"+%d"
+ "ማቀናበር ተጠናቋል"
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 879bf595baf..fdb7326b034 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1620,4 +1620,5 @@
"تعيين كلمة مرور النسخة الاحتياطية"
"إلغاء"
"%d%%"
+ "اكتمل الإعداد"
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 272fbee2a5d..1e58fb25ddf 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1620,4 +1620,5 @@
"Задаване на парола за резервно копие"
"Отказ"
"%d%%"
+ "Настройката завърши"
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a980b3c16e4..59c463d59d8 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1616,4 +1616,5 @@
"Estableix una contrasenya de seguretat"
"Cancel·la"
"%d%%"
+ "Configuració completa"
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 05fd7e9dcbf..d44ce0e892e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1620,4 +1620,5 @@
"Nastavit heslo pro zálohy"
"Zrušit"
"%d %%"
+ "Nastavení dokončeno"
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ed3f67f396e..cc6fe6ba17e 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1620,4 +1620,5 @@
"Indstil adgangskode til sikkerhedskopi"
"Annuller"
"%d %%"
+ "Konfigurationen er fuldført"
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e10c00f0ca9..2b4778b5719 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1619,4 +1619,5 @@
"Passwort für Sicherung festlegen"
"Abbrechen"
"%d Prozent"
+ "Setup abgeschlossen"
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b29c8be5b72..b7ac561e36c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1620,4 +1620,5 @@
"Ορισμός εφεδρικού κωδικού πρόσβασης"
"Ακύρωση"
"%d%%"
+ "Ολοκλήρωση ρύθμισης"
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 9c64221f701..9c76c4d82ee 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1572,4 +1572,5 @@
"Set backup password"
"Cancel"
"%d%%"
+ "Setup complete"
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ec5358bce6f..4658dd0b3e7 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1620,4 +1620,5 @@
"Definir contraseña de copia de seguridad"
"Cancelar"
"%d%%"
+ "Configuración completa"
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5b6d35fbe04..da49eec9ab2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1620,4 +1620,5 @@
"Definir contraseña de copia de seguridad"
"Cancelar"
"%d%%"
+ "Configuración completa"
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index b15b386d955..38cd4bdcded 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1620,4 +1620,5 @@
"تنظیم رمز ورود پشتیبان"
"لغو"
"%d%%"
+ "تنظیم کامل شد"
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ced7f1d4622..084842228e2 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1620,4 +1620,5 @@
"Aseta varmuuskopion salasana"
"Peruuta"
"%d%%"
+ "Asetukset määritetty"
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9c7daec2784..5c2922acc2e 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1622,4 +1622,5 @@
+ "Configuration terminée"
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index c96fbe76f9e..95ff237b893 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1620,4 +1620,5 @@
"Postavi zaporku za sigurnosnu kopiju"
"Odustani"
"%d%%"
+ "Postavljanje je završeno"
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 811a3105c12..229d384ee4e 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1622,4 +1622,5 @@
+ "A telepítés kész"
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 527a31b5319..8fb9336ae0a 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1620,4 +1620,5 @@
"Setel sandi cadangan"
"Batal"
"%d%%"
+ "Penyiapan selesai"
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b2269c1e477..d8eebaa03f1 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1620,4 +1620,5 @@
"Imposta password di backup"
"Annulla"
"%d%%"
+ "Configurazione completata"
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2441d756256..e8ab7510098 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1620,4 +1620,5 @@
"הגדר סיסמת גיבוי"
"ביטול"
"%d%%"
+ "ההגדרה הושלמה"
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 1b351ae54b7..326197bb617 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1622,4 +1622,5 @@
"バックアップパスワードを設定"
"キャンセル"
"%d%%"
+ "セットアップ完了"
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 4f6e5213ba6..2689c70f02a 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1620,4 +1620,5 @@
"백업 비밀번호 설정"
"취소"
"%d%%"
+ "설정 완료"
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 5edfd791a07..acd98d0e660 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1620,4 +1620,5 @@
"Nustatyti atsarginės kopijos slaptažodį"
"Atšaukti"
"%d %%"
+ "Sąranka baigta"
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 93718b15e7f..aebeeaee2be 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1620,4 +1620,5 @@
"Iestatīt dublējuma paroli"
"Atcelt"
"%d%%"
+ "Iestatīšana pabeigta"
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index f6c7677ca4c..baafd1f5d1a 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -1620,4 +1620,5 @@
"Tetapkan kata laluan sandaran"
"Batal"
"%d%%"
+ "Persediaan selesai"
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 097d13c8fa5..f55f5abfa8f 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1619,4 +1619,5 @@
"Angi passord for sikkerhetskopiering"
"Avbryt"
"%d %%"
+ "Konfigurering fullført"
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index ccf89f203c9..4c1d1269cea 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1619,4 +1619,5 @@
"Wachtwoord voor back-up instellen"
"Annuleren"
"%d%%"
+ "Instellen voltooid"
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index a3f738a01e9..b5d96b8f178 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1620,4 +1620,5 @@
"Ustaw hasło kopii zapasowej"
"Anuluj"
"%d%%"
+ "Konfiguracja ukończona"
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 590e9b8140b..d2e10751fce 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1620,4 +1620,5 @@
"Definir palavra-passe de cópia de segurança"
"Cancelar"
"%d%%"
+ "Configuração concluída"
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 7c7c7e392f5..24544474dd0 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1620,4 +1620,5 @@
"Definir a senha de backup"
"Cancelar"
"%d%%"
+ "Configuração concluída"
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 0a58e60bce8..33b04c1c1db 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1620,4 +1620,5 @@
"Setaţi parola pentru copia de rezervă"
"Anulaţi"
"%d%%"
+ "Configurare finalizată"
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c9a76bece60..abfe71ffed7 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1578,4 +1578,5 @@
+ "Настройка завершена"
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 8984841e0e9..f597c1c010f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1620,4 +1620,5 @@
"Nastaviť heslo pre zálohy"
"Zrušiť"
"%d %%"
+ "Nastavenie bolo dokončené"
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c6c8627d1c6..65ed7a45e29 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1620,4 +1620,5 @@
"Nastavi geslo za varnostno kopijo"
"Prekliči"
"%d%%"
+ "Nastavitev je končana"
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 5118fc43a77..516baaf0db8 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1620,4 +1620,5 @@
"Постави лозинку резервне копије"
"Откажи"
"%d%%"
+ "Подешавање је довршено"
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 3b2a239340e..e79912648db 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1616,4 +1616,5 @@
"Ange lösenord för säkerhetskopia"
"Avbryt"
"%d %%"
+ "Konfiguration klar"
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 6c9fedad3f5..a72c744a31b 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1620,4 +1620,5 @@
"Weka nenosiri la chelezo"
"Ghairi"
"%d%%"
+ "Maandalizi yamekamilika"
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index d9900d4073b..01d5e7cf08b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -1620,4 +1620,5 @@
"ตั้งค่ารหัสผ่านสำรอง"
"ยกเลิก"
"%d%%"
+ "การตั้งค่าเสร็จสมบูรณ์"
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 05aa996a519..087329bf962 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1620,4 +1620,5 @@
"Itakda ang backup na password"
"Kanselahin"
"%d%%"
+ "Kumpleto na ang pag-setup"
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 3729df88a6a..280446aa39d 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1620,4 +1620,5 @@
"Yedekleme şifresi belirle"
"İptal"
"%%%d"
+ "Kurulum tamamlandı"
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 3e08c4b9f86..bdf7b287aaf 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1620,4 +1620,5 @@
"Установити пароль резервної копії"
"Скасувати"
"%d%%"
+ "Налаштування завершено"
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index da2f1e4eb4c..936df233e29 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1620,4 +1620,5 @@
"Đặt mật khẩu sao lưu"
"Hủy"
"%d%%"
+ "Hoàn tất thiết lập"
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f55884ff09c..660d3ef8f55 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1620,4 +1620,5 @@
"设置备份密码"
"取消"
"%d%%"
+ "设置已完成"
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 89546a4dffa..59a955db6d6 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1619,4 +1619,5 @@
"設定備份密碼"
"取消"
"%d%%"
+ "設定完成"
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 31b4040d488..60e0036a4e8 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1620,4 +1620,5 @@
"Misa iphasiwedi yokusekela ngokulondoloza"
"Khansela"
"%d%%"
+ "Ukumisa kuqediwe"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 83cefdf8fac..b23e2125e2d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -938,6 +938,9 @@
Next
+
+ Setup complete
+
Device administration
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 2940442417a..abff0aea2f4 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -44,6 +44,7 @@ import android.view.inputmethod.EditorInfo;
import android.widget.Button;
import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
+import android.widget.Toast;
public class ChooseLockPassword extends PreferenceActivity {
public static final String PASSWORD_MIN_KEY = "lockscreen.password_min";
@@ -387,6 +388,7 @@ public class ChooseLockPassword extends PreferenceActivity {
LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
mLockPatternUtils.clearLock(isFallback);
mLockPatternUtils.saveLockPassword(pin, mRequestedQuality, isFallback);
+ Toast.makeText(getActivity(), R.string.lock_setup, Toast.LENGTH_SHORT).show();
getActivity().finish();
} else {
updateStage(Stage.ConfirmWrong);
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 180eee19154..314a432aa33 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -35,6 +35,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
+import android.widget.Toast;
import java.util.ArrayList;
import java.util.Collections;
@@ -512,6 +513,8 @@ public class ChooseLockPattern extends PreferenceActivity {
utils.saveLockPattern(mChosenPattern, isFallback);
utils.setLockPatternEnabled(true);
+ Toast.makeText(getActivity(), R.string.lock_setup, Toast.LENGTH_SHORT).show();
+
if (lockVirgin) {
utils.setVisiblePatternEnabled(true);
utils.setTactileFeedbackEnabled(false);