OSDN Git Service

Refactor nfc preference controller
authorChihhang Chuang <chihhangchuang@google.com>
Thu, 29 Mar 2018 09:26:04 +0000 (17:26 +0800)
committerChihhang Chuang <chihhangchuang@google.com>
Thu, 24 May 2018 02:31:44 +0000 (10:31 +0800)
commit6719a9b73e7b72292a98db322a26396da6385db7
treebf5c0c9710253c405745c0d168e795600cb72b7c
parent5a0a7ef4bbeed9b3c54c8fec38c89a3827563e02
Refactor nfc preference controller

- Remove BaseNfcPreferenceController.
- NfcPreferenceController inherit from TogglePreferenceController.
- AndroidBeamPreferenceController inherit from BasePreferenceController.
- Override getIntentFilter in NfcPreferenceController to listen changes.
- Add an API (hasAsyncUpdate) into BasePreferenceController to
distinguish the setting which is updated asynchronously.

Change-Id: I1abe4410169e305a0d6106e24c54e7f2e763fc91
Merged-In: I7c9c48ea7f1ad01a02524beabf9d30baa3db891f
Fixes: 67997761
Fixes: 74887543
Test: RunSettingsRoboTests
19 files changed:
res/xml/connected_devices_advanced.xml
src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java
src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
src/com/android/settings/core/BasePreferenceController.java
src/com/android/settings/nfc/AndroidBeamEnabler.java
src/com/android/settings/nfc/AndroidBeamPreferenceController.java
src/com/android/settings/nfc/BaseNfcPreferenceController.java [deleted file]
src/com/android/settings/nfc/NfcAirplaneModeObserver.java [new file with mode: 0644]
src/com/android/settings/nfc/NfcEnabler.java
src/com/android/settings/nfc/NfcPreferenceController.java
src/com/android/settings/slices/SliceBroadcastReceiver.java
tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java
tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java
tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java [new file with mode: 0644]
tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java
tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
tests/robotests/src/com/android/settings/testutils/FakeToggleController.java
tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java