Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 3024528: Add owner info to SecureSettings.

Browse Source 
Change-Id: Ibed62aa8881c795f0d48007fc04beac0e9c1d4a0
This commit is contained in:
Jim Miller
2010-10-13 20:57:29 -07:00
parent 184498ce5a
commit 253a5ef886
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/provider/Settings.java
View File

@@ -2552,6 +2552,19 @@ public final class Settings {
public static final String LOCK_SCREEN_LOCK_AFTER_TIMEOUT = "lock_screen_lock_after_timeout";
/**
* 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

16
policy/src/com/android/internal/policy/impl/StatusView.java
View File

@@ -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;