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

Merge "[Settings] Apply new style to dialog" into main

Browse Source
This commit is contained in:
Zoey Chen
2025-02-12 17:28:45 -08:00
committed by Android (Google) Code Review
parent 22e56834fd 09841d6bb4
commit ceaa16575a
9 changed files with 199 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/unit/src/com/android/settings/localepicker/LocaleDialogFragmentTest.java
View File

@@ -35,6 +35,7 @@ import androidx.test.annotation.UiThreadTest;
import androidx.test.core.app.ApplicationProvider;
import com.android.internal.app.LocaleStore;
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.ResourcesUtils;
@@ -82,11 +83,9 @@ public class LocaleDialogFragmentTest {
LocaleDialogFragment.LocaleDialogController.DialogContent dialogContent =
controller.getDialogContent();
assertEquals(ResourcesUtils.getResourcesString(
mContext, "button_label_confirmation_of_system_locale_change"),
assertEquals(R.string.button_label_confirmation_of_system_locale_change,
dialogContent.mPositiveButton);
assertEquals(ResourcesUtils.getResourcesString(mContext, "cancel"),
dialogContent.mNegativeButton);
assertEquals(R.string.cancel, dialogContent.mNegativeButton);
}
@Test
@@ -99,9 +98,8 @@ public class LocaleDialogFragmentTest {
LocaleDialogFragment.LocaleDialogController.DialogContent dialogContent =
controller.getDialogContent();
assertEquals(ResourcesUtils.getResourcesString(mContext, "okay"),
dialogContent.mPositiveButton);
assertTrue(dialogContent.mNegativeButton.isEmpty());
assertEquals(R.string.okay, dialogContent.mPositiveButton);
assertTrue(dialogContent.mNegativeButton == 0);
}
@Test