diff options
| -rw-r--r-- | core/java/android/provider/Settings.java | 13 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/StatusView.java | 16 |
2 files changed, 24 insertions, 5 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index cf95872..56babdd 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2553,6 +2553,19 @@ public final class Settings { /** + * This preference contains the string that shows for owner info on LockScren. + * @hide + */ + public static final String LOCK_SCREEN_OWNER_INFO = "lock_screen_owner_info"; + + /** + * This preference enables showing the owner info on LockScren. + * @hide + */ + public static final String LOCK_SCREEN_OWNER_INFO_ENABLED = + "lock_screen_owner_info_enabled"; + + /** * Whether assisted GPS should be enabled or not. * @hide */ diff --git a/policy/src/com/android/internal/policy/impl/StatusView.java b/policy/src/com/android/internal/policy/impl/StatusView.java index 3f08cfd..2b78851 100644 --- a/policy/src/com/android/internal/policy/impl/StatusView.java +++ b/policy/src/com/android/internal/policy/impl/StatusView.java @@ -4,11 +4,14 @@ package com.android.internal.policy.impl; import com.android.internal.R; import com.android.internal.widget.LockPatternUtils; +import com.google.android.util.AbstractMessageParser.Resources; import java.util.Date; +import android.content.ContentResolver; import android.content.Context; import android.graphics.drawable.Drawable; +import android.provider.Settings; import android.text.TextUtils; import android.text.format.DateFormat; import android.util.Log; @@ -138,11 +141,14 @@ class StatusView { /** Originated from PatternUnlockScreen **/ void updateStatusLines() { if (mHasProperty) { - // TODO Get actual name & email - String name = "John Smith"; - String email = "jsmith@gmail.com"; - mPropertyOf.setText("Property of:\n" + name + "\n" + email); - mPropertyOf.setVisibility(View.VISIBLE); + ContentResolver res = getContext().getContentResolver(); + String info = Settings.Secure.getString(res, Settings.Secure.LOCK_SCREEN_OWNER_INFO); + boolean enabled = Settings.Secure.getInt(res, + Settings.Secure.LOCK_SCREEN_OWNER_INFO_ENABLED, 1) != 0; + + mPropertyOf.setText(info); + mPropertyOf.setVisibility(enabled && !TextUtils.isEmpty(info) ? + View.VISIBLE : View.INVISIBLE); } if (!mHasStatus2) return; |