diff --git a/core/res/res/drawable-hdpi/stat_sys_secure.png b/core/res/res/drawable-hdpi/stat_sys_secure.png
deleted file mode 100644
index 5e979dba1e898..0000000000000
Binary files a/core/res/res/drawable-hdpi/stat_sys_secure.png and /dev/null differ
diff --git a/core/res/res/drawable-ldpi/stat_sys_secure.png b/core/res/res/drawable-ldpi/stat_sys_secure.png
deleted file mode 100644
index 096aa95cb2355..0000000000000
Binary files a/core/res/res/drawable-ldpi/stat_sys_secure.png and /dev/null differ
diff --git a/core/res/res/drawable-mdpi/stat_sys_secure.png b/core/res/res/drawable-mdpi/stat_sys_secure.png
deleted file mode 100644
index da3e318f914f3..0000000000000
Binary files a/core/res/res/drawable-mdpi/stat_sys_secure.png and /dev/null differ
diff --git a/core/res/res/drawable-xhdpi/stat_sys_secure.png b/core/res/res/drawable-xhdpi/stat_sys_secure.png
deleted file mode 100644
index bef2fd726e40a..0000000000000
Binary files a/core/res/res/drawable-xhdpi/stat_sys_secure.png and /dev/null differ
diff --git a/core/res/res/drawable-xxhdpi/stat_sys_secure.png b/core/res/res/drawable-xxhdpi/stat_sys_secure.png
deleted file mode 100755
index 07c27cb87b5e8..0000000000000
Binary files a/core/res/res/drawable-xxhdpi/stat_sys_secure.png and /dev/null differ
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index f5f9bf6f66d3a..aa04bf6e9bb80 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -3970,11 +3970,6 @@
Share with
-
-
-
- Device locked.
-
", "
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 2b3c2876ea639..103505461584f 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1249,7 +1249,6 @@
-
@@ -1312,7 +1311,6 @@
-
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java b/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
index 597fb3bf76381..e746f72f22361 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
@@ -153,8 +153,6 @@ public class KeyguardViewMediator {
private AlarmManager mAlarmManager;
private AudioManager mAudioManager;
private StatusBarManager mStatusBarManager;
- private boolean mShowLockIcon;
- private boolean mShowingLockIcon;
private boolean mSwitchingUser;
private boolean mSystemReady;
@@ -494,7 +492,6 @@ public class KeyguardViewMediator {
mLockPatternUtils);
final ContentResolver cr = mContext.getContentResolver();
- mShowLockIcon = (Settings.System.getInt(cr, "show_status_bar_lock", 0) == 1);
mScreenOn = mPM.isScreenOn();
@@ -1227,25 +1224,6 @@ public class KeyguardViewMediator {
if (mStatusBarManager == null) {
Log.w(TAG, "Could not get status bar manager");
} else {
- if (mShowLockIcon) {
- // Give feedback to user when secure keyguard is active and engaged
- if (mShowing && isSecure()) {
- if (!mShowingLockIcon) {
- String contentDescription = mContext.getString(
- com.android.internal.R.string.status_bar_device_locked);
- mStatusBarManager.setIcon("secure",
- com.android.internal.R.drawable.stat_sys_secure, 0,
- contentDescription);
- mShowingLockIcon = true;
- }
- } else {
- if (mShowingLockIcon) {
- mStatusBarManager.removeIcon("secure");
- mShowingLockIcon = false;
- }
- }
- }
-
// Disable aspects of the system/status/navigation bars that must not be re-enabled by
// windows that appear on top, ever
int flags = StatusBarManager.DISABLE_NONE;