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

Merge "Fix references to resources for Settings" into main

Browse Source
This commit is contained in:
Chaohui Wang
2023-08-08 08:40:42 +00:00
committed by Android (Google) Code Review
parent 997a731b90 2541381259
commit 0062308347
247 changed files with 859 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java
View File

@@ -37,7 +37,6 @@ import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.applications.AppStateBaseBridge;
import com.android.settings.datausage.AppStateDataUsageBridge.DataUsageState;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -141,7 +140,8 @@ public class UnrestrictedDataAccessPreferenceControllerTest {
} else if (testPkg2.equals(entry.info.packageName)) {
assertThat(preference.isDisabledByAdmin()).isTrue();
assertThat(preference.getSummary()).isEqualTo(
mContext.getString(R.string.disabled_by_admin));
mContext.getString(
com.android.settingslib.widget.R.string.disabled_by_admin));
}
assertThat(preference.isChecked()).isFalse();
preference.performClick();