Merge "Use FooterPreference in AccountSyncSettings page"

This commit is contained in:
TreeHugger Robot
2019-08-06 15:18:33 +00:00
committed by Android (Google) Code Review
5 changed files with 117 additions and 67 deletions

View File

@@ -42,12 +42,14 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.widget.FooterPreference;
import com.google.android.collect.Lists;
@@ -458,8 +460,7 @@ public class AccountSyncSettings extends AccountPreferenceBase {
syncPref.setChecked(oneTimeSyncMode || syncEnabled);
}
if (syncIsFailing) {
mFooterPreferenceMixin.createFooterPreference()
.setTitle(R.string.sync_is_failing);
createFooterPreference();
}
}
@@ -552,4 +553,11 @@ public class AccountSyncSettings extends AccountPreferenceBase {
| DateUtils.FORMAT_SHOW_YEAR
| DateUtils.FORMAT_SHOW_TIME);
}
@VisibleForTesting
void createFooterPreference() {
final FooterPreference footerPreference = new FooterPreference(getActivity());
footerPreference.setTitle(R.string.sync_is_failing);
getPreferenceScreen().addPreference(footerPreference);
}
}