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

Merge changes from topic "two_pane_state" into sc-v2-dev am: 05896ef5fb am: ac5fa697d2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101559

Change-Id: Ic75257f310834f0ac3236487bea1e910f7018f1b
This commit is contained in:
TreeHugger Robot
2021-10-25 09:25:25 +00:00
committed by Automerger Merge Worker
parent 20b0f2b28c ac5fa697d2
commit bd311f550e
6 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.widget;
import android.app.Activity;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.text.TextUtils;
@@ -53,6 +54,7 @@ public class HighlightableTopLevelPreferenceAdapter extends PreferenceGroupAdapt
final int mIconColorHighlight;
private final Context mContext;
private final Activity mActivity;
private final RecyclerView mRecyclerView;
private final int mNormalBackgroundRes;
private String mHighlightKey;
@@ -61,12 +63,13 @@ public class HighlightableTopLevelPreferenceAdapter extends PreferenceGroupAdapt
private boolean mHighlightNeeded;
private boolean mScrolled;
public HighlightableTopLevelPreferenceAdapter(PreferenceGroup preferenceGroup,
RecyclerView recyclerView, String key) {
public HighlightableTopLevelPreferenceAdapter(Activity activity,
PreferenceGroup preferenceGroup, RecyclerView recyclerView, String key) {
super(preferenceGroup);
mRecyclerView = recyclerView;
mHighlightKey = key;
mContext = preferenceGroup.getContext();
mActivity = activity;
final TypedValue outValue = new TypedValue();
mContext.getTheme().resolveAttribute(android.R.attr.selectableItemBackground,
outValue, true /* resolveRefs */);
@@ -233,6 +236,6 @@ public class HighlightableTopLevelPreferenceAdapter extends PreferenceGroupAdapt
}
private boolean isHighlightNeeded() {
return ActivityEmbeddingUtils.isTwoPaneResolution(mContext);
return ActivityEmbeddingUtils.isTwoPaneResolution(mActivity);
}
}