Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32 am: 026b1b5df6

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

Change-Id: If46903bb26371ea90075d1c6cc063af4d10a88d4
This commit is contained in:
Jason Chiu
2021-11-02 02:43:42 +00:00
committed by Automerger Merge Worker
124 changed files with 760 additions and 82 deletions

View File

@@ -19,6 +19,7 @@ package com.android.settings.applications.managedomainurls;
import android.content.Context;
import android.provider.Settings;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class InstantAppWebActionPreferenceController extends TogglePreferenceController {
@@ -43,4 +44,9 @@ public class InstantAppWebActionPreferenceController extends TogglePreferenceCon
return Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.INSTANT_APPS_ENABLED, isChecked ? 1 : 0);
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_apps;
}
}