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

Merge "Ensure DashboardFragment shares pref controlls with search"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-02 18:56:08 +00:00
committed by Android (Google) Code Review
parent 601d2cd991 c1c708f979
commit 05c3333cbd
7 changed files with 136 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
View File

@@ -67,7 +67,7 @@ public class BuildNumberPreferenceController extends PreferenceController
super(context);
mActivity = activity;
mFragment = fragment;
mUm = UserManager.get(context);
mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
if (lifecycle != null) {
lifecycle.addObserver(this);

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

@@ -48,7 +48,7 @@ public class EmergencyBroadcastPreferenceController extends PreferenceController
EmergencyBroadcastPreferenceController(Context context, AccountRestrictionHelper helper) {
super(context);
mHelper = helper;
mUserManager = UserManager.get(context);
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
mPm = mContext.getPackageManager();
// Enable link to CMAS app settings depending on the value in config.xml.
mCellBroadcastAppLinkEnabled = isCellBroadcastAppLinkEnabled();