Merge "Add some more summaries for Settings Home" (d3de0276) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+21 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7020,4 +7020,25 @@

	<!-- Summary of display with adaptive brightness off [CHAR LIMIT=NONE] -->		<!-- Summary of display with adaptive brightness off [CHAR LIMIT=NONE] -->
	<string name="display_summary_off">Adaptive brightness is OFF</string>		<string name="display_summary_off">Adaptive brightness is OFF</string>

			<!-- Summary of memory screen [CHAR LIMIT=NONE] -->
			<string name="memory_summary">Avg <xliff:g id="used_memory" example="1.7GB">%1$s</xliff:g> of <xliff:g id="total_memory" example="2GB">%2$s</xliff:g> memory used</string>

			<!-- Summary of user screen [CHAR LIMIT=NONE] -->
			<string name="user_summary">Signed in as <xliff:g id="user_name" example="Jason">%1$s</xliff:g></string>

			<!-- Summary of payment screen [CHAR LIMIT=NONE] -->
			<string name="payment_summary"><xliff:g id="app_name" example="Payment App">%1$s</xliff:g> is default</string>

			<!-- Summary of location screen [CHAR LIMIT=NONE] -->
			<string name="location_on_summary">ON / <xliff:g id="location_mode" example="High accuracy">%1$s</xliff:g></string>

			<!-- Location off [CHAR LIMIT=NONE] -->
			<string name="location_off_summary">OFF</string>

			<!-- Backup disabled summary [CHAR LIMIT=NONE] -->
			<string name="backup_disabled">Back up disabled</string>

			<!-- Summary of device info page [CHAR LIMIT=NONE] -->
			<string name="about_summary">Android <xliff:g id="version" example="6.0">%1$s</xliff:g></string>
	</resources>		</resources>

src/com/android/settings/DateTimeSettings.java

+30 −0

Original line number	Original line	Diff line number	Diff line
	@@ -38,6 +38,7 @@ import android.widget.DatePicker;
	import android.widget.TimePicker;		import android.widget.TimePicker;

	import com.android.internal.logging.MetricsLogger;		import com.android.internal.logging.MetricsLogger;
			import com.android.settings.dashboard.SummaryLoader;
	import com.android.settingslib.datetime.ZoneGetter;		import com.android.settingslib.datetime.ZoneGetter;

	import java.util.Calendar;		import java.util.Calendar;
	@@ -353,4 +354,33 @@ public class DateTimeSettings extends SettingsPreferenceFragment
	}		}
	}		}
	};		};

			private static class SummaryProvider implements SummaryLoader.SummaryProvider {

			private final Context mContext;
			private final SummaryLoader mSummaryLoader;

			public SummaryProvider(Context context, SummaryLoader summaryLoader) {
			mContext = context;
			mSummaryLoader = summaryLoader;
			}

			@Override
			public void setListening(boolean listening) {
			if (listening) {
			final Calendar now = Calendar.getInstance();
			mSummaryLoader.setSummary(this, ZoneGetter.getTimeZoneOffsetAndName(
			now.getTimeZone(), now.getTime()));
			}
			}
			}

			public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
			= new SummaryLoader.SummaryProviderFactory() {
			@Override
			public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
			SummaryLoader summaryLoader) {
			return new SummaryProvider(activity, summaryLoader);
			}
			};
	}		}

src/com/android/settings/DeviceInfoSettings.java

+29 −0

Original line number	Original line	Diff line number	Diff line
	@@ -36,6 +36,7 @@ import android.util.Log;
	import android.widget.Toast;		import android.widget.Toast;

	import com.android.internal.logging.MetricsLogger;		import com.android.internal.logging.MetricsLogger;
			import com.android.settings.dashboard.SummaryLoader;
	import com.android.settings.search.BaseSearchIndexProvider;		import com.android.settings.search.BaseSearchIndexProvider;
	import com.android.settings.search.Index;		import com.android.settings.search.Index;
	import com.android.settings.search.Indexable;		import com.android.settings.search.Indexable;
	@@ -337,6 +338,34 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
	startActivityForResult(intent, 0);		startActivityForResult(intent, 0);
	}		}

			private static class SummaryProvider implements SummaryLoader.SummaryProvider {

			private final Context mContext;
			private final SummaryLoader mSummaryLoader;

			public SummaryProvider(Context context, SummaryLoader summaryLoader) {
			mContext = context;
			mSummaryLoader = summaryLoader;
			}

			@Override
			public void setListening(boolean listening) {
			if (listening) {
			mSummaryLoader.setSummary(this, mContext.getString(R.string.about_summary,
			Build.VERSION.RELEASE));
			}
			}
			}

			public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
			= new SummaryLoader.SummaryProviderFactory() {
			@Override
			public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
			SummaryLoader summaryLoader) {
			return new SummaryProvider(activity, summaryLoader);
			}
			};

	/**		/**
	* For Search.		* For Search.
	*/		*/

src/com/android/settings/PrivacySettings.java

+47 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package com.android.settings;		package com.android.settings;

			import android.app.Activity;
	import android.app.backup.IBackupManager;		import android.app.backup.IBackupManager;
	import android.content.ContentResolver;		import android.content.ContentResolver;
	import android.content.Context;		import android.content.Context;
	@@ -34,6 +35,7 @@ import android.support.v7.preference.PreferenceScreen;
	import android.util.Log;		import android.util.Log;

	import com.android.internal.logging.MetricsLogger;		import com.android.internal.logging.MetricsLogger;
			import com.android.settings.dashboard.SummaryLoader;
	import com.android.settings.search.BaseSearchIndexProvider;		import com.android.settings.search.BaseSearchIndexProvider;
	import com.android.settings.search.Indexable;		import com.android.settings.search.Indexable;

	@@ -180,6 +182,51 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
	return R.string.help_url_backup_reset;		return R.string.help_url_backup_reset;
	}		}

			private static class SummaryProvider implements SummaryLoader.SummaryProvider {

			private final Context mContext;
			private final SummaryLoader mSummaryLoader;

			public SummaryProvider(Context context, SummaryLoader summaryLoader) {
			mContext = context;
			mSummaryLoader = summaryLoader;
			}

			@Override
			public void setListening(boolean listening) {
			if (listening) {
			IBackupManager backupManager = IBackupManager.Stub.asInterface(
			ServiceManager.getService(Context.BACKUP_SERVICE));
			try {
			boolean backupEnabled = backupManager.isBackupEnabled();
			if (backupEnabled) {
			String transport = backupManager.getCurrentTransport();
			String configSummary = backupManager.getDestinationString(transport);
			if (configSummary != null) {
			mSummaryLoader.setSummary(this, configSummary);
			} else {
			mSummaryLoader.setSummary(this, mContext.getString(
			R.string.backup_configure_account_default_summary));
			}
			} else {
			mSummaryLoader.setSummary(this, mContext.getString(
			R.string.backup_disabled));
			}
			} catch (RemoteException e) {
			}
			}
			}
			}

			public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
			= new SummaryLoader.SummaryProviderFactory() {
			@Override
			public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
			SummaryLoader summaryLoader) {
			return new SummaryProvider(activity, summaryLoader);
			}
			};

	/**		/**
	* For Search.		* For Search.
	*/		*/

src/com/android/settings/applications/ProcessStatsSummary.java

+38 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,8 @@
	*/		*/
	package com.android.settings.applications;		package com.android.settings.applications;

			import android.app.Activity;
			import android.content.BroadcastReceiver;
	import android.content.Context;		import android.content.Context;
	import android.os.Bundle;		import android.os.Bundle;
	import android.support.v7.preference.Preference;		import android.support.v7.preference.Preference;
	@@ -28,6 +30,7 @@ import com.android.internal.logging.MetricsLogger;
	import com.android.settings.R;		import com.android.settings.R;
	import com.android.settings.Utils;		import com.android.settings.Utils;
	import com.android.settings.applications.ProcStatsData.MemInfo;		import com.android.settings.applications.ProcStatsData.MemInfo;
			import com.android.settings.dashboard.SummaryLoader;

	public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenceClickListener {		public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenceClickListener {

	@@ -123,4 +126,39 @@ public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenc
	return false;		return false;
	}		}

			private static class SummaryProvider implements SummaryLoader.SummaryProvider {

			private final Context mContext;
			private final SummaryLoader mSummaryLoader;

			public SummaryProvider(Context context, SummaryLoader summaryLoader) {
			mContext = context;
			mSummaryLoader = summaryLoader;
			}

			@Override
			public void setListening(boolean listening) {
			if (listening) {
			ProcStatsData statsManager = new ProcStatsData(mContext, false);
			statsManager.setDuration(sDurations[0]);
			MemInfo memInfo = statsManager.getMemInfo();
			String usedResult = Formatter.formatShortFileSize(mContext,
			(long) memInfo.realUsedRam);
			String totalResult = Formatter.formatShortFileSize(mContext,
			(long) memInfo.realTotalRam);
			mSummaryLoader.setSummary(this, mContext.getString(R.string.memory_summary,
			usedResult, totalResult));
			}
			}
			}

			public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
			= new SummaryLoader.SummaryProviderFactory() {
			@Override
			public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
			SummaryLoader summaryLoader) {
			return new SummaryProvider(activity, summaryLoader);
			}
			};

	}		}