Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ib03d41631d8bf961fa3ff3957eb5452411da7792
This commit is contained in:
Jason Chiu
2021-11-02 02:28:16 +00:00
committed by Automerger Merge Worker
parent cdf991a7ba 6821b6be32
commit 026b1b5df6
124 changed files with 760 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/nfc/NfcPreferenceController.java
View File

@@ -27,6 +27,7 @@ import android.widget.Switch;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.slices.SliceBackgroundWorker;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -58,7 +59,7 @@ public class NfcPreferenceController extends TogglePreferenceController
return;
}
mPreference = (MainSwitchPreference) screen.findPreference(getPreferenceKey());
mPreference = screen.findPreference(getPreferenceKey());
mPreference.addOnSwitchChangeListener(this);
mNfcEnabler = new NfcEnabler(mContext, mPreference);
}
@@ -103,6 +104,11 @@ public class NfcPreferenceController extends TogglePreferenceController
return true;
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_connected_devices;
}
@Override
public Class<? extends SliceBackgroundWorker> getBackgroundWorkerClass() {
return NfcSliceWorker.class;

6
src/com/android/settings/nfc/SecureNfcPreferenceController.java
View File

@@ -21,6 +21,7 @@ import android.nfc.NfcAdapter;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -81,6 +82,11 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
return true;
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_connected_devices;
}
@Override
public void onResume() {
if (mSecureNfcEnabler != null) {