ccade40278
- Applied getKeyguardDisabledFeatures for notification settings and
notification setup page (after settings a screenlock)
- If a notification settings is disabled, the next least secure setting
will be chosen
- Although KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS can be set be
profile, it will not be reflected in both settings page. This is
because it does not affect the owner (user 0), as mentioned in
DevicePolicyManagerService.PROFILE_KEYGUARD_FEATURES_AFFECT_OWNER
- Skip RedactionInterstitial if there is <= 1 options for the user
- Tested with both Setup wizard and settings case, both pattern and
password, as well as toggling the policy on and off
Bug: 19307118
Bug: 17099898
Change-Id: If640d5576caa0163e9942569f7b4643a30bbfe0a
109 lines
4.1 KiB
Java
109 lines
4.1 KiB
Java
/*
|
|
* Copyright (C) 2014 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;
|
|
|
|
import android.app.Activity;
|
|
import android.content.Context;
|
|
import android.content.Intent;
|
|
import android.content.res.Resources;
|
|
import android.os.Bundle;
|
|
import android.view.LayoutInflater;
|
|
import android.view.View;
|
|
import android.view.ViewGroup;
|
|
|
|
import com.android.settings.notification.RedactionInterstitial;
|
|
import com.android.setupwizardlib.SetupWizardLayout;
|
|
import com.android.setupwizardlib.view.NavigationBar;
|
|
|
|
/**
|
|
* Setup Wizard's version of RedactionInterstitial screen. It inherits the logic and basic structure
|
|
* from RedactionInterstitial class, and should remain similar to that behaviorally. This class
|
|
* should only overload base methods for minor theme and behavior differences specific to Setup
|
|
* Wizard. Other changes should be done to RedactionInterstitial class instead and let this class
|
|
* inherit those changes.
|
|
*/
|
|
public class SetupRedactionInterstitial extends RedactionInterstitial {
|
|
|
|
public static Intent createStartIntent(Context ctx) {
|
|
Intent startIntent = RedactionInterstitial.createStartIntent(ctx);
|
|
if (startIntent != null) {
|
|
startIntent.setClass(ctx, SetupRedactionInterstitial.class);
|
|
startIntent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false)
|
|
.putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, -1);
|
|
}
|
|
return startIntent;
|
|
}
|
|
|
|
@Override
|
|
public Intent getIntent() {
|
|
Intent modIntent = new Intent(super.getIntent());
|
|
modIntent.putExtra(EXTRA_SHOW_FRAGMENT,
|
|
SetupEncryptionInterstitialFragment.class.getName());
|
|
return modIntent;
|
|
}
|
|
|
|
@Override
|
|
protected boolean isValidFragment(String fragmentName) {
|
|
return SetupEncryptionInterstitialFragment.class.getName().equals(fragmentName);
|
|
}
|
|
|
|
@Override
|
|
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
|
|
resid = SetupWizardUtils.getTheme(getIntent());
|
|
super.onApplyThemeResource(theme, resid, first);
|
|
}
|
|
|
|
public static class SetupEncryptionInterstitialFragment extends RedactionInterstitialFragment
|
|
implements NavigationBar.NavigationBarListener {
|
|
|
|
@Override
|
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
|
Bundle savedInstanceState) {
|
|
return inflater.inflate(R.layout.setup_redaction_interstitial, container, false);
|
|
}
|
|
|
|
@Override
|
|
public void onViewCreated(View view, Bundle savedInstanceState) {
|
|
super.onViewCreated(view, savedInstanceState);
|
|
final SetupWizardLayout layout =
|
|
(SetupWizardLayout) view.findViewById(R.id.setup_wizard_layout);
|
|
|
|
final NavigationBar navigationBar = layout.getNavigationBar();
|
|
navigationBar.setNavigationBarListener(this);
|
|
navigationBar.getBackButton().setVisibility(View.GONE);
|
|
SetupWizardUtils.setImmersiveMode(getActivity());
|
|
}
|
|
|
|
@Override
|
|
public void onNavigateBack() {
|
|
final Activity activity = getActivity();
|
|
if (activity != null) {
|
|
activity.onBackPressed();
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void onNavigateNext() {
|
|
final SetupRedactionInterstitial activity = (SetupRedactionInterstitial) getActivity();
|
|
if (activity != null) {
|
|
activity.setResult(RESULT_OK, activity.getResultIntentData());
|
|
finish();
|
|
}
|
|
}
|
|
}
|
|
}
|