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

Merge "Add ability to handle onActivityResult for AbstractPreferenceController in DashboardFragment" into udc-dev

Browse Source
This commit is contained in:
Jason Hsu
2023-04-14 09:42:43 +00:00
committed by Android (Google) Code Review
parent cd0176ba92 d3b3ed5e6d
commit 32614f2b52
2 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/dashboard/DashboardFragment.java
View File

@@ -19,12 +19,15 @@ import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.preference.PreferenceManager.OnActivityResultListener;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.Log;
import androidx.annotation.CallSuper;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.LifecycleObserver;
import androidx.preference.Preference;
@@ -265,6 +268,19 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
getMetricsCategory(), null, 0);
}
@Override
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
for (List<AbstractPreferenceController> controllerList : mPreferenceControllers.values()) {
for (AbstractPreferenceController controller : controllerList) {
if (controller instanceof OnActivityResultListener) {
((OnActivityResultListener) controller).onActivityResult(
requestCode, resultCode, data);
}
}
}
super.onActivityResult(requestCode, resultCode, data);
}
protected boolean shouldForceRoundedIcon() {
return false;
}