Merge "Defined help page for Data Saver." into nyc-dev (f8265a8f) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -5566,6 +5566,10 @@
		<string name="help_url_bluetooth" translatable="false"></string>
		<!-- Help URL, Data usage [DO NOT TRANSLATE] -->
		<string name="help_url_data_usage" translatable="false"></string>
		<!-- Help URL, Data saver [DO NOT TRANSLATE] -->
		<string name="help_url_data_saver" translatable="false"></string>
		<!-- Help URL, Unrestricted data access [DO NOT TRANSLATE] -->
		<string name="help_url_unrestricted_data_access" translatable="false"></string>
		<!-- Help URL, More [DO NOT TRANSLATE] -->
		<string name="help_url_more_networks" translatable="false"></string>
		<!-- Help URL, Vpn [DO NOT TRANSLATE] -->

+6 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ import android.app.Application;
		import android.os.Bundle;
		import android.support.v7.preference.Preference;
		import android.widget.Switch;

		import com.android.internal.logging.MetricsProto.MetricsEvent;
		import com.android.settings.R;
		import com.android.settings.SettingsActivity;
		@@ -94,6 +95,11 @@ public class DataSaverSummary extends SettingsPreferenceFragment
		return MetricsEvent.DATA_SAVER_SUMMARY;
		}

		@Override
		protected int getHelpResource() {
		return R.string.help_url_data_saver;
		}

		@Override
		public void onDataSaverChanged(boolean isDataSaving) {
		mSwitchBar.setChecked(isDataSaving);

+5 −0

Original line number	Diff line number	Diff line
		@@ -133,6 +133,11 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment
		rebuild();
		}

		@Override
		protected int getHelpResource() {
		return R.string.help_url_unrestricted_data_access;
		}

		private void rebuild() {
		ArrayList<AppEntry> apps = mSession.rebuild(mFilter, ApplicationsState.ALPHA_COMPARATOR);
		if (apps != null) {