Merge "Enable Encryption & Creds UI for Secondary users" into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
4ccde95a1a
@@ -20,7 +20,6 @@ import static com.android.settings.security.EncryptionStatusPreferenceController
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.os.UserManager;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.dashboard.DashboardFragment;
|
||||
@@ -96,9 +95,7 @@ public class EncryptionAndCredential extends DashboardFragment {
|
||||
|
||||
@Override
|
||||
protected boolean isPageSearchEnabled(Context context) {
|
||||
final UserManager um = (UserManager) context.getSystemService(
|
||||
Context.USER_SERVICE);
|
||||
return um.isAdminUser();
|
||||
return true;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
@@ -44,11 +44,11 @@ public class EncryptionStatusPreferenceController extends BasePreferenceControll
|
||||
public int getAvailabilityStatus() {
|
||||
if (TextUtils.equals(getPreferenceKey(), PREF_KEY_ENCRYPTION_DETAIL_PAGE) &&
|
||||
!mContext.getResources().getBoolean(
|
||||
R.bool.config_show_encryption_and_credentials_encryption_status)) {
|
||||
R.bool.config_show_encryption_and_credentials_encryption_status)) {
|
||||
return UNSUPPORTED_ON_DEVICE;
|
||||
}
|
||||
|
||||
return mUserManager.isAdminUser() ? AVAILABLE : DISABLED_FOR_USER;
|
||||
return AVAILABLE;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Reference in New Issue
Block a user