Merge "Update top level menu items summary text." (ec463f8f) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+15 −1

Original line number	Diff line number	Diff line
		@@ -3030,6 +3030,8 @@
		android:value="com.android.settings.category.ia.homepage"/>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.network.NetworkDashboardFragment"/>
		<meta-data android:name="com.android.settings.summary"
		android:value="@string/network_dashboard_summary"/>
		</activity>

		<activity-alias android:name="DataUsageDashboardAlias"
		@@ -3053,6 +3055,8 @@
		android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"/>
		<meta-data android:name="com.android.settings.category"
		android:value="com.android.settings.category.ia.homepage"/>
		<meta-data android:name="com.android.settings.summary"
		android:value="@string/connected_devices_dashboard_summary"/>
		</activity>

		<activity android:name=".Settings$AppAndNotificationDashboardActivity"
		@@ -3065,6 +3069,8 @@
		android:value="com.android.settings.applications.AppAndNotificationDashboardFragment"/>
		<meta-data android:name="com.android.settings.category"
		android:value="com.android.settings.category.ia.homepage"/>
		<meta-data android:name="com.android.settings.summary"
		android:value="@string/app_and_notification_dashboard_summary"/>
		</activity>

		<activity-alias android:name="BatteryDashboardAlias"
		@@ -3089,6 +3095,8 @@
		android:value="com.android.settings.DisplaySettings" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		android:value="true" />
		<meta-data android:name="com.android.settings.summary"
		android:value="@string/display_dashboard_summary"/>
		</activity-alias>

		<activity-alias android:name="SoundDashboardAlias"
		@@ -3102,6 +3110,8 @@
		android:value="com.android.settings.notification.SoundSettings" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		android:value="true" />
		<meta-data android:name="com.android.settings.summary"
		android:value="@string/sound_dashboard_summary"/>
		</activity-alias>

		<activity android:name=".Settings$StorageDashboardActivity"
		@@ -3167,6 +3177,8 @@
		android:value="com.android.settings.accessibility.AccessibilitySettings" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		android:value="true" />
		<meta-data android:name="com.android.settings.summary"
		android:resource="@string/accessibility_settings_summary" />
		</activity-alias>

		<activity android:name=".Settings$SystemDashboardActivity"
		@@ -3179,6 +3191,8 @@
		android:value="com.android.settings.category.ia.homepage"/>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.system.SystemDashboardFragment"/>
		<meta-data android:name="com.android.settings.summary"
		android:value="@string/system_dashboard_summary"/>
		</activity>

		<activity android:name=".Settings$SupportDashboardActivity"
		@@ -3192,7 +3206,7 @@
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.dashboard.SupportFragment"/>
		<meta-data android:name="com.android.settings.summary"
		android:resource="@string/help_label"/>
		android:resource="@string/support_summary"/>
		</activity>

		<!-- Alias for IME & Language in new IA. Should merge into TargetActivity when launch -->

res/values/strings.xml

+22 −4

Original line number	Diff line number	Diff line
		@@ -743,7 +743,8 @@
		<!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
		<string name="account_settings_title">Accounts</string>
		<!-- Main Settings screen setting option title for the item to take you to the security screen -->
		<string name="security_settings_title">Security & lockscreen</string>
		<string name="security_settings_title">Security & screen lock</string>

		<!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
		<string name="security_settings_summary">Set My Location, screen unlock, SIM card lock, credential storage lock</string>
		<!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
		@@ -754,7 +755,8 @@
		<string name="disabled_by_administrator_summary">Disabled by administrator</string>
		<!-- In the security screen, the header title for security statuses -->
		<string name="security_status_title">Security status</string>

		<!-- Summary for Security settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
		<string name="security_dashboard_summary">Location, fingerprint</string>
		<!-- Fingerprint enrollment and settings --><skip />
		<!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
		<string name="security_settings_fingerprint_preference_title">Fingerprint</string>
		@@ -3960,6 +3962,8 @@
		<string name="accessibility_settings">Accessibility</string>
		<!-- Settings title for accessibility settings screen -->
		<string name="accessibility_settings_title">Accessibility settings</string>
		<!-- Summary for Accessibility settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
		<string name="accessibility_settings_summary">Screen readers, audio, display, interaction controls</string>
		<!-- Settings title for a brief version of Vision-Related Accessibility Settings. Displayed in Setup Wizard only. [CHAR LIMIT=35] -->
		<string name="vision_settings_title">Vision Settings</string>
		<!-- Settings description for a brief version of Vision-Related Accessibility Settings. Tells the user that they can adjust these settings now to help them through the remainder of the Setup Wizard and that they can later be changed in Settings. Displayed in Setup Wizard only. [CHAR LIMIT=none] -->
		@@ -5698,6 +5702,9 @@
		<!-- Help menu label [CHAR LIMIT=20] -->
		<string name="help_label">Help & feedback</string>

		<!-- Summary text for support setting tile [CHAR LIMIT=None] -->
		<string name="support_summary">Help articles, phone & chat support</string>

		<!-- Help URI, Default [DO NOT TRANSLATE] -->
		<string name="help_uri_default" translatable="false"></string>
		<!-- Help URI, Android beam [DO NOT TRANSLATE] -->
		@@ -5956,17 +5963,23 @@

		<!-- Title for setting tile leading to network and Internet settings [CHAR LIMIT=40]-->
		<string name="network_dashboard_title">Network & internet</string>
		<!-- Summary for Network and Internet settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
		<string name="network_dashboard_summary">Wi-Fi, cellular, data usage, hotspot</string>
		<!-- Title for setting tile leading to Connected devices settings [CHAR LIMIT=40]-->
		<string name="connected_devices_dashboard_title">Connected devices</string>
		<!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
		<string name="connected_devices_dashboard_summary">Bluetooth, NFC, cast</string>
		<!-- Title for setting tile leading to Apps & Notification settings [CHAR LIMIT=40]-->
		<string name="app_and_notification_dashboard_title">Apps & notifications</string>
		<!-- Summary for Apps & Notification settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
		<string name="app_and_notification_dashboard_summary">Permissions, default apps</string>
		<!-- Title for setting tile leading to User and accounts settings [CHAR LIMIT=40]-->
		<string name="account_dashboard_title">User & accounts</string>
		<!-- Title for setting tile leading to setting UI which allows user set default app to
		handle actions such as open web page, making phone calls, default SMS apps [CHAR LIMIT=40]-->
		<string name="app_default_dashboard_title">Default apps</string>
		<!-- Summary text for system preference tile, showing current display language of device [CHAR LIMIT=NONE]-->
		<string name="system_dashboard_summary">Language: <xliff:g id="language">%1$s</xliff:g></string>
		<!-- Summary text for system preference tile, showing important setting items under system setting [CHAR LIMIT=NONE]-->
		<string name="system_dashboard_summary">Languages, backup, updates, about phone</string>

		<!-- Search strings -->
		<!-- Text to describe the search results fragment title [CHAR LIMIT=16] -->
		@@ -6060,6 +6073,9 @@
		[CHAR LIMIT=100] -->
		<string name="sound_settings_summary">Ring volume at <xliff:g id="percentage" example="2%">%1$s</xliff:g></string>

		<!-- Summary for sound settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
		<string name="sound_dashboard_summary">Volume, vibration, Do not disturb</string>

		<!-- Sound: Dashboard summary indicating the volume of ringtone when at 0% with vibrate enabled. [CHAR LIMIT=100] -->
		<string name="sound_settings_summary_vibrate">Ringer set to vibrate</string>

		@@ -7401,6 +7417,8 @@

		<!-- Summary of display with screen sleep timeout [CHAR LIMIT=NONE] -->
		<string name="display_summary">Sleep after <xliff:g id="timeout_description" example="10 minutes">%1$s</xliff:g> of inactivity</string>
		<!-- Summary for Display settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
		<string name="display_dashboard_summary">Wallpaper, sleep, font size</string>
		<!-- Example summary of display used in Setup Wizard preview screen [CHAR LIMIT=NONE] -->
		<string name="display_summary_example">Sleep after 10 minutes of inactivity</string>

src/com/android/settings/DisplaySettings.java

+0 −46

Original line number	Diff line number	Diff line
		@@ -16,15 +16,12 @@

		package com.android.settings;

		import android.app.Activity;
		import android.content.Context;
		import android.provider.SearchIndexableResource;
		import android.provider.Settings;

		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.core.PreferenceController;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settings.dashboard.SummaryLoader;
		import com.android.settings.display.AutoBrightnessPreferenceController;
		import com.android.settings.display.AutoRotatePreferenceController;
		import com.android.settings.display.CameraGesturePreferenceController;
		@@ -42,13 +39,10 @@ import com.android.settings.display.WallpaperPreferenceController;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.search.Indexable;
		import com.android.settingslib.drawer.CategoryKey;

		import java.util.ArrayList;
		import java.util.List;

		import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;

		public class DisplaySettings extends DashboardFragment {
		private static final String TAG = "DisplaySettings";

		@@ -102,46 +96,6 @@ public class DisplaySettings extends DashboardFragment {
		return R.string.help_uri_display;
		}

		private static class SummaryProvider implements SummaryLoader.SummaryProvider {
		private final Context mContext;
		private final SummaryLoader mLoader;

		private SummaryProvider(Context context, SummaryLoader loader) {
		mContext = context;
		mLoader = loader;
		}

		@Override
		public void setListening(boolean listening) {
		if (listening) {
		updateSummary();
		}
		}

		private void updateSummary() {
		final long currentTimeout = Settings.System.getLong(mContext.getContentResolver(),
		SCREEN_OFF_TIMEOUT, TimeoutPreferenceController.FALLBACK_SCREEN_TIMEOUT_VALUE);
		final CharSequence[] entries =
		mContext.getResources().getTextArray(R.array.screen_timeout_entries);
		final CharSequence[] values =
		mContext.getResources().getTextArray(R.array.screen_timeout_values);
		final CharSequence timeoutDescription = TimeoutPreferenceController
		.getTimeoutDescription(currentTimeout, entries, values);
		final String summary = timeoutDescription == null ? ""
		: mContext.getString(R.string.display_summary, timeoutDescription);
		mLoader.setSummary(this, summary);
		}
		}

		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);
		}
		};

		public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider() {
		@Override

src/com/android/settings/SecuritySettings.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1300,7 +1300,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
		dashboardFeatureProvider.getTilesForCategory(CategoryKey.CATEGORY_SECURITY);
		mSummaryLoader.setSummary(this, getPackageVerifierSummary(dashboardCategory));
		} else {
		mSummaryLoader.setSummary(this, null);
		mSummaryLoader.setSummary(this,
		mContext.getString(R.string.security_dashboard_summary));
		}
		}

src/com/android/settings/accounts/UserAndAccountDashboardFragment.java

+35 −0

Original line number	Diff line number	Diff line
		@@ -15,14 +15,19 @@
		*/
		package com.android.settings.accounts;

		import android.app.Activity;
		import android.content.Context;
		import android.content.pm.UserInfo;
		import android.os.Bundle;
		import android.os.UserHandle;
		import android.os.UserManager;
		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.dashboard.DashboardFragment;
		import com.android.settings.dashboard.SummaryLoader;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settingslib.drawer.Tile;
		@@ -81,6 +86,36 @@ public class UserAndAccountDashboardFragment extends DashboardFragment {
		return true;
		}

		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) {
		UserInfo info = mContext.getSystemService(UserManager.class).getUserInfo(
		UserHandle.myUserId());
		mSummaryLoader.setSummary(this, mContext.getString(R.string.user_summary,
		info.name));
		}
		}
		}

		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);
		}
		};

		public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider() {
		@Override