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

Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 07fb084ce7

Browse Source 
Change-Id: Id7db52b4409d8d12d5207f7298b58b7e20f745b5
This commit is contained in:
Automerger Merge Worker
2020-03-11 20:23:25 +00:00
parent aa826d85b1 07fb084ce7
commit bfa63c5fbd
4 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -7145,6 +7145,8 @@
<string name="help_url_magnification" translatable="false"></string> <string name="help_url_magnification" translatable="false"></string>
<string name="help_url_color_correction" translatable="false"></string> <string name="help_url_color_correction" translatable="false"></string>
<string name="help_url_autoclick" translatable="false"></string> <string name="help_url_autoclick" translatable="false"></string>
<!-- Help URL, Accessibility caption preferences [DO NOT TRANSLATE] -->
<string name="help_url_caption" translatable="false"></string>
<string name="help_url_system_dashboard" 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_double_tap_screen" translatable="false"></string>
<string name="help_url_account_detail" translatable="false"></string> <string name="help_url_account_detail" translatable="false"></string>

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

@@ -407,6 +407,11 @@ public class CaptionAppearanceFragment extends SettingsPreferenceFragment
return true; return true;
} }
@Override
public int getHelpResource() {
return R.string.help_url_caption;
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.captioning_appearance); new BaseSearchIndexProvider(R.xml.captioning_appearance);
} }

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

@@ -83,6 +83,11 @@ public class CaptionMoreOptionsFragment extends SettingsPreferenceFragment
return true; return true;
} }
@Override
public int getHelpResource() {
return R.string.help_url_caption;
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.captioning_more_options); new BaseSearchIndexProvider(R.xml.captioning_more_options);
} }

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

@@ -98,6 +98,11 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment
return true; return true;
} }
@Override
public int getHelpResource() {
return R.string.help_url_caption;
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.captioning_settings); new BaseSearchIndexProvider(R.xml.captioning_settings);
} }