Merge "Fix can't start injected item problem" into tm-dev am: 74c324b70f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18570252 Change-Id: Ie33b331b8facb0d59287bf445dd93bee1054cbe5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -185,9 +185,9 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
|
|||||||
&& ActivityEmbeddingUtils.isEmbeddingActivityEnabled(mContext)) {
|
&& ActivityEmbeddingUtils.isEmbeddingActivityEnabled(mContext)) {
|
||||||
// Highlight the preference whenever it's clicked
|
// Highlight the preference whenever it's clicked
|
||||||
final TopLevelSettings topLevelSettings = (TopLevelSettings) fragment;
|
final TopLevelSettings topLevelSettings = (TopLevelSettings) fragment;
|
||||||
topLevelSettings.setHighlightPreferenceKey(key);
|
|
||||||
highlightMixin = topLevelSettings.getHighlightMixin();
|
highlightMixin = topLevelSettings.getHighlightMixin();
|
||||||
isDuplicateClick = topLevelSettings.isDuplicateClick(preference);
|
isDuplicateClick = topLevelSettings.isDuplicateClick(preference);
|
||||||
|
topLevelSettings.setHighlightPreferenceKey(key);
|
||||||
}
|
}
|
||||||
launchIntentOrSelectProfile(activity, tile, intent, sourceMetricsCategory,
|
launchIntentOrSelectProfile(activity, tile, intent, sourceMetricsCategory,
|
||||||
highlightMixin, isDuplicateClick);
|
highlightMixin, isDuplicateClick);
|
||||||
|
Reference in New Issue
Block a user