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

Fix build for jetpack update

Browse Source 
Fix build for jetpack update

Bug: 265818545
Test: build

Change-Id: If48e7338ee560d995cb8bff7b5348ab36c457836
This commit is contained in:
Jiaming Liu
2023-02-02 03:49:48 +00:00
committed by Anvesh Renikindi
parent a9394d1796
commit e65283de6a
4 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/homepage/TopLevelSettings.java
View File

@@ -36,7 +36,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
import androidx.recyclerview.widget.RecyclerView;
import androidx.window.embedding.SplitController;
import androidx.window.embedding.ActivityEmbeddingController;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -66,7 +66,7 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi
private int mPaddingHorizontal;
private boolean mScrollNeeded = true;
private boolean mFirstStarted = true;
private SplitController mSplitController;
private ActivityEmbeddingController mActivityEmbeddingController;
public TopLevelSettings() {
final Bundle args = new Bundle();
@@ -163,13 +163,13 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi
}
}
/** Wrap SplitController#isActivityEmbedded for testing. */
/** Wrap ActivityEmbeddingController#isActivityEmbedded for testing. */
@VisibleForTesting
public boolean isActivityEmbedded() {
if (mSplitController == null) {
mSplitController = SplitController.getInstance(getActivity());
if (mActivityEmbeddingController == null) {
mActivityEmbeddingController = ActivityEmbeddingController.getInstance(getActivity());
}
return mSplitController.isActivityEmbedded(getActivity());
return mActivityEmbeddingController.isActivityEmbedded(getActivity());
}
@Override