Add page Settings->Security & lock screen->Lock screen preferences.
- add the new preference screen that contains configuration for lock screen notification, add user when locked, and owner info. - refactor SecuritySettings to use the new owner info controller. Fix: 36163515 Test: make RunSettingsRoboTests Change-Id: I3bada8f652f89ed0af7aebc03f0bf2f637296b4d
This commit is contained in:
Doris Ling
@@ -0,0 +1,103 @@
|
||||
/*
|
||||
* Copyright (C) 2017 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.security;
|
||||
|
||||
import android.content.Context;
|
||||
import android.provider.SearchIndexableResource;
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.accounts.AddUserWhenLockedPreferenceController;
|
||||
import com.android.settings.core.PreferenceController;
|
||||
import com.android.settings.core.lifecycle.Lifecycle;
|
||||
import com.android.settings.dashboard.DashboardFragment;
|
||||
import com.android.settings.notification.LockScreenNotificationPreferenceController;
|
||||
import com.android.settings.search.BaseSearchIndexProvider;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Settings screen for lock screen preference
|
||||
*/
|
||||
public class LockscreenDashboardFragment extends DashboardFragment
|
||||
implements OwnerInfoPreferenceController.OwnerInfoCallback {
|
||||
|
||||
private static final String TAG = "LockscreenDashboardFragment";
|
||||
|
||||
private OwnerInfoPreferenceController mOwnerInfoPreferenceController;
|
||||
|
||||
@Override
|
||||
public int getMetricsCategory() {
|
||||
return MetricsEvent.SETTINGS_LOCK_SCREEN_PREFERENCES;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getLogTag() {
|
||||
return TAG;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getPreferenceScreenResId() {
|
||||
return R.xml.security_lockscreen_settings;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<PreferenceController> getPreferenceControllers(Context context) {
|
||||
final List<PreferenceController> controllers = new ArrayList<>();
|
||||
final Lifecycle lifecycle = getLifecycle();
|
||||
final LockScreenNotificationPreferenceController notificationController =
|
||||
new LockScreenNotificationPreferenceController(context);
|
||||
lifecycle.addObserver(notificationController);
|
||||
controllers.add(notificationController);
|
||||
final AddUserWhenLockedPreferenceController addUserWhenLockedController =
|
||||
new AddUserWhenLockedPreferenceController(context);
|
||||
lifecycle.addObserver(addUserWhenLockedController);
|
||||
controllers.add(addUserWhenLockedController);
|
||||
mOwnerInfoPreferenceController =
|
||||
new OwnerInfoPreferenceController(context, this, lifecycle);
|
||||
controllers.add(mOwnerInfoPreferenceController);
|
||||
return controllers;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onOwnerInfoUpdated() {
|
||||
if (mOwnerInfoPreferenceController != null) {
|
||||
mOwnerInfoPreferenceController.updateSummary();
|
||||
}
|
||||
}
|
||||
|
||||
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||
new BaseSearchIndexProvider() {
|
||||
@Override
|
||||
public List<SearchIndexableResource> getXmlResourcesToIndex(
|
||||
Context context, boolean enabled) {
|
||||
final SearchIndexableResource sir = new SearchIndexableResource(context);
|
||||
sir.xmlResId = R.xml.security_lockscreen_settings;
|
||||
return Arrays.asList(sir);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PreferenceController> getPreferenceControllers(Context context) {
|
||||
final List<PreferenceController> controllers = new ArrayList<>();
|
||||
controllers.add(new LockScreenNotificationPreferenceController(context));
|
||||
controllers.add(new AddUserWhenLockedPreferenceController(context));
|
||||
controllers.add(new OwnerInfoPreferenceController(
|
||||
context, null /* fragment */, null /* lifecycle */));
|
||||
return controllers;
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,142 @@
|
||||
/*
|
||||
* Copyright (C) 2017 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package com.android.settings.security;
|
||||
|
||||
import android.app.Fragment;
|
||||
import android.content.Context;
|
||||
import android.os.UserHandle;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.Preference.OnPreferenceClickListener;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
import com.android.internal.widget.LockPatternUtils;
|
||||
import com.android.settings.OwnerInfoSettings;
|
||||
import com.android.settings.core.PreferenceController;
|
||||
import com.android.settings.core.lifecycle.Lifecycle;
|
||||
import com.android.settings.core.lifecycle.LifecycleObserver;
|
||||
import com.android.settings.core.lifecycle.events.OnResume;
|
||||
import com.android.settingslib.RestrictedLockUtils;
|
||||
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
|
||||
import com.android.settingslib.RestrictedPreference;
|
||||
|
||||
public class OwnerInfoPreferenceController extends PreferenceController
|
||||
implements LifecycleObserver, OnResume {
|
||||
|
||||
private static final String KEY_OWNER_INFO = "owner_info_settings";
|
||||
private static final int MY_USER_ID = UserHandle.myUserId();
|
||||
|
||||
private final LockPatternUtils mLockPatternUtils;
|
||||
private final Fragment mParent;
|
||||
private RestrictedPreference mOwnerInfoPref;
|
||||
|
||||
// Container fragment should implement this in order to show the correct summary
|
||||
public interface OwnerInfoCallback {
|
||||
public void onOwnerInfoUpdated();
|
||||
}
|
||||
|
||||
public OwnerInfoPreferenceController(Context context, Fragment parent, Lifecycle lifecycle ) {
|
||||
super(context);
|
||||
mParent = parent;
|
||||
mLockPatternUtils = new LockPatternUtils(context);
|
||||
if (lifecycle != null) {
|
||||
lifecycle.addObserver(this);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
mOwnerInfoPref = (RestrictedPreference) screen.findPreference(KEY_OWNER_INFO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResume() {
|
||||
updateEnableState();
|
||||
updateSummary();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPreferenceKey() {
|
||||
return KEY_OWNER_INFO;
|
||||
}
|
||||
|
||||
public void updateEnableState() {
|
||||
if (mOwnerInfoPref == null) {
|
||||
return;
|
||||
}
|
||||
if (isDeviceOwnerInfoEnabled()) {
|
||||
EnforcedAdmin admin = getDeviceOwner();
|
||||
mOwnerInfoPref.setDisabledByAdmin(admin);
|
||||
} else {
|
||||
mOwnerInfoPref.setDisabledByAdmin(null);
|
||||
mOwnerInfoPref.setEnabled(!mLockPatternUtils.isLockScreenDisabled(MY_USER_ID));
|
||||
if (mOwnerInfoPref.isEnabled()) {
|
||||
mOwnerInfoPref.setOnPreferenceClickListener(
|
||||
new OnPreferenceClickListener() {
|
||||
@Override
|
||||
public boolean onPreferenceClick(Preference preference) {
|
||||
OwnerInfoSettings.show(mParent);
|
||||
return true;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void updateSummary() {
|
||||
if (mOwnerInfoPref != null) {
|
||||
if (isDeviceOwnerInfoEnabled()) {
|
||||
mOwnerInfoPref.setSummary(
|
||||
getDeviceOwnerInfo());
|
||||
} else {
|
||||
mOwnerInfoPref.setSummary(isOwnerInfoEnabled()
|
||||
? getOwnerInfo()
|
||||
: mContext.getString(
|
||||
com.android.settings.R.string.owner_info_settings_summary));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Wrapper methods to allow testing
|
||||
@VisibleForTesting
|
||||
boolean isDeviceOwnerInfoEnabled() {
|
||||
return mLockPatternUtils.isDeviceOwnerInfoEnabled();
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
String getDeviceOwnerInfo() {
|
||||
return mLockPatternUtils.getDeviceOwnerInfo();
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
boolean isOwnerInfoEnabled() {
|
||||
return mLockPatternUtils.isOwnerInfoEnabled(MY_USER_ID);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
String getOwnerInfo() {
|
||||
return mLockPatternUtils.getOwnerInfo(MY_USER_ID);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
EnforcedAdmin getDeviceOwner() {
|
||||
return RestrictedLockUtils.getDeviceOwner(mContext);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user