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

Show channel description.

Browse Source 
Test: manual
Change-Id: I0965b0ad2c64571a01a5f221f8d344c60d54b53d
This commit is contained in:
Julia Reynolds
2017-03-17 15:10:29 -04:00
parent d964467622
commit 521c8751b3
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/xml/channel_notification_settings.xml
View File

@@ -69,5 +69,4 @@
android:title="@string/app_notification_override_dnd_title" android:title="@string/app_notification_override_dnd_title"
android:summary="@string/app_notification_override_dnd_summary" android:summary="@string/app_notification_override_dnd_summary"
settings:useAdditionalSummary="true" /> settings:useAdditionalSummary="true" />
</PreferenceScreen> </PreferenceScreen>

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

@@ -203,7 +203,7 @@ public class AppNotificationSettings extends NotificationSettingsBase {
int deletedChannelCount = mBackend.getDeletedChannelCount(mAppRow.pkg, mAppRow.uid); int deletedChannelCount = mBackend.getDeletedChannelCount(mAppRow.pkg, mAppRow.uid);
if (deletedChannelCount > 0) { if (deletedChannelCount > 0) {
DimmableIconPreference deletedPref = new DimmableIconPreference(getPrefContext()); DimmableIconPreference deletedPref = new DimmableIconPreference(getPrefContext());
deletedPref.setEnabled(false); deletedPref.setSelectable(false);
deletedPref.setTitle(getResources().getQuantityString( deletedPref.setTitle(getResources().getQuantityString(
R.plurals.deleted_channels, deletedChannelCount, deletedChannelCount)); R.plurals.deleted_channels, deletedChannelCount, deletedChannelCount));
deletedPref.setIcon(R.drawable.ic_info); deletedPref.setIcon(R.drawable.ic_info);

9
src/com/android/settings/notification/ChannelNotificationSettings.java
View File

@@ -40,6 +40,7 @@ import android.util.Log;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
import com.android.settings.DimmableIconPreference;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.RingtonePreference; import com.android.settings.RingtonePreference;
import com.android.settings.applications.AppHeaderController; import com.android.settings.applications.AppHeaderController;
@@ -131,6 +132,14 @@ public class ChannelNotificationSettings extends NotificationSettingsBase {
intentPref.setTitle(mContext.getString(R.string.app_settings_link)); intentPref.setTitle(mContext.getString(R.string.app_settings_link));
getPreferenceScreen().addPreference(intentPref); getPreferenceScreen().addPreference(intentPref);
} }
if (!TextUtils.isEmpty(mChannel.getDescription())) {
DimmableIconPreference descPref = new DimmableIconPreference(getPrefContext());
descPref.setSelectable(false);
descPref.setSummary(mChannel.getDescription());
descPref.setIcon(R.drawable.ic_info);
getPreferenceScreen().addPreference(descPref);
}
} }
private void setupLights() { private void setupLights() {