diff --git a/res/values/strings.xml b/res/values/strings.xml index e3259b2384b..1e418208880 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -6181,6 +6181,8 @@ + + @@ -6198,6 +6200,26 @@ + + + + + + + + + + + + + + + + + + + + Account for content diff --git a/src/com/android/settings/EncryptionAndCredential.java b/src/com/android/settings/EncryptionAndCredential.java index f6f17cfacc6..3cb2740ad73 100644 --- a/src/com/android/settings/EncryptionAndCredential.java +++ b/src/com/android/settings/EncryptionAndCredential.java @@ -168,7 +168,7 @@ public class EncryptionAndCredential extends SettingsPreferenceFragment implemen @Override protected int getHelpResource() { - return R.string.help_url_security; + return R.string.help_url_encryption; } /** diff --git a/src/com/android/settings/ScreenPinningSettings.java b/src/com/android/settings/ScreenPinningSettings.java index c4870f74510..5209cc745b4 100644 --- a/src/com/android/settings/ScreenPinningSettings.java +++ b/src/com/android/settings/ScreenPinningSettings.java @@ -74,6 +74,11 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment mSwitchBar.setChecked(isLockToAppEnabled(getActivity())); } + @Override + protected int getHelpResource() { + return R.string.help_url_screen_pinning; + } + @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); diff --git a/src/com/android/settings/TrustAgentSettings.java b/src/com/android/settings/TrustAgentSettings.java index 2f4660e2905..0e5cd2c1971 100644 --- a/src/com/android/settings/TrustAgentSettings.java +++ b/src/com/android/settings/TrustAgentSettings.java @@ -35,7 +35,6 @@ import android.util.ArraySet; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.overlay.FeatureFactory; -import com.android.settings.security.SecurityFeatureProvider; import com.android.settings.trustagent.TrustAgentManager; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; @@ -78,6 +77,11 @@ public class TrustAgentSettings extends SettingsPreferenceFragment implements return MetricsEvent.TRUST_AGENT; } + @Override + protected int getHelpResource() { + return R.string.help_url_trust_agent; + } + @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java index 21ead465854..da47a95d653 100644 --- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java @@ -51,6 +51,11 @@ public class AccessibilityShortcutPreferenceFragment extends ToggleFeaturePrefer return MetricsEvent.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE; } + @Override + protected int getHelpResource() { + return R.string.help_url_accessibility_shortcut; + } + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java index 68979ad61b3..9715559eec2 100644 --- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java @@ -31,11 +31,9 @@ import android.view.accessibility.AccessibilityManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.core.PreferenceController; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -67,6 +65,11 @@ public final class MagnificationPreferenceFragment extends SettingsPreferenceFra mMagnificationNavbarPreference = findPreference(MAGNIFICATION_NAVBAR_PREFERENCE_SCREEN_KEY); } + @Override + protected int getHelpResource() { + return R.string.help_url_magnification; + } + @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java index b3d826669fd..16df03e48e4 100644 --- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java @@ -104,6 +104,11 @@ public class ToggleAutoclickPreferenceFragment extends ToggleFeaturePreferenceFr return MetricsEvent.ACCESSIBILITY_TOGGLE_AUTOCLICK; } + @Override + protected int getHelpResource() { + return R.string.help_url_autoclick; + } + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java index e781d306f91..64d38af6095 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -41,6 +41,11 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF return MetricsEvent.ACCESSIBILITY_TOGGLE_DALTONIZER; } + @Override + protected int getHelpResource() { + return R.string.help_url_color_correction; + } + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java index 843b7fce98c..dd34a0f5cda 100644 --- a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java +++ b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java @@ -96,6 +96,11 @@ public class AccountDetailDashboardFragment extends DashboardFragment { return TAG; } + @Override + protected int getHelpResource() { + return R.string.help_url_account_detail; + } + @Override protected int getPreferenceScreenResId() { return R.xml.account_type_settings; diff --git a/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java b/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java index a5a92ee16fd..792b77a6922 100644 --- a/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java +++ b/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java @@ -57,6 +57,11 @@ public class UserAndAccountDashboardFragment extends DashboardFragment { return R.xml.user_and_accounts_settings; } + @Override + protected int getHelpResource() { + return R.string.help_url_user_and_account_dashboard; + } + @Override protected List getPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); diff --git a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java index 9f915645bd4..df1430c116c 100644 --- a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java +++ b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java @@ -53,6 +53,11 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment { mProgressiveDisclosureMixin.setTileLimit(3); } + @Override + protected int getHelpResource() { + return R.string.help_url_apps_and_notifications; + } + @Override protected int getPreferenceScreenResId() { return R.xml.app_and_notification; diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java index 8fd41dfbac8..d477d8c3c2a 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -18,6 +18,7 @@ package com.android.settings.applications; import android.annotation.IdRes; import android.annotation.Nullable; +import android.annotation.StringRes; import android.app.Activity; import android.content.Context; import android.content.Intent; @@ -148,7 +149,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment public static final int FILTER_APPS_COUNT = 13; // This should always be the last entry // Mapping to string labels for the FILTER_APPS_* constants above. - public static final @IdRes int[] FILTER_LABELS = new int[FILTER_APPS_COUNT]; + @IdRes + public static final int[] FILTER_LABELS = new int[FILTER_APPS_COUNT]; // Mapping to filters for the FILTER_APPS_* constants above. public static final AppFilter[] FILTERS = new AppFilter[FILTER_APPS_COUNT]; @@ -261,8 +263,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment // List types that should show instant apps. public static final Set LIST_TYPES_WITH_INSTANT = new ArraySet<>(Arrays.asList( - LIST_TYPE_MAIN, - LIST_TYPE_STORAGE)); + LIST_TYPE_MAIN, + LIST_TYPE_STORAGE)); private View mRootView; @@ -338,7 +340,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { + Bundle savedInstanceState) { // initialize the inflater mInflater = inflater; @@ -425,7 +427,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment } @VisibleForTesting - static @Nullable AppFilter getCompositeFilter(int listType, int storageType, String volumeUuid) { + @Nullable + static AppFilter getCompositeFilter(int listType, int storageType, String volumeUuid) { AppFilter filter = new VolumeFilter(volumeUuid); if (listType == LIST_TYPE_STORAGE) { if (storageType == STORAGE_TYPE_MUSIC) { @@ -595,8 +598,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment startAppInfoFragment(AppStorageSettings.class, R.string.storage_movies_tv); break; // TODO: Figure out if there is a way where we can spin up the profile's settings - // process ahead of time, to avoid a long load of data when user clicks on a managed app. - // Maybe when they load the list of apps that contains managed profile apps. + // process ahead of time, to avoid a long load of data when user clicks on a managed + // app. Maybe when they load the list of apps that contains managed profile apps. default: startAppInfoFragment(InstalledAppDetails.class, R.string.application_info_label); break; @@ -610,8 +613,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - HelpUtils.prepareHelpMenuItem(getActivity(), menu, mListType == LIST_TYPE_MAIN - ? R.string.help_uri_apps : R.string.help_uri_notifications, getClass().getName()); + HelpUtils.prepareHelpMenuItem(getActivity(), menu, getHelpResource(), getClass().getName()); mOptionsMenu = menu; inflater.inflate(R.menu.manage_apps, menu); updateOptionsMenu(); @@ -627,6 +629,17 @@ public class ManageApplications extends InstrumentedPreferenceFragment mOptionsMenu = null; } + @StringRes + int getHelpResource() { + if (mListType == LIST_TYPE_MAIN) { + return R.string.help_uri_apps; + } else if (mListType == LIST_TYPE_USAGE_ACCESS) { + return R.string.help_url_usage_access; + } else { + return R.string.help_uri_notifications; + } + } + void updateOptionsMenu() { if (mOptionsMenu == null) { return; @@ -670,7 +683,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment if (mListType == LIST_TYPE_NOTIFICATION) { ((SettingsActivity) getActivity()).startPreferencePanel(this, ConfigureNotificationSettings.class.getName(), null, - R.string.configure_notification_settings, null, this, ADVANCED_SETTINGS); + R.string.configure_notification_settings, null, this, + ADVANCED_SETTINGS); } else { ((SettingsActivity) getActivity()).startPreferencePanel(this, AdvancedAppSettings.class.getName(), null, R.string.configure_apps, @@ -877,7 +891,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment }; public ApplicationsAdapter(ApplicationsState state, ManageApplications manageApplications, - int filterMode) { + int filterMode) { mState = state; mFgHandler = new Handler(); mBgHandler = new Handler(mState.getBackgroundLooper()); @@ -950,7 +964,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment // Record the current scroll position before pausing. mLastIndex = mManageApplications.mListView.getFirstVisiblePosition(); View v = mManageApplications.mListView.getChildAt(0); - mLastTop = (v == null) ? 0 : (v.getTop() - mManageApplications.mListView.getPaddingTop()); + mLastTop = + (v == null) ? 0 : (v.getTop() - mManageApplications.mListView.getPaddingTop()); } public void release() { @@ -1037,8 +1052,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment } private ArrayList removeDuplicateIgnoringUser( - ArrayList entries) - { + ArrayList entries) { int size = entries.size(); // returnList will not have more entries than entries ArrayList returnEntries = new @@ -1097,7 +1111,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment } private void rebuildSections() { - if (mEntries!= null && mManageApplications.mListView.isFastScrollEnabled()) { + if (mEntries != null && mManageApplications.mListView.isFastScrollEnabled()) { // Rebuild sections if (mIndex == null) { LocaleList locales = mContext.getResources().getConfiguration().getLocales(); @@ -1142,7 +1156,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment } ArrayList applyPrefixFilter(CharSequence prefix, - ArrayList origEntries) { + ArrayList origEntries) { if (prefix == null || prefix.length() == 0) { return origEntries; } else { @@ -1464,7 +1478,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment = new SummaryLoader.SummaryProviderFactory() { @Override public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity, - SummaryLoader summaryLoader) { + SummaryLoader summaryLoader) { return new SummaryProvider(activity, summaryLoader); } }; diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java index 254d5e29156..52028b3e5da 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java @@ -54,6 +54,11 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { return TAG; } + @Override + protected int getHelpResource() { + return R.string.help_url_connected_devices; + } + @Override protected int getPreferenceScreenResId() { return R.xml.connected_devices; diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java index 13b3d0b8c19..b5a7b3b3894 100644 --- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java +++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java @@ -113,6 +113,11 @@ public class StorageDashboardFragment extends DashboardFragment getLoaderManager().initLoader(VOLUME_SIZE_JOB_ID, Bundle.EMPTY, new VolumeSizeCallbacks()); } + @Override + protected int getHelpResource() { + return R.string.help_url_storage_dashboard; + } + private void onReceivedSizes() { if (mStorageInfo == null || mAppsResult == null) { return; diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java index 799ab2d1408..23ddf078ac4 100644 --- a/src/com/android/settings/display/NightDisplaySettings.java +++ b/src/com/android/settings/display/NightDisplaySettings.java @@ -73,6 +73,11 @@ public class NightDisplaySettings extends SettingsPreferenceFragment mTemperaturePreference.setContinuousUpdates(true); } + @Override + protected int getHelpResource() { + return R.string.help_url_night_display; + } + @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { super.onCreatePreferences(savedInstanceState, rootKey); diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java index 8cf9edb0c3d..8c10d45745f 100644 --- a/src/com/android/settings/dream/DreamSettings.java +++ b/src/com/android/settings/dream/DreamSettings.java @@ -16,17 +16,19 @@ package com.android.settings.dream; +import android.content.Context; import android.provider.SearchIndexableResource; import android.support.annotation.VisibleForTesting; + +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.search.BaseSearchIndexProvider; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.WhenToDream; + import java.util.ArrayList; -import android.content.Context; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import java.util.Arrays; import java.util.List; @@ -96,6 +98,11 @@ public class DreamSettings extends DashboardFragment { return R.xml.dream_fragment_overview; } + @Override + protected int getHelpResource() { + return R.string.help_url_screen_saver; + } + @Override protected String getLogTag() { return TAG; diff --git a/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/src/com/android/settings/gestures/DoubleTapScreenSettings.java index 4a802732ac8..4690eadaec7 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenSettings.java +++ b/src/com/android/settings/gestures/DoubleTapScreenSettings.java @@ -52,6 +52,11 @@ public class DoubleTapScreenSettings extends DashboardFragment { return R.xml.double_tap_screen_settings; } + @Override + protected int getHelpResource() { + return R.string.help_url_double_tap_screen; + } + @Override protected List getPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle()); diff --git a/src/com/android/settings/gestures/PickupGestureSettings.java b/src/com/android/settings/gestures/PickupGestureSettings.java index 6ed412f1175..17d930f5a4f 100644 --- a/src/com/android/settings/gestures/PickupGestureSettings.java +++ b/src/com/android/settings/gestures/PickupGestureSettings.java @@ -52,6 +52,11 @@ public class PickupGestureSettings extends DashboardFragment { return R.xml.pick_up_gesture_settings; } + @Override + protected int getHelpResource() { + return R.string.help_url_pickup_gesture; + } + @Override protected List getPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle()); diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java index a39305644ae..35de1bb60db 100644 --- a/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -69,6 +69,11 @@ public class NetworkDashboardFragment extends DashboardFragment implements mNetworkResetController = new NetworkResetActionMenuController(context); } + @Override + protected int getHelpResource() { + return R.string.help_url_network_dashboard; + } + @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java index 92142a9eb1b..e239a438dea 100644 --- a/src/com/android/settings/security/LockscreenDashboardFragment.java +++ b/src/com/android/settings/security/LockscreenDashboardFragment.java @@ -67,6 +67,11 @@ public class LockscreenDashboardFragment extends DashboardFragment return R.xml.security_lockscreen_settings; } + @Override + protected int getHelpResource() { + return R.string.help_url_lockscreen; + } + @Override protected List getPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); diff --git a/src/com/android/settings/system/SystemDashboardFragment.java b/src/com/android/settings/system/SystemDashboardFragment.java index 1a5a1829a72..fd164bef371 100644 --- a/src/com/android/settings/system/SystemDashboardFragment.java +++ b/src/com/android/settings/system/SystemDashboardFragment.java @@ -54,6 +54,11 @@ public class SystemDashboardFragment extends DashboardFragment { return R.xml.system_dashboard_fragment; } + @Override + protected int getHelpResource() { + return R.string.help_url_system_dashboard; + } + @Override protected List getPreferenceControllers(Context context) { return buildPreferenceControllers(context);