PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add help url placeholders for new pages

Browse Source 
Bug: 38412798
Test: visual
Change-Id: I4ede523cb13790ea05309279f80a778b2086f850
This commit is contained in:
Fan Zhang
2017-06-05 13:13:42 -07:00
parent fe23da579d
commit 179645eecd
21 changed files with 148 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
res/values/strings.xml
View File

@@ -6181,6 +6181,8 @@
<string name="help_url_location_access" translatable="false"></string>
<!-- Help URL, Security settings [DO NOT TRANSLATE] -->
<string name="help_url_security" translatable="false"></string>
<!-- Help URL, Encryption settings [DO NOT TRANSLATE] -->
<string name="help_url_encryption" translatable="false"></string>
<!-- Help URL, Tap & pay [DO NOT TRANSLATE] -->
<string name="help_url_nfc_payment" translatable="false"></string>
<!-- Help URL, Remote display [DO NOT TRANSLATE] -->
@@ -6198,6 +6200,26 @@
<!-- Help URL, Display size [DO NOT TRANSLATE] -->
<string name="help_url_display_size" translatable="false"></string>
<string name="help_url_network_dashboard" translatable="false"></string>
<string name="help_url_connected_devices" translatable="false"></string>
<string name="help_url_apps_and_notifications" translatable="false"></string>
<string name="help_url_night_display" translatable="false"></string>
<string name="help_url_screen_saver" translatable="false"></string>
<string name="help_url_pickup_gesture" translatable="false"></string>
<string name="help_url_storage_dashboard" translatable="false"></string>
<string name="help_url_lockscreen" translatable="false"></string>
<string name="help_url_trust_agent" translatable="false"></string>
<string name="help_url_usage_access" translatable="false"></string>
<string name="help_url_screen_pinning" translatable="false"></string>
<string name="help_url_user_and_account_dashboard" translatable="false"></string>
<string name="help_url_accessibility_shortcut" translatable="false"></string>
<string name="help_url_magnification" translatable="false"></string>
<string name="help_url_color_correction" translatable="false"></string>
<string name="help_url_autoclick" translatable="false"></string>
<string name="help_url_system_dashboard" translatable="false"></string>
<string name="help_url_double_tap_screen" translatable="false"></string>
<string name="help_url_account_detail" translatable="false"></string>
<!-- User account title [CHAR LIMIT=30] -->
<string name="user_account_title">Account for content</string>
<!-- User picture title [CHAR LIMIT=30] -->

2
src/com/android/settings/EncryptionAndCredential.java
View File

@@ -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;
}
/**

5
src/com/android/settings/ScreenPinningSettings.java
View File

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

6
src/com/android/settings/TrustAgentSettings.java
View File

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

5
src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
View File

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

7
src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
View File

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

5
src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
View File

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

5
src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
View File

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

5
src/com/android/settings/accounts/AccountDetailDashboardFragment.java
View File

@@ -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;

5
src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
View File

@@ -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<PreferenceController> getPreferenceControllers(Context context) {
final List<PreferenceController> controllers = new ArrayList<>();

5
src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
View File

@@ -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;

34
src/com/android/settings/applications/ManageApplications.java
View File

@@ -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];
@@ -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,
@@ -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<ApplicationsState.AppEntry> removeDuplicateIgnoringUser(
ArrayList<ApplicationsState.AppEntry> entries)
{
ArrayList<ApplicationsState.AppEntry> entries) {
int size = entries.size();
// returnList will not have more entries than entries
ArrayList<ApplicationsState.AppEntry> returnEntries = new

5
src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
View File

@@ -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;

5
src/com/android/settings/deviceinfo/StorageDashboardFragment.java
View File

@@ -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;

5
src/com/android/settings/display/NightDisplaySettings.java
View File

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

11
src/com/android/settings/dream/DreamSettings.java
View File

@@ -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;

5
src/com/android/settings/gestures/DoubleTapScreenSettings.java
View File

@@ -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<PreferenceController> getPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle());

5
src/com/android/settings/gestures/PickupGestureSettings.java
View File

@@ -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<PreferenceController> getPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle());

5
src/com/android/settings/network/NetworkDashboardFragment.java
View File

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

5
src/com/android/settings/security/LockscreenDashboardFragment.java
View File

@@ -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<PreferenceController> getPreferenceControllers(Context context) {
final List<PreferenceController> controllers = new ArrayList<>();

5
src/com/android/settings/system/SystemDashboardFragment.java
View File

@@ -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<PreferenceController> getPreferenceControllers(Context context) {
return buildPreferenceControllers(context);