PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't allow users to set redaction on an insecure device." into lmp-dev

Browse Source
This commit is contained in:
Chris Wren
2014-08-29 20:07:44 +00:00
committed by Android (Google) Code Review
parent ab61b0df4a f48249a3b8
commit 0680e0e7cd
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/notification/AppNotificationSettings.java
View File

@@ -36,6 +36,7 @@ import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.notification.NotificationAppList.AppRow;
@@ -134,6 +135,11 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
mPriority = (SwitchPreference) findPreference(KEY_PRIORITY);
mSensitive = (SwitchPreference) findPreference(KEY_SENSITIVE);
final boolean secure = new LockPatternUtils(getActivity()).isSecure();
if (!secure) {
getPreferenceScreen().removePreference(mSensitive);
}
mAppRow = NotificationAppList.loadAppRow(pm, info, mBackend);
if (intent.hasExtra(EXTRA_HAS_SETTINGS_INTENT)) {
// use settings intent from extra
@@ -149,7 +155,9 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
mBlock.setChecked(mAppRow.banned);
mPriority.setChecked(mAppRow.priority);
if (mSensitive != null) {
mSensitive.setChecked(mAppRow.sensitive);
}
mBlock.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override
@@ -167,6 +175,7 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
}
});
if (mSensitive != null) {
mSensitive.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
@@ -175,6 +184,7 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
}
});
}
}
private void toastAndFinish() {
Toast.makeText(mContext, R.string.app_not_found_dlg_text, Toast.LENGTH_SHORT).show();