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

Merge "Add spa flag for Picture-in-picture App List"

Browse Source
This commit is contained in:
Chaohui Wang
2022-12-13 10:46:00 +00:00
committed by Android (Google) Code Review
parent ef2652887a 9f735ab6ed
commit 3199d66b93
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java
View File

@@ -28,6 +28,7 @@ import android.content.pm.UserInfo;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.util.FeatureFlagUtils;
import android.util.IconDrawableFactory; import android.util.IconDrawableFactory;
import android.util.Pair; import android.util.Pair;
import android.view.View; import android.view.View;
@@ -40,6 +41,8 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.applications.AppInfoBase; import com.android.settings.applications.AppInfoBase;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.spa.SpaActivity;
import com.android.settings.spa.app.specialaccess.PictureInPictureListProvider;
import com.android.settings.widget.EmptyTextSettings; import com.android.settings.widget.EmptyTextSettings;
import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.widget.AppPreference; import com.android.settingslib.widget.AppPreference;
@@ -126,6 +129,16 @@ public class PictureInPictureSettings extends EmptyTextSettings {
mUserManager = um; mUserManager = um;
} }
@Override
public void onAttach(Context context) {
super.onAttach(context);
if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_ENABLE_SPA)) {
SpaActivity.startSpaActivity(
context, PictureInPictureListProvider.INSTANCE.getAppListRoute());
finish();
}
}
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);