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

Merge "Add new battery entry into AppInfo page launch variable" into sc-dev

Browse Source
This commit is contained in:
Wesley Wang
2021-05-26 06:59:13 +00:00
committed by Android (Google) Code Review
parent 4fce42c454 92feb9e8fc
commit a967b88ee4
4 changed files with 75 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
View File

@@ -109,6 +109,7 @@ public class AppInfoDashboardFragment extends DashboardFragment
private PackageInfo mPackageInfo;
private int mUserId;
private String mPackageName;
private int mUid;
private DevicePolicyManager mDpm;
private UserManager mUserManager;
@@ -290,7 +291,8 @@ public class AppInfoDashboardFragment extends DashboardFragment
(SettingsActivity) getActivity(), this, lifecycle, packageName, mState,
REQUEST_UNINSTALL, REQUEST_REMOVE_DEVICE_ADMIN);
controllers.add(mAppButtonsPreferenceController);
controllers.add(new AppBatteryPreferenceController(context, this, packageName, lifecycle));
controllers.add(new AppBatteryPreferenceController(
context, this, packageName, getUid(), lifecycle));
controllers.add(new AppMemoryPreferenceController(context, this, lifecycle));
controllers.add(new DefaultHomeShortcutPreferenceController(context, packageName));
controllers.add(new DefaultBrowserShortcutPreferenceController(context, packageName));
@@ -561,7 +563,7 @@ public class AppInfoDashboardFragment extends DashboardFragment
final Bundle args = getArguments();
mPackageName = (args != null) ? args.getString(ARG_PACKAGE_NAME) : null;
if (mPackageName == null) {
final Intent intent = (args == null) ?
final Intent intent = args == null ?
getActivity().getIntent() : (Intent) args.getParcelable("intent");
if (intent != null) {
mPackageName = intent.getData().getSchemeSpecificPart();
@@ -570,6 +572,22 @@ public class AppInfoDashboardFragment extends DashboardFragment
return mPackageName;
}
private int getUid() {
if (mUid > 0) {
return mUid;
}
final Bundle args = getArguments();
mUid = (args != null) ? args.getInt(ARG_PACKAGE_UID) : -1;
if (mUid <= 0) {
final Intent intent = args == null
? getActivity().getIntent() : (Intent) args.getParcelable("intent");
if (intent != null && intent.getExtras() != null) {
mUid = intent.getIntExtra("uId", -1);
}
}
return mUid;
}
@VisibleForTesting
void retrieveAppEntry() {
final Activity activity = getActivity();