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

Remove wrapper class for NotificationGroup.

Browse Source 
It's no longer needed as Robolectric can natively support framework
classes

Bug: 76167422
Test: robotests
Change-Id: If0ac597370240b8efaa8df8783a5c309a2322a3f
This commit is contained in:
Fan Zhang
2018-03-30 15:50:11 -07:00
parent 234854cb04
commit 1781cf2cef
13 changed files with 74 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/notification/NotificationSettingsBase.java
View File

@@ -49,7 +49,6 @@ import com.android.settings.applications.AppInfoBase;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.widget.MasterCheckBoxPreference;
import com.android.settings.wrapper.NotificationChannelGroupWrapper;
import com.android.settingslib.RestrictedLockUtils;
import java.util.ArrayList;
@@ -70,7 +69,7 @@ abstract public class NotificationSettingsBase extends DashboardFragment {
protected String mPkg;
protected PackageInfo mPkgInfo;
protected EnforcedAdmin mSuspendedAppsAdmin;
protected NotificationChannelGroupWrapper mChannelGroup;
protected NotificationChannelGroup mChannelGroup;
protected NotificationChannel mChannel;
protected NotificationBackend.AppRow mAppRow;
@@ -168,7 +167,7 @@ abstract public class NotificationSettingsBase extends DashboardFragment {
if (mChannel != null && !TextUtils.isEmpty(mChannel.getGroup())) {
group = mBackend.getGroup(mPkg, mUid, mChannel.getGroup());
if (group != null) {
mChannelGroup = new NotificationChannelGroupWrapper(group);
mChannelGroup = group;
}
}
}
@@ -209,7 +208,7 @@ abstract public class NotificationSettingsBase extends DashboardFragment {
}
if (mChannelGroup != null) {
mAppRow.settingsIntent.putExtra(
Notification.EXTRA_CHANNEL_GROUP_ID, mChannelGroup.getGroup().getId());
Notification.EXTRA_CHANNEL_GROUP_ID, mChannelGroup.getId());
}
}
}