Merge "Delete Notification Topics." into nyc-dev

This commit is contained in:
Julia Reynolds
2016-02-19 19:17:23 +00:00
committed by Android (Google) Code Review
8 changed files with 57 additions and 301 deletions

View File

@@ -67,7 +67,7 @@ public class AppStateNotificationBridge extends AppStateBaseBridge {
return false;
}
AppRow row = (AppRow) info.extraInfo;
return row.banned || row.bannedTopics;
return row.banned;
}
};
}

View File

@@ -842,8 +842,6 @@ public class InstalledAppDetails extends AppInfoBase
public static CharSequence getNotificationSummary(AppRow appRow, Context context) {
if (appRow.banned) {
return context.getString(R.string.notifications_disabled);
} else if (appRow.bannedTopics) {
return context.getString(R.string.notifications_partially_disabled);
}
return context.getString(R.string.notifications_enabled);
}