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

Settings Fragment Migration (Build pass app)

Browse Source 
This patch focused on fixing compile errors and some runtime errors.

Test: We can't test it now. But we will have an integration test later.
Bug: 110259478
Change-Id: I16c471ddcd0fa1460c665b7f74d86fcace5ee67b
This commit is contained in:
tmfang
2018-06-28 11:39:05 +08:00
committed by Fan Zhang
parent 99cc23d0da
commit 27c84de325
164 changed files with 792 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,7 @@ public class ConfigureNotificationSettings extends DashboardFragment {
} else {
app = null;
}
return buildPreferenceControllers(context, getLifecycle(), app, this);
return buildPreferenceControllers(context, getSettingsLifecycle(), app, this);
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
@@ -119,7 +119,7 @@ public class ConfigureNotificationSettings extends DashboardFragment {
if (preference instanceof RingtonePreference) {
mRequestPreference = (RingtonePreference) preference;
mRequestPreference.onPrepareRingtonePickerIntent(mRequestPreference.getIntent());
startActivityForResultAsUser(
getActivity().startActivityForResultAsUser(
mRequestPreference.getIntent(),
REQUEST_CODE,
null,

5
src/com/android/settings/notification/HeaderPreferenceController.java
View File

@@ -34,15 +34,16 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
public class HeaderPreferenceController extends NotificationPreferenceController
implements PreferenceControllerMixin, LifecycleObserver {
private final PreferenceFragment mFragment;
private final PreferenceFragmentCompat mFragment;
private EntityHeaderController mHeaderController;
private boolean mStarted = false;
public HeaderPreferenceController(Context context, PreferenceFragment fragment) {
public HeaderPreferenceController(Context context, PreferenceFragmentCompat fragment) {
super(context, null);
mFragment = fragment;
}

4
src/com/android/settings/notification/NotificationLockscreenPreference.java
View File

@@ -36,6 +36,8 @@ import com.android.settings.RestrictedListPreference;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
import androidx.appcompat.app.AlertDialog.Builder;
public class NotificationLockscreenPreference extends RestrictedListPreference {
private boolean mAllowRemoteInput;
@@ -72,7 +74,7 @@ public class NotificationLockscreenPreference extends RestrictedListPreference {
}
@Override
protected void onPrepareDialogBuilder(AlertDialog.Builder builder,
protected void onPrepareDialogBuilder(Builder builder,
DialogInterface.OnClickListener innerListener) {
mListener = new Listener(innerListener);

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

@@ -120,7 +120,7 @@ abstract public class NotificationSettingsBase extends DashboardFragment {
loadChannelGroup();
collectConfigActivities();
getLifecycle().addObserver(use(HeaderPreferenceController.class));
getSettingsLifecycle().addObserver(use(HeaderPreferenceController.class));
for (NotificationPreferenceController controller : mControllers) {
controller.onResume(mAppRow, mChannel, mChannelGroup, mSuspendedAppsAdmin);

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

@@ -117,7 +117,7 @@ public class SoundSettings extends DashboardFragment {
if (preference instanceof RingtonePreference) {
mRequestPreference = (RingtonePreference) preference;
mRequestPreference.onPrepareRingtonePickerIntent(mRequestPreference.getIntent());
startActivityForResultAsUser(
getActivity().startActivityForResultAsUser(
mRequestPreference.getIntent(),
REQUEST_CODE,
null,
@@ -156,7 +156,7 @@ public class SoundSettings extends DashboardFragment {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, this, getLifecycle());
return buildPreferenceControllers(context, this, getSettingsLifecycle());
}
@Override
@@ -195,7 +195,7 @@ public class SoundSettings extends DashboardFragment {
for (VolumeSeekBarPreferenceController controller : volumeControllers) {
controller.setCallback(mVolumeCallback);
getLifecycle().addObserver(controller);
getSettingsLifecycle().addObserver(controller);
}
}

7
src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java
View File

@@ -36,18 +36,19 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
public class ZenAutomaticRuleHeaderPreferenceController extends AbstractZenModePreferenceController
implements PreferenceControllerMixin {
private final String KEY = PREF_KEY_APP_HEADER;
private final PreferenceFragment mFragment;
private final PreferenceFragmentCompat mFragment;
private AutomaticZenRule mRule;
private String mId;
private EntityHeaderController mController;
public ZenAutomaticRuleHeaderPreferenceController(Context context, PreferenceFragment fragment,
Lifecycle lifecycle) {
public ZenAutomaticRuleHeaderPreferenceController(Context context,
PreferenceFragmentCompat fragment, Lifecycle lifecycle) {
super(context, PREF_KEY_APP_HEADER, lifecycle);
mFragment = fragment;
}

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

@@ -43,7 +43,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase {
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
ZenServiceListing serviceListing = new ZenServiceListing(getContext(), CONFIG);
serviceListing.reloadApprovedServices();
return buildPreferenceControllers(context, this, serviceListing, getLifecycle());
return buildPreferenceControllers(context, this, serviceListing, getSettingsLifecycle());
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,

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

@@ -51,7 +51,7 @@ public class ZenModeBlockedEffectsSettings extends ZenModeSettingsBase implement
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle());
return buildPreferenceControllers(context, getSettingsLifecycle());
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,

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

@@ -37,7 +37,7 @@ public class ZenModeCallsSettings extends ZenModeSettingsBase implements Indexab
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle());
return buildPreferenceControllers(context, getSettingsLifecycle());
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,

5
src/com/android/settings/notification/ZenModeEventRuleSettings.java
View File

@@ -82,8 +82,9 @@ public class ZenModeEventRuleSettings extends ZenModeRuleSettingsBase {
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
List<AbstractPreferenceController> controllers = new ArrayList<>();
mHeader = new ZenAutomaticRuleHeaderPreferenceController(context, this,
getLifecycle());
mSwitch = new ZenAutomaticRuleSwitchPreferenceController(context, this, getLifecycle());
getSettingsLifecycle());
mSwitch = new ZenAutomaticRuleSwitchPreferenceController(context, this,
getSettingsLifecycle());
controllers.add(mHeader);
controllers.add(mSwitch);
return controllers;

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

@@ -37,7 +37,7 @@ public class ZenModeMsgEventReminderSettings extends ZenModeSettingsBase impleme
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle());
return buildPreferenceControllers(context, getSettingsLifecycle());
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,

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

@@ -42,7 +42,7 @@ public class ZenModeRestrictNotificationsSettings extends ZenModeSettingsBase im
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle());
return buildPreferenceControllers(context, getSettingsLifecycle());
}
@Override

5
src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
View File

@@ -200,8 +200,9 @@ public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase {
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
List<AbstractPreferenceController> controllers = new ArrayList<>();
mHeader = new ZenAutomaticRuleHeaderPreferenceController(context, this,
getLifecycle());
mSwitch = new ZenAutomaticRuleSwitchPreferenceController(context, this, getLifecycle());
getSettingsLifecycle());
mSwitch = new ZenAutomaticRuleSwitchPreferenceController(context, this,
getSettingsLifecycle());
controllers.add(mHeader);
controllers.add(mSwitch);

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

@@ -71,7 +71,7 @@ public class ZenModeSettings extends ZenModeSettingsBase {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle(), getFragmentManager());
return buildPreferenceControllers(context, getSettingsLifecycle(), getFragmentManager());
}
@Override

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

@@ -35,7 +35,7 @@ public class ZenModeSoundVibrationSettings extends ZenModeSettingsBase implement
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle());
return buildPreferenceControllers(context, getSettingsLifecycle());
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,