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

9
src/com/android/settings/homepage/SettingsHomepageActivity.java
View File

@@ -56,6 +56,7 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.window.embedding.ActivityEmbeddingController;
import androidx.window.embedding.SplitController;
import androidx.window.embedding.SplitRule;
@@ -104,7 +105,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements
private View mTwoPaneSuggestionView;
private CategoryMixin mCategoryMixin;
private Set<HomepageLoadedListener> mLoadedListeners;
private SplitController mSplitController;
private ActivityEmbeddingController mActivityEmbeddingController;
private boolean mIsEmbeddingActivityEnabled;
private boolean mIsTwoPane;
// A regular layout shows icons on homepage, whereas a simplified layout doesn't.
@@ -192,8 +193,8 @@ public class SettingsHomepageActivity extends FragmentActivity implements
setupEdgeToEdge();
setContentView(R.layout.settings_homepage_container);
mSplitController = SplitController.getInstance(this);
mIsTwoPane = mSplitController.isActivityEmbedded(this);
mActivityEmbeddingController = ActivityEmbeddingController.getInstance(this);
mIsTwoPane = mActivityEmbeddingController.isActivityEmbedded(this);
updateAppBarMinHeight();
initHomepageContainer();
@@ -276,7 +277,7 @@ public class SettingsHomepageActivity extends FragmentActivity implements
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
final boolean newTwoPaneState = mSplitController.isActivityEmbedded(this);
final boolean newTwoPaneState = mActivityEmbeddingController.isActivityEmbedded(this);
if (mIsTwoPane != newTwoPaneState) {
mIsTwoPane = newTwoPaneState;
updateHomepageAppBar();