Merge "Bug 5050590: wrong title for lock screen"

package com.android.settings;

import com.android.internal.widget.LockPatternUtils;

import android.app.Activity;

import android.app.admin.DevicePolicyManager;

import android.content.Context;

import android.preference.PreferenceScreen;

import android.security.KeyStore;

import com.android.internal.widget.LockPatternUtils;

public class ChooseLockGeneric extends PreferenceActivity {

    @Override

package com.android.settings;

import android.app.Activity;

import android.app.Dialog;

import android.app.DialogFragment;

import android.app.Fragment;

import android.content.ContentResolver;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.os.Bundle;

import android.preference.PreferenceActivity;

import android.preference.PreferenceFragment;

import android.text.TextUtils;

import android.util.Log;

import android.view.View;

import android.view.View.OnClickListener;

import android.widget.Button;

/**

 * Base class for Settings fragments, with some helper functions and dialog management.

 */

public class SettingsPreferenceFragment extends PreferenceFragment

        implements DialogCreatable {

public class SettingsPreferenceFragment extends PreferenceFragment implements DialogCreatable {

    private static final String TAG = "SettingsPreferenceFragment";

            Fragment caller, String fragmentClass, int requestCode, Bundle extras) {

        if (getActivity() instanceof PreferenceActivity) {

            PreferenceActivity preferenceActivity = (PreferenceActivity)getActivity();

            preferenceActivity.startPreferencePanel(fragmentClass, extras, 0, null, caller,

                    requestCode);

            preferenceActivity.startPreferencePanel(fragmentClass, extras,

                    R.string.lock_settings_picker_title, null, caller, requestCode);

            return true;

        } else {

            Log.w(TAG, "Parent isn't PreferenceActivity, thus there's no way to launch the "