Merge "Clean up accessibility quick settings "tooltips" for singular purpose" into tm-dev

res/layout/accessibility_qs_tooltip.xml

@@ -20,13 +20,13 @@
     android:layout_height="wrap_content"
     android:gravity="center"
     android:orientation="vertical"
-    android:background="@drawable/accessibility_qs_tooltips_background">
+    android:background="@drawable/accessibility_qs_tooltip_background">
 
     <ImageView
         android:id="@+id/qs_illustration"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/accessibility_qs_tooltips_margin_top"
+        android:paddingTop="@dimen/accessibility_qs_tooltip_margin_top"
         android:layout_gravity="center_horizontal"
         android:contentDescription="@null" />
 
@@ -34,7 +34,7 @@
         android:id="@+id/qs_content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/accessibility_qs_tooltips_margin"
+        android:padding="@dimen/accessibility_qs_tooltip_margin"
         android:textColor="@android:color/black"
         android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
         android:textSize="16sp" />

res/values/dimens.xml

@@ -276,9 +276,9 @@
     <dimen name="accessibility_icon_size">32dp</dimen>
     <dimen name="accessibility_icon_foreground_size">18dp</dimen>
 
-    <!-- Accessibility quick settings tooltips -->
+    <!-- Accessibility quick settings tooltip -->
-    <dimen name="accessibility_qs_tooltips_margin">20dp</dimen>
+    <dimen name="accessibility_qs_tooltip_margin">20dp</dimen>
-    <dimen name="accessibility_qs_tooltips_margin_top">27dp</dimen>
+    <dimen name="accessibility_qs_tooltip_margin_top">27dp</dimen>
 
     <!-- Restricted icon in switch bar -->
     <dimen name="restricted_icon_margin_end">16dp</dimen>

res/values/strings.xml

@@ -5555,9 +5555,9 @@
     <!-- Used in the accessibility service settings to open the activity. [CHAR LIMIT=NONE] -->
     <string name="accessibility_service_primary_open_title">Open <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>
     <!-- Used in the accessibility service settings to show quick settings tooltip for auto-added feature. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_service_auto_added_qs_tooltips_content"><xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g> added to Quick Settings. Swipe down to turn it on or off anytime.</string>
+    <string name="accessibility_service_auto_added_qs_tooltip_content"><xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g> added to Quick Settings. Swipe down to turn it on or off anytime.</string>
     <!-- Used in the accessibility service settings to show quick settings tooltip. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_service_qs_tooltips_content">You can also add <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g> to Quick Settings from the top of your screen</string>
+    <string name="accessibility_service_qs_tooltip_content">You can also add <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g> to Quick Settings from the top of your screen</string>
     <!-- Used in the color correction settings to show quick settings tooltip for auto-added feature. [CHAR LIMIT=NONE] -->
     <string name="accessibility_color_correction_auto_added_qs_tooltip_content">Color correction added to Quick Settings. Swipe down to turn it on or off anytime.</string>
     <!-- Used in the color correction settings to show quick settings tooltip. [CHAR LIMIT=NONE] -->
@@ -5575,7 +5575,7 @@
     <!-- Used in the One-hand mode settings to show quick settings tooltip. [CHAR LIMIT=NONE] -->
     <string name="accessibility_one_handed_mode_qs_tooltip_content">You can also add one-handed mode to Quick Settings from the top of your screen</string>
     <!-- Used in the accessibility action for accessibility quick settings tooltip to dismiss. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_quick_settings_tooltips_dismiss">Dismiss</string>
+    <string name="accessibility_quick_settings_tooltip_dismiss">Dismiss</string>
     <!-- Intro for color correction settings screen to control turning on/off the feature entirely. [CHAR LIMIT=NONE] -->
     <string name="accessibility_daltonizer_about_intro_text" product="default">Adjust how colors display on your phone</string>
     <!-- Intro for color correction settings screen to control turning on/off the feature entirely. [CHAR LIMIT=NONE] -->

src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java

@@ -116,7 +116,7 @@ public abstract class AccessibilityQuickSettingsPrimarySwitchPreferenceControlle
 
         mTooltipWindow = new AccessibilityQuickSettingsTooltipWindow(mContext);
         mTooltipWindow.setup(getTileTooltipContent(),
-                R.drawable.accessibility_auto_added_qs_tooltips_illustration);
+                R.drawable.accessibility_auto_added_qs_tooltip_illustration);
         mTooltipWindow.showAtTopCenter(mPreference.getSwitch());
         AccessibilityQuickSettingUtils.optInValueToSharedPreferences(mContext, tileComponentName);
         mNeedsQSTooltipReshow = false;

src/com/android/settings/accessibility/AccessibilityQuickSettingsTooltipWindow.java

@@ -61,7 +61,7 @@ public class AccessibilityQuickSettingsTooltipWindow extends PopupWindow {
                 super.onInitializeAccessibilityNodeInfo(host, info);
                 final AccessibilityAction clickAction = new AccessibilityAction(
                         AccessibilityNodeInfo.ACTION_CLICK,
-                        mContext.getString(R.string.accessibility_quick_settings_tooltips_dismiss));
+                        mContext.getString(R.string.accessibility_quick_settings_tooltip_dismiss));
                 info.addAction(clickAction);
             }
 
@@ -100,7 +100,7 @@ public class AccessibilityQuickSettingsTooltipWindow extends PopupWindow {
         setBackgroundDrawable(new ColorDrawable(mContext.getColor(android.R.color.transparent)));
         final LayoutInflater inflater = mContext.getSystemService(LayoutInflater.class);
         final View popupView =
-                inflater.inflate(R.layout.accessibility_qs_tooltips, /* root= */ null);
+                inflater.inflate(R.layout.accessibility_qs_tooltip, /* root= */ null);
         popupView.setFocusable(/* focusable= */ true);
         popupView.setAccessibilityDelegate(mAccessibilityDelegate);
         setContentView(popupView);
@@ -179,7 +179,7 @@ public class AccessibilityQuickSettingsTooltipWindow extends PopupWindow {
     @VisibleForTesting
     int getAvailableWindowWidth() {
         final Resources res = mContext.getResources();
-        final int padding = res.getDimensionPixelSize(R.dimen.accessibility_qs_tooltips_margin);
+        final int padding = res.getDimensionPixelSize(R.dimen.accessibility_qs_tooltip_margin);
         final int screenWidth = res.getDisplayMetrics().widthPixels;
         return screenWidth - padding * 2;
     }

src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java

@@ -506,8 +506,8 @@ public abstract class AccessibilityShortcutPreferenceFragment extends DashboardF
         }
 
         final int imageResId = mNeedsQSTooltipType == QuickSettingsTooltipType.GUIDE_TO_EDIT
-                ? R.drawable.accessibility_qs_tooltips_illustration
+                ? R.drawable.accessibility_qs_tooltip_illustration
-                : R.drawable.accessibility_auto_added_qs_tooltips_illustration;
+                : R.drawable.accessibility_auto_added_qs_tooltip_illustration;
         mTooltipWindow = new AccessibilityQuickSettingsTooltipWindow(getContext());
         mTooltipWindow.setup(content, imageResId);
         mTooltipWindow.showAtTopCenter(getView());

src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java

@@ -141,8 +141,8 @@ public class LaunchAccessibilityActivityPreferenceFragment extends ToggleFeature
         }
 
         final int titleResId = type == QuickSettingsTooltipType.GUIDE_TO_EDIT
-                ? R.string.accessibility_service_qs_tooltips_content
+                ? R.string.accessibility_service_qs_tooltip_content
-                : R.string.accessibility_service_auto_added_qs_tooltips_content;
+                : R.string.accessibility_service_auto_added_qs_tooltip_content;
         return getString(titleResId, tileName);
     }
 

src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java

@@ -252,8 +252,8 @@ public class ToggleAccessibilityServicePreferenceFragment extends
         }
 
         final int titleResId = type == QuickSettingsTooltipType.GUIDE_TO_EDIT
-                ? R.string.accessibility_service_qs_tooltips_content
+                ? R.string.accessibility_service_qs_tooltip_content
-                : R.string.accessibility_service_auto_added_qs_tooltips_content;
+                : R.string.accessibility_service_auto_added_qs_tooltip_content;
         return getString(titleResId, tileName);
     }
 

src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java

@@ -877,8 +877,8 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
         }
 
         final int imageResId = mNeedsQSTooltipType == QuickSettingsTooltipType.GUIDE_TO_EDIT
-                ? R.drawable.accessibility_qs_tooltips_illustration
+                ? R.drawable.accessibility_qs_tooltip_illustration
-                : R.drawable.accessibility_auto_added_qs_tooltips_illustration;
+                : R.drawable.accessibility_auto_added_qs_tooltip_illustration;
         mTooltipWindow = new AccessibilityQuickSettingsTooltipWindow(getContext());
         mTooltipWindow.setup(content, imageResId);
         mTooltipWindow.showAtTopCenter(getView());

tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsTooltipWindowTest.java

@@ -67,7 +67,7 @@ public class AccessibilityQuickSettingsTooltipWindowTest {
     @Test
     public void initTooltipView_atMostAvailableTextWidth() {
         final String quickSettingsTooltipsContent = mContext.getString(
-                R.string.accessibility_service_qs_tooltips_content, TEST_PACKAGE_NAME);
+                R.string.accessibility_service_qs_tooltip_content, TEST_PACKAGE_NAME);
         mTooltipView.setup(quickSettingsTooltipsContent, TEST_RES_ID);
 
         final int getMaxWidth = mTooltipView.getAvailableWindowWidth();

tests/robotests/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragmentTest.java

@@ -101,7 +101,7 @@ public class LaunchAccessibilityActivityPreferenceFragmentTest {
         final CharSequence tileName =
                 mFragment.loadTileLabel(mContext, mFragment.getTileComponentName());
         assertThat(tileTooltipContent.toString()).isEqualTo(
-                mContext.getString(R.string.accessibility_service_qs_tooltips_content, tileName));
+                mContext.getString(R.string.accessibility_service_qs_tooltip_content, tileName));
     }
 
     @Test
@@ -115,7 +115,7 @@ public class LaunchAccessibilityActivityPreferenceFragmentTest {
                 mFragment.loadTileLabel(mContext, mFragment.getTileComponentName());
         assertThat(tileTooltipContent.toString()).isEqualTo(
                 mContext.getString(
-                        R.string.accessibility_service_auto_added_qs_tooltips_content, tileName));
+                        R.string.accessibility_service_auto_added_qs_tooltip_content, tileName));
     }
 
     @Test
@@ -130,7 +130,7 @@ public class LaunchAccessibilityActivityPreferenceFragmentTest {
         final CharSequence tileName =
                 mFragment.loadTileLabel(mContext, mFragment.getTileComponentName());
         assertThat(tileTooltipContent.toString()).isEqualTo(
-                mContext.getString(R.string.accessibility_service_qs_tooltips_content, tileName));
+                mContext.getString(R.string.accessibility_service_qs_tooltip_content, tileName));
     }
 
     @Test
@@ -146,7 +146,7 @@ public class LaunchAccessibilityActivityPreferenceFragmentTest {
                 mFragment.loadTileLabel(mContext, mFragment.getTileComponentName());
         assertThat(tileTooltipContent.toString()).isEqualTo(
                 mContext.getString(
-                        R.string.accessibility_service_auto_added_qs_tooltips_content, tileName));
+                        R.string.accessibility_service_auto_added_qs_tooltip_content, tileName));
     }
 
     private void setupTileService(String packageName, String name, String tileName) {

tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java

@@ -101,7 +101,7 @@ public class ToggleAccessibilityServicePreferenceFragmentTest {
         final CharSequence tileName =
                 mFragment.loadTileLabel(mContext, mFragment.getTileComponentName());
         assertThat(tileTooltipContent.toString()).isEqualTo(
-                mContext.getString(R.string.accessibility_service_qs_tooltips_content, tileName));
+                mContext.getString(R.string.accessibility_service_qs_tooltip_content, tileName));
     }
 
     @Test
@@ -115,7 +115,7 @@ public class ToggleAccessibilityServicePreferenceFragmentTest {
                 mFragment.loadTileLabel(mContext, mFragment.getTileComponentName());
         assertThat(tileTooltipContent.toString()).isEqualTo(
                 mContext.getString(
-                        R.string.accessibility_service_auto_added_qs_tooltips_content, tileName));
+                        R.string.accessibility_service_auto_added_qs_tooltip_content, tileName));
     }
 
     @Test
@@ -130,7 +130,7 @@ public class ToggleAccessibilityServicePreferenceFragmentTest {
         final CharSequence tileName =
                 mFragment.loadTileLabel(mContext, mFragment.getTileComponentName());
         assertThat(tileTooltipContent.toString()).isEqualTo(
-                mContext.getString(R.string.accessibility_service_qs_tooltips_content, tileName));
+                mContext.getString(R.string.accessibility_service_qs_tooltip_content, tileName));
     }
 
     @Test
@@ -146,7 +146,7 @@ public class ToggleAccessibilityServicePreferenceFragmentTest {
                 mFragment.loadTileLabel(mContext, mFragment.getTileComponentName());
         assertThat(tileTooltipContent.toString()).isEqualTo(
                 mContext.getString(
-                        R.string.accessibility_service_auto_added_qs_tooltips_content, tileName));
+                        R.string.accessibility_service_auto_added_qs_tooltip_content, tileName));
     }
 
     private void setupTileService(String packageName, String name, String tileName) {