d2a8b1ff02
With this change a summary to the encryption preference was added.
415ce9a77d
The problem is that even if you're not encrypted, it says that your phone is.
Is very misleading to the user that don't bother to enter the actual preference
and want to see if they are. This fixes that.
This is cherry-picked from
https://android-review.googlesource.com/#/c/platform/packages/apps/Settings/+/517875/
Test: Go into Settings/Security & Location
Fixes: 68691666
Fixes: 68542516
Change-Id: Iaeaffd340f2e248748f244a947aa71eb8ad4ab94
64 lines
2.3 KiB
Java
64 lines
2.3 KiB
Java
/*
|
|
* 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.os.UserManager;
|
|
import android.support.v7.preference.Preference;
|
|
import android.text.TextUtils;
|
|
|
|
import com.android.internal.widget.LockPatternUtils;
|
|
import com.android.settings.R;
|
|
import com.android.settings.core.BasePreferenceController;
|
|
|
|
public class EncryptionStatusPreferenceController extends BasePreferenceController {
|
|
|
|
|
|
static final String PREF_KEY_ENCRYPTION_DETAIL_PAGE =
|
|
"encryption_and_credentials_encryption_status";
|
|
static final String PREF_KEY_ENCRYPTION_SECURITY_PAGE = "encryption_and_credential";
|
|
|
|
private final UserManager mUserManager;
|
|
|
|
public EncryptionStatusPreferenceController(Context context, String key) {
|
|
super(context, key);
|
|
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
|
|
}
|
|
|
|
@Override
|
|
public int getAvailabilityStatus() {
|
|
return mUserManager.isAdminUser() ? AVAILABLE : DISABLED_FOR_USER;
|
|
}
|
|
|
|
@Override
|
|
public void updateState(Preference preference) {
|
|
final boolean encryptionEnabled = LockPatternUtils.isDeviceEncryptionEnabled();
|
|
if (encryptionEnabled) {
|
|
if (TextUtils.equals(getPreferenceKey(), PREF_KEY_ENCRYPTION_DETAIL_PAGE)) {
|
|
preference.setFragment(null);
|
|
}
|
|
preference.setSummary(R.string.crypt_keeper_encrypted_summary);
|
|
} else {
|
|
if (TextUtils.equals(getPreferenceKey(), PREF_KEY_ENCRYPTION_DETAIL_PAGE)) {
|
|
preference.setFragment(CryptKeeperSettings.class.getName());
|
|
}
|
|
preference.setSummary(R.string.decryption_settings_summary);
|
|
}
|
|
|
|
}
|
|
}
|