Loading packages/SystemUI/res/values/strings.xml +4 −4 Original line number Diff line number Diff line Loading @@ -2301,13 +2301,13 @@ <string name="accessibility_floating_button_docking_tooltip">Move button to the edge to hide it temporarily</string> <!-- Text for the undo action button of the message view of the accessibility floating menu to perform undo operation. [CHAR LIMIT=30]--> <string name="accessibility_floating_button_undo">Undo</string> <!-- Text for the message view with undo action of the accessibility floating menu to show which feature shortcut was removed. [CHAR LIMIT=30]--> <string name="accessibility_floating_button_undo_message_label_text"><xliff:g id="feature name" example="Magnification">%s</xliff:g> shortcut removed</string> <!-- Text for the message view with undo action of the accessibility floating menu to show how many features shortcuts were removed. [CHAR LIMIT=30]--> <string name="accessibility_floating_button_undo_message_text">{count, plural, =1 {{label} shortcut removed} <string name="accessibility_floating_button_undo_message_number_text">{count, plural, =1 {# shortcut removed} other {# shortcuts removed} }</string> <!-- Action in accessibility menu to move the accessibility floating button to the top left of the screen. [CHAR LIMIT=30] --> <string name="accessibility_floating_button_action_move_top_left">Move top left</string> <!-- Action in accessibility menu to move the accessibility floating button to the top right of the screen. [CHAR LIMIT=30] --> Loading packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayer.java +12 −8 Original line number Diff line number Diff line Loading @@ -25,6 +25,7 @@ import static com.android.internal.accessibility.common.ShortcutConstants.Access import static com.android.internal.accessibility.util.AccessibilityUtils.getAccessibilityServiceFragmentType; import static com.android.internal.accessibility.util.AccessibilityUtils.setAccessibilityServiceState; import static com.android.systemui.accessibility.floatingmenu.MenuMessageView.Index; import static com.android.systemui.util.PluralMessageFormaterKt.icuMessageFormat; import android.accessibilityservice.AccessibilityServiceInfo; import android.annotation.IntDef; Loading @@ -33,12 +34,12 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.Rect; import android.os.Handler; import android.os.Looper; import android.os.UserHandle; import android.provider.Settings; import android.util.PluralsMessageFormatter; import android.view.MotionEvent; import android.view.View; import android.view.ViewTreeObserver; Loading @@ -61,9 +62,7 @@ import com.android.wm.shell.common.magnetictarget.MagnetizedObject; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; /** Loading Loading @@ -221,11 +220,16 @@ class MenuViewLayer extends FrameLayout implements Preconditions.checkArgument(newTargetFeatures.size() > 0, "The list should at least have one feature."); final Map<String, Object> arguments = new HashMap<>(); arguments.put("count", newTargetFeatures.size()); arguments.put("label", newTargetFeatures.get(0).getLabel()); return PluralsMessageFormatter.format(getResources(), arguments, R.string.accessibility_floating_button_undo_message_text); final int featuresSize = newTargetFeatures.size(); final Resources resources = getResources(); if (featuresSize == 1) { return resources.getString( R.string.accessibility_floating_button_undo_message_label_text, newTargetFeatures.get(0).getLabel()); } return icuMessageFormat(resources, R.string.accessibility_floating_button_undo_message_number_text, featuresSize); } @Override Loading Loading
packages/SystemUI/res/values/strings.xml +4 −4 Original line number Diff line number Diff line Loading @@ -2301,13 +2301,13 @@ <string name="accessibility_floating_button_docking_tooltip">Move button to the edge to hide it temporarily</string> <!-- Text for the undo action button of the message view of the accessibility floating menu to perform undo operation. [CHAR LIMIT=30]--> <string name="accessibility_floating_button_undo">Undo</string> <!-- Text for the message view with undo action of the accessibility floating menu to show which feature shortcut was removed. [CHAR LIMIT=30]--> <string name="accessibility_floating_button_undo_message_label_text"><xliff:g id="feature name" example="Magnification">%s</xliff:g> shortcut removed</string> <!-- Text for the message view with undo action of the accessibility floating menu to show how many features shortcuts were removed. [CHAR LIMIT=30]--> <string name="accessibility_floating_button_undo_message_text">{count, plural, =1 {{label} shortcut removed} <string name="accessibility_floating_button_undo_message_number_text">{count, plural, =1 {# shortcut removed} other {# shortcuts removed} }</string> <!-- Action in accessibility menu to move the accessibility floating button to the top left of the screen. [CHAR LIMIT=30] --> <string name="accessibility_floating_button_action_move_top_left">Move top left</string> <!-- Action in accessibility menu to move the accessibility floating button to the top right of the screen. [CHAR LIMIT=30] --> Loading
packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayer.java +12 −8 Original line number Diff line number Diff line Loading @@ -25,6 +25,7 @@ import static com.android.internal.accessibility.common.ShortcutConstants.Access import static com.android.internal.accessibility.util.AccessibilityUtils.getAccessibilityServiceFragmentType; import static com.android.internal.accessibility.util.AccessibilityUtils.setAccessibilityServiceState; import static com.android.systemui.accessibility.floatingmenu.MenuMessageView.Index; import static com.android.systemui.util.PluralMessageFormaterKt.icuMessageFormat; import android.accessibilityservice.AccessibilityServiceInfo; import android.annotation.IntDef; Loading @@ -33,12 +34,12 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.Rect; import android.os.Handler; import android.os.Looper; import android.os.UserHandle; import android.provider.Settings; import android.util.PluralsMessageFormatter; import android.view.MotionEvent; import android.view.View; import android.view.ViewTreeObserver; Loading @@ -61,9 +62,7 @@ import com.android.wm.shell.common.magnetictarget.MagnetizedObject; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; /** Loading Loading @@ -221,11 +220,16 @@ class MenuViewLayer extends FrameLayout implements Preconditions.checkArgument(newTargetFeatures.size() > 0, "The list should at least have one feature."); final Map<String, Object> arguments = new HashMap<>(); arguments.put("count", newTargetFeatures.size()); arguments.put("label", newTargetFeatures.get(0).getLabel()); return PluralsMessageFormatter.format(getResources(), arguments, R.string.accessibility_floating_button_undo_message_text); final int featuresSize = newTargetFeatures.size(); final Resources resources = getResources(); if (featuresSize == 1) { return resources.getString( R.string.accessibility_floating_button_undo_message_label_text, newTargetFeatures.get(0).getLabel()); } return icuMessageFormat(resources, R.string.accessibility_floating_button_undo_message_number_text, featuresSize); } @Override Loading