Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66ad9e72 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix 3024528: Add owner info to SecureSettings."

parents 6ed0c3ec 253a5ef8

core/java/android/provider/Settings.java

+13 −0
Original line number Diff line number Diff line
@@ -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

policy/src/com/android/internal/policy/impl/StatusView.java

+11 −5
Original line number Diff line number Diff line
@@ -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;