App & channel notification settings updates
- change 'block all' to an on/off switch bar - update channel list summary text when notifications are toggled on/off on app settings page - Add 'off state' text - change style of foot items - change 'importance' from a dropdown to its own page Bug: 37538972 Bug: 37479730 Fixes: 37541624 Fixes: 37549732 Test: manual Change-Id: I0e5cc66ba539ce2b76b4ad6541bf6bfb5b58c373
This commit is contained in:
@@ -0,0 +1,151 @@
|
||||
/*
|
||||
* 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.notification;
|
||||
|
||||
import static android.app.NotificationChannel.USER_LOCKED_IMPORTANCE;
|
||||
import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
|
||||
import static android.app.NotificationManager.IMPORTANCE_HIGH;
|
||||
import static android.app.NotificationManager.IMPORTANCE_LOW;
|
||||
import static android.app.NotificationManager.IMPORTANCE_MAX;
|
||||
import static android.app.NotificationManager.IMPORTANCE_MIN;
|
||||
|
||||
import android.content.Context;
|
||||
import android.provider.SearchIndexableResource;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.search.BaseSearchIndexProvider;
|
||||
import com.android.settings.search.Indexable;
|
||||
import com.android.settings.widget.RadioButtonPreference;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class ChannelImportanceSettings extends NotificationSettingsBase
|
||||
implements RadioButtonPreference.OnClickListener, Indexable {
|
||||
private static final String TAG = "NotiImportance";
|
||||
|
||||
private static final String KEY_IMPORTANCE_HIGH = "importance_high";
|
||||
private static final String KEY_IMPORTANCE_DEFAULT = "importance_default";
|
||||
private static final String KEY_IMPORTANCE_LOW = "importance_low";
|
||||
private static final String KEY_IMPORTANCE_MIN = "importance_min";
|
||||
|
||||
List<RadioButtonPreference> mImportances = new ArrayList<>();
|
||||
|
||||
@Override
|
||||
public int getMetricsCategory() {
|
||||
return MetricsEvent.NOTIFICATION_CHANNEL_IMPORTANCE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
if (mUid < 0 || TextUtils.isEmpty(mPkg) || mPkgInfo == null || mChannel == null) {
|
||||
Log.w(TAG, "Missing package or uid or packageinfo or channel");
|
||||
finish();
|
||||
return;
|
||||
}
|
||||
createPreferenceHierarchy();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPause() {
|
||||
super.onPause();
|
||||
}
|
||||
|
||||
private PreferenceScreen createPreferenceHierarchy() {
|
||||
PreferenceScreen root = getPreferenceScreen();
|
||||
if (root != null) {
|
||||
root.removeAll();
|
||||
}
|
||||
addPreferencesFromResource(R.xml.notification_importance);
|
||||
root = getPreferenceScreen();
|
||||
|
||||
for (int i = 0; i < root.getPreferenceCount(); i++) {
|
||||
Preference pref = root.getPreference(i);
|
||||
if (pref instanceof RadioButtonPreference) {
|
||||
RadioButtonPreference radioPref = (RadioButtonPreference) pref;
|
||||
radioPref.setOnClickListener(this);
|
||||
mImportances.add(radioPref);
|
||||
}
|
||||
}
|
||||
|
||||
switch (mChannel.getImportance()) {
|
||||
case IMPORTANCE_MIN:
|
||||
updateRadioButtons(KEY_IMPORTANCE_MIN);
|
||||
break;
|
||||
case IMPORTANCE_LOW:
|
||||
updateRadioButtons(KEY_IMPORTANCE_LOW);
|
||||
break;
|
||||
case IMPORTANCE_DEFAULT:
|
||||
updateRadioButtons(KEY_IMPORTANCE_DEFAULT);
|
||||
break;
|
||||
case IMPORTANCE_HIGH:
|
||||
case IMPORTANCE_MAX:
|
||||
updateRadioButtons(KEY_IMPORTANCE_HIGH);
|
||||
break;
|
||||
}
|
||||
|
||||
return root;
|
||||
}
|
||||
|
||||
private void updateRadioButtons(String selectionKey) {
|
||||
for (RadioButtonPreference pref : mImportances) {
|
||||
if (selectionKey.equals(pref.getKey())) {
|
||||
pref.setChecked(true);
|
||||
} else {
|
||||
pref.setChecked(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRadioButtonClicked(RadioButtonPreference clicked) {
|
||||
switch (clicked.getKey()) {
|
||||
case KEY_IMPORTANCE_HIGH:
|
||||
mChannel.setImportance(IMPORTANCE_HIGH);
|
||||
break;
|
||||
case KEY_IMPORTANCE_DEFAULT:
|
||||
mChannel.setImportance(IMPORTANCE_DEFAULT);
|
||||
break;
|
||||
case KEY_IMPORTANCE_LOW:
|
||||
mChannel.setImportance(IMPORTANCE_LOW);
|
||||
break;
|
||||
case KEY_IMPORTANCE_MIN:
|
||||
mChannel.setImportance(IMPORTANCE_MIN);
|
||||
break;
|
||||
}
|
||||
updateRadioButtons(clicked.getKey());
|
||||
mChannel.lockFields(USER_LOCKED_IMPORTANCE);
|
||||
mBackend.updateChannel(mAppRow.pkg, mAppRow.uid, mChannel);
|
||||
}
|
||||
|
||||
// This page exists per notification channel; should not be included
|
||||
// in search
|
||||
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||
new BaseSearchIndexProvider() {
|
||||
@Override
|
||||
public List<SearchIndexableResource> getXmlResourcesToIndex(
|
||||
Context context, boolean enabled) {
|
||||
return null;
|
||||
}
|
||||
};
|
||||
}
|
Reference in New Issue
Block a user