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

Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: 4d371adf7f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I70547c9094cdd200f1fa2a77272affbcbe308a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Edgar Wang
2022-05-20 23:52:43 +00:00
committed by Automerger Merge Worker
parent 12cc3aeae0 4d371adf7f
commit 42704ba27c
15 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/accessibility/AccessibilityButtonFooterPreferenceController.java
View File

@@ -33,7 +33,7 @@ public class AccessibilityButtonFooterPreferenceController extends
}
@Override
protected String getLearnMoreContentDescription() {
protected String getLearnMoreText() {
return mContext.getString(
R.string.accessibility_button_gesture_footer_learn_more_content_description);
}

2
src/com/android/settings/accessibility/AccessibilityControlTimeoutFooterPreferenceController.java
View File

@@ -31,7 +31,7 @@ public class AccessibilityControlTimeoutFooterPreferenceController extends
}
@Override
protected String getLearnMoreContentDescription() {
protected String getLearnMoreText() {
return mContext.getString(
R.string.accessibility_control_timeout_footer_learn_more_content_description);
}

16
src/com/android/settings/accessibility/AccessibilityFooterPreferenceController.java
View File

@@ -31,7 +31,7 @@ import com.android.settingslib.HelpUtils;
public class AccessibilityFooterPreferenceController extends BasePreferenceController {
private int mHelpResource;
private String mLearnMoreContentDescription;
private String mLearnMoreText;
private String mIntroductionTitle;
public AccessibilityFooterPreferenceController(Context context, String key) {
@@ -56,9 +56,9 @@ public class AccessibilityFooterPreferenceController extends BasePreferenceContr
* Setups a help item in the {@link AccessibilityFooterPreference} with specific content
* description.
*/
public void setupHelpLink(int helpResource, String learnMoreContentDescription) {
public void setupHelpLink(int helpResource, String learnMoreText) {
mHelpResource = helpResource;
mLearnMoreContentDescription = learnMoreContentDescription;
mLearnMoreText = learnMoreText;
}
/**
@@ -73,12 +73,12 @@ public class AccessibilityFooterPreferenceController extends BasePreferenceContr
/**
* Overrides this if showing a help item in the {@link AccessibilityFooterPreference} with
* specific content description.
* specific learn more title.
*
* @return the content description for the help url
* @return learn more title for the help url
*/
protected String getLearnMoreContentDescription() {
return mLearnMoreContentDescription;
protected String getLearnMoreText() {
return mLearnMoreText;
}
/**
@@ -117,7 +117,7 @@ public class AccessibilityFooterPreferenceController extends BasePreferenceContr
footerPreference.setLearnMoreAction(view -> {
view.startActivityForResult(helpIntent, 0);
});
footerPreference.setLearnMoreContentDescription(getLearnMoreContentDescription());
footerPreference.setLearnMoreText(getLearnMoreText());
footerPreference.setLinkEnabled(true);
} else {
footerPreference.setLinkEnabled(false);

2
src/com/android/settings/accessibility/CaptionFooterPreferenceController.java
View File

@@ -30,7 +30,7 @@ public class CaptionFooterPreferenceController extends AccessibilityFooterPrefer
}
@Override
protected String getLearnMoreContentDescription() {
protected String getLearnMoreText() {
return mContext.getString(
R.string.accessibility_captioning_footer_learn_more_content_description);
}

2
src/com/android/settings/accessibility/ToggleAutoclickFooterPreferenceController.java
View File

@@ -31,7 +31,7 @@ public class ToggleAutoclickFooterPreferenceController extends
}
@Override
protected String getLearnMoreContentDescription() {
protected String getLearnMoreText() {
return mContext.getString(
R.string.accessibility_autoclick_footer_learn_more_content_description);
}

4
src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
View File

@@ -114,10 +114,10 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere
private void updateFooterPreference() {
final String title = getPrefContext().getString(
R.string.accessibility_color_inversion_about_title);
final String learnMoreContentDescription = getPrefContext().getString(
final String learnMoreText = getPrefContext().getString(
R.string.accessibility_color_inversion_footer_learn_more_content_description);
mFooterPreferenceController.setIntroductionTitle(title);
mFooterPreferenceController.setupHelpLink(getHelpResource(), learnMoreContentDescription);
mFooterPreferenceController.setupHelpLink(getHelpResource(), learnMoreText);
mFooterPreferenceController.displayPreference(getPreferenceScreen());
}

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

@@ -106,10 +106,10 @@ public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePrefe
private void updateFooterPreference() {
final String title = getPrefContext()
.getString(R.string.accessibility_daltonizer_about_title);
final String learnMoreContentDescription = getPrefContext()
final String learnMoreText = getPrefContext()
.getString(R.string.accessibility_daltonizer_footer_learn_more_content_description);
mFooterPreferenceController.setIntroductionTitle(title);
mFooterPreferenceController.setupHelpLink(getHelpResource(), learnMoreContentDescription);
mFooterPreferenceController.setupHelpLink(getHelpResource(), learnMoreText);
mFooterPreferenceController.displayPreference(getPreferenceScreen());
}

4
src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
View File

@@ -109,10 +109,10 @@ public class ToggleScreenMagnificationPreferenceFragment extends
private void updateFooterPreference() {
final String title = getPrefContext().getString(
R.string.accessibility_screen_magnification_about_title);
final String learnMoreContentDescription = getPrefContext().getString(
final String learnMoreText = getPrefContext().getString(
R.string.accessibility_screen_magnification_footer_learn_more_content_description);
mFooterPreferenceController.setIntroductionTitle(title);
mFooterPreferenceController.setupHelpLink(getHelpResource(), learnMoreContentDescription);
mFooterPreferenceController.setupHelpLink(getHelpResource(), learnMoreText);
mFooterPreferenceController.displayPreference(getPreferenceScreen());
}

4
src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java
View File

@@ -68,9 +68,9 @@ public class EnterpriseDisclosurePreferenceController extends BasePreferenceCont
footerPreference.setLearnMoreAction(view -> {
mContext.startActivity(new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS));
});
final String learnMoreContentDescription = mContext.getString(
final String learnMoreText = mContext.getString(
R.string.footer_learn_more_content_description, getLabelName());
footerPreference.setLearnMoreContentDescription(learnMoreContentDescription);
footerPreference.setLearnMoreText(learnMoreText);
}
private String getLabelName() {

4
src/com/android/settings/applications/intentpicker/AppLaunchSettings.java
View File

@@ -367,9 +367,9 @@ public class AppLaunchSettings extends AppInfoBase implements
final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(LEARN_MORE_URI));
mContext.startActivity(intent);
});
final String learnMoreContentDescription = mContext.getString(
final String learnMoreText = mContext.getString(
R.string.footer_learn_more_content_description, getLabelName());
footerPreference.setLearnMoreContentDescription(learnMoreContentDescription);
footerPreference.setLearnMoreText(learnMoreText);
}
private String getLabelName() {

2
src/com/android/settings/display/SmartAutoRotatePreferenceFragment.java
View File

@@ -134,7 +134,7 @@ public class SmartAutoRotatePreferenceFragment extends DashboardFragment {
getString(getHelpResource()),
/*backupContext=*/ ""), /*requestCode=*/ 0);
});
pref.setLearnMoreContentDescription(getString(R.string.auto_rotate_link_a11y));
pref.setLearnMoreText(getString(R.string.auto_rotate_link_a11y));
}
}

4
src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
View File

@@ -19,8 +19,8 @@ package com.android.settings.fuelgauge;
import android.annotation.UserIdInt;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.settings.SettingsEnums;
import android.app.backup.BackupManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -386,7 +386,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
if (helpIntent != null) {
mFooterPreference.setLearnMoreAction(v ->
startActivityForResult(helpIntent, /*requestCode=*/ 0));
mFooterPreference.setLearnMoreContentDescription(
mFooterPreference.setLearnMoreText(
context.getString(R.string.manager_battery_usage_link_a11y));
}
}

2
src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
View File

@@ -90,7 +90,7 @@ public class BatterySaverSettings extends DashboardFragment {
getString(R.string.help_url_battery_saver_settings),
/*backupContext=*/ ""), /*requestCode=*/ 0);
});
pref.setLearnMoreContentDescription(getString(R.string.battery_saver_link_a11y));
pref.setLearnMoreText(getString(R.string.battery_saver_link_a11y));
}
}
}

2
src/com/android/settings/location/LocationSettingsFooterPreferenceController.java
View File

@@ -107,7 +107,7 @@ public class LocationSettingsFooterPreferenceController extends LocationBasePref
if (mFooterPreference != null) {
mFooterPreference.setTitle(Html.fromHtml(footerString));
mFooterPreference.setLearnMoreAction(v -> openLocationLearnMoreLink());
mFooterPreference.setLearnMoreContentDescription(mContext.getString(
mFooterPreference.setLearnMoreText(mContext.getString(
R.string.location_settings_footer_learn_more_content_description));
}
}

4
tests/robotests/src/com/android/settings/accessibility/AccessibilityFooterPreferenceControllerTest.java
View File

@@ -100,11 +100,11 @@ public class AccessibilityFooterPreferenceControllerTest {
}
@Test
public void setupHelpLink_setCorrectHelpLinkAndContentDescription() {
public void setupHelpLink_setCorrectHelpLinkAndLearnMoreText() {
mController.setupHelpLink(TEST_HELP_ID, TEST_CONTENT_DESCRIPTION);
assertThat(mController.getHelpResource()).isEqualTo(TEST_HELP_ID);
assertThat(mController.getLearnMoreContentDescription())
assertThat(mController.getLearnMoreText())
.isEqualTo(TEST_CONTENT_DESCRIPTION);
}