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

Depend on SettingsLib's version of lifecycle and FooterMixin.

Browse Source 
The implementations have been imported into SettingsLib. Setting's copy
can now be removed, which this change also does.

Test: Manually check battery status, which uses FooterMixin, looks OK.
make RunSettingsLibRobotTests && make RunSettingsRoboTests
     && make RunSettingsGoogleRoboTests
Change-Id: I6539605fdad80d156ff5ff249e68df4a1c412067
This commit is contained in:
Juan Lang
2017-05-09 15:42:36 -07:00
parent e1fc16892e
commit 777ed2535a
155 changed files with 287 additions and 1544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/notification/AlarmVolumePreferenceController.java
View File

@@ -20,8 +20,8 @@ import android.content.Context;
import android.media.AudioManager;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.notification.VolumeSeekBarPreference.Callback;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class AlarmVolumePreferenceController extends
VolumeSeekBarPreferenceController {

2
src/com/android/settings/notification/AppNotificationSettings.java
View File

@@ -46,10 +46,10 @@ import com.android.settings.applications.AppInfoBase;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.notification.NotificationBackend.AppRow;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.FooterPreference;
import com.android.settings.widget.MasterSwitchPreference;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.widget.FooterPreference;
import java.text.Collator;
import java.util.ArrayList;

6
src/com/android/settings/notification/BadgingNotificationPreferenceController.java
View File

@@ -28,9 +28,9 @@ import android.support.v7.preference.TwoStatePreference;
import android.util.Log;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.lifecycle.LifecycleObserver;
import com.android.settings.core.lifecycle.events.OnPause;
import com.android.settings.core.lifecycle.events.OnResume;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import static android.provider.Settings.Secure.NOTIFICATION_BADGING;

2
src/com/android/settings/notification/ChannelNotificationSettings.java
View File

@@ -47,9 +47,9 @@ import com.android.settings.applications.AppHeaderController;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.FooterPreference;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.widget.FooterPreference;
public class ChannelNotificationSettings extends NotificationSettingsBase {
private static final String TAG = "ChannelSettings";

2
src/com/android/settings/notification/ChargingSoundPreferenceController.java
View File

@@ -22,7 +22,7 @@ import android.content.Context;
import android.provider.Settings.Global;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class ChargingSoundPreferenceController extends SettingPrefController {

2
src/com/android/settings/notification/ConfigureNotificationSettings.java
View File

@@ -22,11 +22,11 @@ import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.gestures.SwipeToNotificationPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.core.lifecycle.Lifecycle;
import java.util.ArrayList;
import java.util.Arrays;

2
src/com/android/settings/notification/DialPadTonePreferenceController.java
View File

@@ -23,7 +23,7 @@ import android.content.Context;
import android.provider.Settings.System;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class DialPadTonePreferenceController extends SettingPrefController {

2
src/com/android/settings/notification/DockAudioMediaPreferenceController.java
View File

@@ -24,7 +24,7 @@ import android.content.res.Resources;
import android.provider.Settings.Global;
import android.telephony.TelephonyManager;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class DockAudioMediaPreferenceController extends SettingPrefController {

2
src/com/android/settings/notification/DockingSoundPreferenceController.java
View File

@@ -22,7 +22,7 @@ import android.content.Context;
import android.provider.Settings.Global;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class DockingSoundPreferenceController extends SettingPrefController {

2
src/com/android/settings/notification/EmergencyTonePreferenceController.java
View File

@@ -25,7 +25,7 @@ import android.provider.Settings.Global;
import android.telephony.TelephonyManager;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class EmergencyTonePreferenceController extends SettingPrefController {

6
src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
View File

@@ -32,10 +32,10 @@ import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.lifecycle.LifecycleObserver;
import com.android.settings.core.lifecycle.events.OnPause;
import com.android.settings.core.lifecycle.events.OnResume;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import java.util.ArrayList;

2
src/com/android/settings/notification/MediaVolumePreferenceController.java
View File

@@ -18,8 +18,8 @@ package com.android.settings.notification;
import android.content.Context;
import android.media.AudioManager;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.notification.VolumeSeekBarPreference.Callback;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class MediaVolumePreferenceController extends
VolumeSeekBarPreferenceController {

2
src/com/android/settings/notification/NotificationSettingsBase.java
View File

@@ -26,10 +26,10 @@ import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.widget.FooterPreference;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.widget.FooterPreference;
import android.app.Notification;
import android.app.NotificationChannel;

2
src/com/android/settings/notification/NotificationVolumePreferenceController.java
View File

@@ -21,8 +21,8 @@ import android.media.AudioManager;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.Utils;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.notification.VolumeSeekBarPreference.Callback;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class NotificationVolumePreferenceController extends
RingVolumePreferenceController {

6
src/com/android/settings/notification/PulseNotificationPreferenceController.java
View File

@@ -28,9 +28,9 @@ import android.support.v7.preference.TwoStatePreference;
import android.util.Log;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.lifecycle.LifecycleObserver;
import com.android.settings.core.lifecycle.events.OnPause;
import com.android.settings.core.lifecycle.events.OnResume;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE;

2
src/com/android/settings/notification/RingVolumePreferenceController.java
View File

@@ -33,8 +33,8 @@ import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.Utils;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.notification.VolumeSeekBarPreference.Callback;
import com.android.settingslib.core.lifecycle.Lifecycle;
import java.util.Objects;

2
src/com/android/settings/notification/ScreenLockSoundPreferenceController.java
View File

@@ -22,7 +22,7 @@ import android.content.Context;
import android.provider.Settings.System;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class ScreenLockSoundPreferenceController extends SettingPrefController {

8
src/com/android/settings/notification/SettingPrefController.java
View File

@@ -28,10 +28,10 @@ import android.support.v7.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.core.lifecycle.LifecycleObserver;
import com.android.settings.core.lifecycle.events.OnPause;
import com.android.settings.core.lifecycle.events.OnResume;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import java.util.List;
public abstract class SettingPrefController extends PreferenceController implements

2
src/com/android/settings/notification/SoundSettings.java
View File

@@ -32,9 +32,9 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.RingtonePreference;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
import java.util.ArrayList;
import java.util.Arrays;

2
src/com/android/settings/notification/TouchSoundPreferenceController.java
View File

@@ -24,7 +24,7 @@ import android.media.AudioManager;
import android.os.AsyncTask;
import android.provider.Settings.System;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class TouchSoundPreferenceController extends SettingPrefController {

2
src/com/android/settings/notification/VibrateOnTouchPreferenceController.java
View File

@@ -22,7 +22,7 @@ import android.content.Context;
import android.os.Vibrator;
import android.provider.Settings.System;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class VibrateOnTouchPreferenceController extends SettingPrefController {

6
src/com/android/settings/notification/VibrateWhenRingPreferenceController.java
View File

@@ -28,9 +28,9 @@ import android.support.v7.preference.TwoStatePreference;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.lifecycle.LifecycleObserver;
import com.android.settings.core.lifecycle.events.OnPause;
import com.android.settings.core.lifecycle.events.OnResume;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import static android.provider.Settings.System.VIBRATE_WHEN_RINGING;

8
src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
View File

@@ -19,11 +19,11 @@ package com.android.settings.notification;
import android.content.Context;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.core.lifecycle.LifecycleObserver;
import com.android.settings.core.lifecycle.events.OnPause;
import com.android.settings.core.lifecycle.events.OnResume;
import com.android.settings.notification.VolumeSeekBarPreference.Callback;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
/**
* Base class for preference controller that handles VolumeSeekBarPreference

8
src/com/android/settings/notification/WorkSoundPreferenceController.java
View File

@@ -45,10 +45,10 @@ import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.core.lifecycle.LifecycleObserver;
import com.android.settings.core.lifecycle.events.OnPause;
import com.android.settings.core.lifecycle.events.OnResume;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
public class WorkSoundPreferenceController extends PreferenceController implements
OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {