diff --git a/res/drawable/ic_batteryenergy.xml b/res/drawable/ic_batteryenergy.xml
new file mode 100644
index 0000000..97d6268
--- /dev/null
+++ b/res/drawable/ic_batteryenergy.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="52.418"
+    android:viewportWidth="52.418" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M39,12.993c0,-3.142 -2.575,-5.697 -5.741,-5.697H19.157c-3.165,0 -5.74,2.555 -5.74,5.697l-1,33.729c0,3.141 2.575,5.696 5.74,5.696h16.102c3.166,0 5.741,-2.556 5.741,-5.696L39,12.993zM34.258,50.071H18.157c-1.871,0 -3.393,-1.502 -3.393,-3.349l1,-33.729c0,-1.847 1.522,-3.35 3.393,-3.35h14.102c1.872,0 3.394,1.504 3.394,3.35l1,33.729C37.653,48.569 36.132,50.071 34.258,50.071zM30.409,1.242C30.4,0.556 29.84,0 29.151,0h-5.884c-0.688,0 -1.249,0.556 -1.258,1.242l-1.036,4.039h10.472L30.409,1.242zM22.445,3.898l0.91,-2.515h5.708l0.91,2.515H22.445zM32.563,28.332L20.861,43.179c-0.368,0.466 -0.455,0.411 -0.194,-0.122l5.425,-11.079c0.262,-0.534 -0.008,-0.968 -0.603,-0.968h-4.219c-0.595,0 -0.781,-0.38 -0.416,-0.851L31.11,16.962c0.366,-0.47 0.463,-0.411 0.22,0.131l-4.234,9.434c-0.243,0.543 0.041,0.981 0.637,0.979l4.421,-0.015C32.75,27.489 32.932,27.865 32.563,28.332z"/>
+</vector>
diff --git a/res/values-vi/cherish_strings.xml b/res/values-vi/cherish_strings.xml
new file mode 100644
index 0000000..8fbb16e
--- /dev/null
+++ b/res/values-vi/cherish_strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The CherishOS
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- App Title -->
+    <string name="cherish_settings_title">Yêu Thương</string>
+
+    <!-- Categories -->
+    <string name="button_title">Nút</string>
+    <string name="gestures_title">Cử chỉ</string>
+    <string name="lockscreen_title">Màn hình khóa</string>
+    <string name="misc_title">Khác</string>
+    <string name="navbar_title">Thanh điều hướng</string>
+    <string name="powermenu_title">Menu nguồn</string>
+    <string name="quicksettings_title">Cài đặt nhanh</string>
+    <string name="recents_title">Ứng dụng gần đây</string>
+    <string name="statusbar_title">Thanh trạng thái</string>
+    <string name="volume_title">Phím rockers</string>
+    <string name="notifications_title">Thông báo</string>
+    <string name="device_part_title">Chứ năng thiết bị</string>
+
+    <!-- General strings -->
+    <string name="ok">OK</string>
+    <string name="reset">Thiết lập lại</string>
+    <string name="cancel">Hủy bỏ</string>
+    <string name="save">Lưu lại</string>
+
+    <!-- Color Picker -->
+    <string name="dialog_color_picker">Chọn màu</string>
+    <string name="press_color_to_apply">Nhấn vào màu bên dưới để áp dụng</string>
+    <string name="arrow_right">→</string>
+    <string name="arrow_down">↓</string>
+    <string name="hex">Hex:</string>
+    <string name="hex_hint">#ff000000</string>
+    <string name="set">Đặt</string>
+    <string name="color_default">Mặc định</string>
+
+    <!-- Lockscreen battery info indicator  -->
+    <string name="lockscreen_battery_info_title">Thông tin sạc màn hình khóa</string>
+    <string name="lockscreen_battery_info_summary">Hiển thị dòng sạc tối đa của bộ sạc và điện áp và nhiệt độ pin trên màn hình khóa trong khi sạc</string>
+</resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 1419660..d8228ae 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -43,4 +43,8 @@
     <string name="hex_hint">#ff000000</string>
     <string name="set">Set</string>
     <string name="color_default">Default</string>
+
+    <!-- Lockscreen battery info indicator  -->
+    <string name="lockscreen_battery_info_title">Lockscreen charging info</string>
+    <string name="lockscreen_battery_info_summary">Display negociated charger max current and voltage and battery temperature on lockscreen while charging</string>
 </resources>
diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml
index 2371dd4..d86e5c8 100644
--- a/res/xml/cherish_settings_lockscreen.xml
+++ b/res/xml/cherish_settings_lockscreen.xml
@@ -18,4 +18,10 @@
     android:title="@string/lockscreen_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="lockscreen_battery_info"
+        android:icon="@drawable/ic_batteryenergy"
+        android:title="@string/lockscreen_battery_info_title"
+        android:summary="@string/lockscreen_battery_info_summary"
+        android:defaultValue="true" />
 </PreferenceScreen>