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

Merge "Add intent filter to launch usage access for app."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-09-21 21:31:38 +00:00
committed by Android (Google) Code Review
parent 88ee1c83d7 104ee2e423
commit 10bf029635
5 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/Settings.java
View File

@@ -68,6 +68,7 @@ public class Settings extends SettingsActivity {
public static class AccessibilityDaltonizerSettingsActivity extends SettingsActivity { /* empty */ }
public static class SecurityDashboardActivity extends SettingsActivity { /* empty */ }
public static class UsageAccessSettingsActivity extends SettingsActivity { /* empty */ }
public static class AppUsageAccessSettingsActivity extends SettingsActivity { /* empty */ }
public static class LocationSettingsActivity extends SettingsActivity { /* empty */ }
public static class ScanningSettingsActivity extends SettingsActivity { /* empty */ }
public static class PrivacySettingsActivity extends SettingsActivity { /* empty */ }

11
src/com/android/settings/applications/AppInfoBase.java
View File

@@ -60,8 +60,7 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
public static final String ARG_PACKAGE_NAME = "package";
public static final String ARG_PACKAGE_UID = "uid";
protected static final String TAG = AppInfoBase.class.getSimpleName();
protected static final boolean localLOGV = false;
private static final String TAG = "AppInfoBase";
protected EnforcedAdmin mAppsControlDisallowedAdmin;
protected boolean mAppsControlDisallowedBySystem;
@@ -113,7 +112,7 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
getActivity(), UserManager.DISALLOW_APPS_CONTROL, mUserId);
if (!refreshUi()) {
setIntentAndFinish(true, true);
setIntentAndFinish(true /* appChanged */);
}
}
@@ -159,8 +158,8 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
return mPackageName;
}
protected void setIntentAndFinish(boolean finish, boolean appChanged) {
if (localLOGV) Log.i(TAG, "appChanged=" + appChanged);
protected void setIntentAndFinish(boolean appChanged) {
Log.i(TAG, "appChanged=" + appChanged);
Intent intent = new Intent();
intent.putExtra(ManageApplications.APP_CHG, appChanged);
SettingsActivity sa = (SettingsActivity) getActivity();
@@ -216,7 +215,7 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
@Override
public void onPackageListChanged() {
if (!refreshUi()) {
setIntentAndFinish(true, true);
setIntentAndFinish(true /* appChanged */);
}
}

2
src/com/android/settings/applications/AppInfoWithHeader.java
View File

@@ -30,6 +30,8 @@ import com.android.settingslib.applications.AppUtils;
public abstract class AppInfoWithHeader extends AppInfoBase {
private static final String TAG = "AppInfoWithHeader";
private boolean mCreated;
@Override

2
src/com/android/settings/applications/AppStorageSettings.java
View File

@@ -510,7 +510,7 @@ public class AppStorageSettings extends AppInfoWithHeader
public void onClick(DialogInterface dialog, int which) {
mButtonsPref.setButton1Enabled(false);
//force to recompute changed value
setIntentAndFinish(false, false);
setIntentAndFinish(false /* appChanged */);
}
})
.create();