From fbadd2889fd276707210c0d7a41a0281cfe85b90 Mon Sep 17 00:00:00 2001
From: Chun-Ku Lin <chunkulin@google.com>
Date: Thu, 25 May 2023 04:37:50 +0000
Subject: [PATCH] Use ResourcesUtils to get the resource from the target
 application.

Bug: 284220081
Test: atest OneHandedPreferenceControllerTest
Change-Id: I25558af0c797dfc0a5fdd3cff6f1724ff18dac27
---
 .../OneHandedPreferenceControllerTest.java    | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/tests/unit/src/com/android/settings/accessibility/OneHandedPreferenceControllerTest.java b/tests/unit/src/com/android/settings/accessibility/OneHandedPreferenceControllerTest.java
index 2ab61cdbaa9..dc5a7d53887 100644
--- a/tests/unit/src/com/android/settings/accessibility/OneHandedPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/accessibility/OneHandedPreferenceControllerTest.java
@@ -23,8 +23,8 @@ import android.content.Context;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.android.settings.R;
 import com.android.settings.gestures.OneHandedSettingsUtils;
+import com.android.settings.testutils.ResourcesUtils;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -44,20 +44,35 @@ public final class OneHandedPreferenceControllerTest {
     @Test
     public void getSummary_oneHandedEnabled_showsOnWithSummary() {
         OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, true);
+        // R.string.gesture_setting_on
+        String gestureSettingOn = ResourcesUtils.getResourcesString(mContext, "gesture_setting_on");
+        // R.string.one_handed_mode_intro_text
+        String oneHandedModeIntroText = ResourcesUtils.getResourcesString(mContext,
+                "one_handed_mode_intro_text");
 
+        // expect: On / $(summary)
         assertThat(mController.getSummary().toString()).isEqualTo(
-                mContext.getString(R.string.preference_summary_default_combination,
-                        mContext.getText(R.string.gesture_setting_on),
-                        mContext.getText(R.string.one_handed_mode_intro_text)));
+                // R.string.preference_summary_default_combination
+                ResourcesUtils.getResourcesString(mContext,
+                        "preference_summary_default_combination", gestureSettingOn,
+                        oneHandedModeIntroText));
     }
 
     @Test
     public void getSummary_oneHandedDisabled_showsOffWithSummary() {
         OneHandedSettingsUtils.setOneHandedModeEnabled(mContext, false);
+        // R.string.gesture_setting_off
+        String gestureSettingOff = ResourcesUtils.getResourcesString(mContext,
+                "gesture_setting_off");
+        // R.string.one_handed_mode_intro_text
+        String oneHandedModeIntroText = ResourcesUtils.getResourcesString(mContext,
+                "one_handed_mode_intro_text");
 
+        // expect: Off / $(summary)
         assertThat(mController.getSummary().toString()).isEqualTo(
-                mContext.getString(R.string.preference_summary_default_combination,
-                        mContext.getText(R.string.gesture_setting_off),
-                        mContext.getText(R.string.one_handed_mode_intro_text)));
+                // R.string.preference_summary_default_combination
+                ResourcesUtils.getResourcesString(mContext,
+                        "preference_summary_default_combination", gestureSettingOff,
+                        oneHandedModeIntroText));
     }
 }