Revert "SystemUI: hide all text from screenshot action buttons"
This reverts commit c7142efceafc6577c35f8d777816220df3927d07.
Prepare for a15 QPR1
Change-Id: I4ed2d83fac2cceff054850698292c047680f8a87
diff --git a/packages/SystemUI/res/values/custom_strings.xml b/packages/SystemUI/res/values/custom_strings.xml
index 1124ee3..ff7d20e 100644
--- a/packages/SystemUI/res/values/custom_strings.xml
+++ b/packages/SystemUI/res/values/custom_strings.xml
@@ -63,9 +63,4 @@
<!-- Content description indicating that tapping the element will allow deleting the screenshot [CHAR LIMIT=NONE] -->
<string name="screenshot_delete_description">Delete screenshot</string>
- <string name="screenshot_scroll_label_empty"></string>
- <string name="screenshot_delete_label_empty"></string>
- <string name="screenshot_edit_label_empty"></string>
- <string name="screenshot_share_label_empty"></string>
-
</resources>
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt
index 3b088ca..a23415b 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt
@@ -97,7 +97,7 @@
actionsCallback.provideActionButton(
ActionButtonAppearance(
AppCompatResources.getDrawable(context, R.drawable.ic_screenshot_share),
- context.resources.getString(R.string.screenshot_share_label_empty),
+ context.resources.getString(R.string.screenshot_share_label),
context.resources.getString(R.string.screenshot_share_description),
),
showDuringEntrance = true,
@@ -116,7 +116,7 @@
actionsCallback.provideActionButton(
ActionButtonAppearance(
AppCompatResources.getDrawable(context, R.drawable.ic_screenshot_edit),
- context.resources.getString(R.string.screenshot_edit_label_empty),
+ context.resources.getString(R.string.screenshot_edit_label),
context.resources.getString(R.string.screenshot_edit_description),
),
showDuringEntrance = true,
@@ -135,7 +135,7 @@
actionsCallback.provideActionButton(
ActionButtonAppearance(
AppCompatResources.getDrawable(context, R.drawable.ic_screenshot_delete),
- context.resources.getString(R.string.screenshot_delete_label_empty),
+ context.resources.getString(R.string.screenshot_delete_label),
context.resources.getString(R.string.screenshot_delete_description),
),
showDuringEntrance = true,
@@ -156,7 +156,7 @@
actionsCallback.provideActionButton(
ActionButtonAppearance(
AppCompatResources.getDrawable(context, R.drawable.ic_screenshot_scroll),
- context.resources.getString(R.string.screenshot_scroll_label_empty),
+ context.resources.getString(R.string.screenshot_scroll_label),
context.resources.getString(R.string.screenshot_scroll_label),
),
showDuringEntrance = true,