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

Merge "Clean up preference_summary_default_combination in Settings." into main

Browse Source
This commit is contained in:
Yuchen Sun
2024-07-24 04:29:03 +00:00
committed by Android (Google) Code Review
parent 83b2d86ff5 48f304a23f
commit ed3594fe61
9 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
View File

@@ -169,7 +169,8 @@ public class AccessibilitySettingsTest {
mServiceInfo, SERVICE_ENABLED);
assertThat(summary).isEqualTo(
mContext.getString(R.string.preference_summary_default_combination,
mContext.getString(
com.android.settingslib.R.string.preference_summary_default_combination,
mContext.getString(R.string.accessibility_summary_shortcut_enabled),
DEFAULT_SUMMARY));
}
@@ -184,7 +185,8 @@ public class AccessibilitySettingsTest {
mServiceInfo, SERVICE_ENABLED);
assertThat(summary).isEqualTo(
mContext.getString(R.string.preference_summary_default_combination,
mContext.getString(
com.android.settingslib.R.string.preference_summary_default_combination,
mContext.getString(R.string.generic_accessibility_feature_shortcut_off),
DEFAULT_SUMMARY));
}
@@ -246,7 +248,8 @@ public class AccessibilitySettingsTest {
mServiceInfo, SERVICE_ENABLED).toString();
assertThat(summary).isEqualTo(
mContext.getString(R.string.preference_summary_default_combination,
mContext.getString(
com.android.settingslib.R.string.preference_summary_default_combination,
mContext.getString(R.string.generic_accessibility_service_on),
DEFAULT_SUMMARY));
}
@@ -260,7 +263,8 @@ public class AccessibilitySettingsTest {
mServiceInfo, SERVICE_ENABLED).toString();
assertThat(summary).isEqualTo(
mContext.getString(R.string.preference_summary_default_combination,
mContext.getString(
com.android.settingslib.R.string.preference_summary_default_combination,
mContext.getString(R.string.generic_accessibility_service_on),
DEFAULT_SUMMARY));
}
@@ -274,7 +278,8 @@ public class AccessibilitySettingsTest {
mServiceInfo, SERVICE_DISABLED).toString();
assertThat(summary).isEqualTo(
mContext.getString(R.string.preference_summary_default_combination,
mContext.getString(
com.android.settingslib.R.string.preference_summary_default_combination,
mContext.getString(R.string.generic_accessibility_service_off),
DEFAULT_SUMMARY));
}
@@ -288,7 +293,8 @@ public class AccessibilitySettingsTest {
mServiceInfo, SERVICE_DISABLED).toString();
assertThat(summary).isEqualTo(
mContext.getString(R.string.preference_summary_default_combination,
mContext.getString(
com.android.settingslib.R.string.preference_summary_default_combination,
mContext.getString(R.string.generic_accessibility_service_off),
DEFAULT_SUMMARY));
}