diff --git a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/ActionBarMenu.java b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/ActionBarMenu.java index cee65e635..acaab2bca 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/ActionBarMenu.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/ActionBarMenu.java @@ -103,7 +103,7 @@ public class ActionBarMenu extends LinearLayout { case R.drawable.photo_crop: hint = ApplicationLoader.applicationContext.getString(R.string.CropImage); break; case R.drawable.photo_tools: hint = ApplicationLoader.applicationContext.getString(R.string.EditImage); break; case R.drawable.ic_ab_search: hint = ApplicationLoader.applicationContext.getString(R.string.Search); break; - case R.drawable.lock_close: hint = ApplicationLoader.applicationContext.getString(R.string.Passcode); break; + case R.drawable.ic_ab_lock_screen: hint = ApplicationLoader.applicationContext.getString(R.string.Passcode); break; } if( hint != null ) { if( s_menuItemHint != null ) { diff --git a/MessengerProj/src/main/java/com/b44t/ui/DialogsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/DialogsActivity.java index a6175264c..3fe151cd5 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/DialogsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/DialogsActivity.java @@ -199,7 +199,7 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter. ActionBarMenu menu = actionBar.createMenu(); if (!onlySelect ) { - passcodeItem = menu.addItem(ID_LOCK_APP, R.drawable.lock_close); + passcodeItem = menu.addItem(ID_LOCK_APP, R.drawable.ic_ab_lock_screen); updatePasscodeButton(); } final ActionBarMenuItem item = menu.addItem(0, R.drawable.ic_ab_search).setIsSearchField(true, true).setActionBarMenuItemSearchListener(new ActionBarMenuItem.ActionBarMenuItemSearchListener() { diff --git a/MessengerProj/src/main/res/drawable-hdpi/ic_ab_lock_screen.png b/MessengerProj/src/main/res/drawable-hdpi/ic_ab_lock_screen.png new file mode 100644 index 000000000..4c3929834 Binary files /dev/null and b/MessengerProj/src/main/res/drawable-hdpi/ic_ab_lock_screen.png differ diff --git a/MessengerProj/src/main/res/drawable-hdpi/lock_close.png b/MessengerProj/src/main/res/drawable-hdpi/lock_close.png deleted file mode 100644 index f9b9072cd..000000000 Binary files a/MessengerProj/src/main/res/drawable-hdpi/lock_close.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-mdpi/ic_ab_lock_screen.png b/MessengerProj/src/main/res/drawable-mdpi/ic_ab_lock_screen.png new file mode 100644 index 000000000..a7fd28568 Binary files /dev/null and b/MessengerProj/src/main/res/drawable-mdpi/ic_ab_lock_screen.png differ diff --git a/MessengerProj/src/main/res/drawable-mdpi/lock_close.png b/MessengerProj/src/main/res/drawable-mdpi/lock_close.png deleted file mode 100644 index 47b4dd80a..000000000 Binary files a/MessengerProj/src/main/res/drawable-mdpi/lock_close.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-xhdpi/ic_ab_lock_screen.png b/MessengerProj/src/main/res/drawable-xhdpi/ic_ab_lock_screen.png new file mode 100644 index 000000000..ceab0badb Binary files /dev/null and b/MessengerProj/src/main/res/drawable-xhdpi/ic_ab_lock_screen.png differ diff --git a/MessengerProj/src/main/res/drawable-xhdpi/lock_close.png b/MessengerProj/src/main/res/drawable-xhdpi/lock_close.png deleted file mode 100644 index 9ea564016..000000000 Binary files a/MessengerProj/src/main/res/drawable-xhdpi/lock_close.png and /dev/null differ diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/ic_ab_lock_screen.png b/MessengerProj/src/main/res/drawable-xxhdpi/ic_ab_lock_screen.png new file mode 100644 index 000000000..497e3b374 Binary files /dev/null and b/MessengerProj/src/main/res/drawable-xxhdpi/ic_ab_lock_screen.png differ diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/lock_close.png b/MessengerProj/src/main/res/drawable-xxhdpi/lock_close.png deleted file mode 100644 index 716b83b66..000000000 Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/lock_close.png and /dev/null differ diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml index ea7112a24..b3260eda4 100644 --- a/MessengerProj/src/main/res/values/strings.xml +++ b/MessengerProj/src/main/res/values/strings.xml @@ -115,7 +115,7 @@ Passcode Lock Change Passcode - When you set up an additional passcode, a lock icon will appear on the chats page. Tap it to lock and unlock the app.\n\nNote: if you forget the passcode, you\'ll need to delete and reinstall the app. + When you set up an additional passcode, a lock icon will appear on the chats page. Tap it to lock the app.\n\nNote: if you forget the passcode, you\'ll need to delete and reinstall the app. PIN Password Enter your current passcode