Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove more wrappers" into pi-dev am: d73d3a8f55

Browse Source 
am: 893f9db1ac

Change-Id: I7f9e765e842e4bc8f8c4ad3c041faa9edee2b744
This commit is contained in:
Fan Zhang
2018-04-03 01:54:04 -07:00
committed by android-build-merger
parent 87e4022129 893f9db1ac
commit f60c3384fa
16 changed files with 113 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/applications/appinfo/PictureInPictureSettings.java
View File

@@ -40,7 +40,6 @@ import com.android.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.notification.EmptyTextSettings;
import com.android.settings.widget.AppPreference;
import com.android.settings.wrapper.UserManagerWrapper;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import java.text.Collator;
@@ -88,7 +87,7 @@ public class PictureInPictureSettings extends EmptyTextSettings {
private Context mContext;
private PackageManagerWrapper mPackageManager;
private UserManagerWrapper mUserManager;
private UserManager mUserManager;
private IconDrawableFactory mIconDrawableFactory;
/**
@@ -119,7 +118,7 @@ public class PictureInPictureSettings extends EmptyTextSettings {
// Do nothing
}
public PictureInPictureSettings(PackageManagerWrapper pm, UserManagerWrapper um) {
public PictureInPictureSettings(PackageManagerWrapper pm, UserManager um) {
mPackageManager = pm;
mUserManager = um;
}
@@ -130,7 +129,7 @@ public class PictureInPictureSettings extends EmptyTextSettings {
mContext = getActivity();
mPackageManager = new PackageManagerWrapper(mContext.getPackageManager());
mUserManager = new UserManagerWrapper(mContext.getSystemService(UserManager.class));
mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
mIconDrawableFactory = IconDrawableFactory.newInstance(mContext);
}