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

Snap for 8666349 from ecfb8ca300 to tm-qpr1-release

Browse Source 
Change-Id: Ib3bcf47e9781961b51238c0f6a268b28ed7f7962
This commit is contained in:
Android Build Coastguard Worker
2022-06-01 01:26:54 +00:00
parent 29506ab93e ecfb8ca300
commit 2019e22be8
8 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -5327,7 +5327,9 @@
<!-- Title for the confirm dialog of reset settings. [CHAR LIMIT=NONE] -->
<string name="accessibility_text_reading_confirm_dialog_title">Reset display size and text?</string>
<!-- Message for the confirm dialog of reset settings. [CHAR LIMIT=NONE] -->
<string name="accessibility_text_reading_confirm_dialog_message">Your display size and text preferences will reset to the phone\u2019s original settings</string>
<string name="accessibility_text_reading_confirm_dialog_message" product="default">Your display size and text preferences will reset to the phone\u2019s original settings</string>
<!-- Message for the confirm dialog of reset settings. [CHAR LIMIT=NONE] -->
<string name="accessibility_text_reading_confirm_dialog_message" product="tablet">Your display size and text preferences will reset to the tablet\u2019s original settings</string>
<!-- Title for the reset button of the confirm dialog of reset settings. [CHAR LIMIT=25] -->
<string name="accessibility_text_reading_confirm_dialog_reset_button">Reset</string>
<!-- Conversation message for the messaging app preview screen. [CHAR LIMIT=NONE] -->

11
src/com/android/settings/biometrics/OWNERS
View File

@@ -1,11 +1,12 @@
# Default reviewers for this and subdirectories.
curtislb@google.com
graciecheng@google.com
ilyamaty@google.com
jaggies@google.com
jbolinger@google.com
jeffpu@google.com
joshmccloskey@google.com
kchyn@google.com
yukl@google.com
# Emergency approvers in case the above are not available
firewall@google.com
jasonsfchang@google.com
lbill@google.com
mingjuwu@google.com

2
src/com/android/settings/slices/SlicesIndexer.java
View File

@@ -101,7 +101,7 @@ class SlicesIndexer implements Runnable {
for (SliceData dataRow : indexData) {
values = new ContentValues();
values.put(IndexColumns.KEY, dataRow.getKey());
values.put(IndexColumns.SLICE_URI, dataRow.getUri().toSafeString());
values.put(IndexColumns.SLICE_URI, dataRow.getUri().toString());
values.put(IndexColumns.TITLE, dataRow.getTitle());
values.put(IndexColumns.SUMMARY, dataRow.getSummary());
final CharSequence screenTitle = dataRow.getScreenTitle();

2
tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
View File

@@ -120,7 +120,7 @@ public class SearchFeatureProviderImplTest {
final Intent searchIntent = mProvider.buildSearchIntent(mActivity, SettingsEnums.TESTING);
final Uri referrer = searchIntent.getParcelableExtra(Intent.EXTRA_REFERRER);
assertThat(referrer.toSafeString()).isEqualTo(
assertThat(referrer.toString()).isEqualTo(
"android-app://" + mActivity.getPackageName() + "/" + SettingsEnums.TESTING);
}

2
tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
View File

@@ -332,7 +332,7 @@ public class SliceBroadcastReceiverTest {
values.put(SlicesDatabaseHelper.IndexColumns.ICON_RESOURCE, SliceTestUtils.FAKE_ICON);
values.put(SlicesDatabaseHelper.IndexColumns.FRAGMENT, SliceTestUtils.FAKE_FRAGMENT_NAME);
values.put(SlicesDatabaseHelper.IndexColumns.CONTROLLER, controllerClass);
values.put(SlicesDatabaseHelper.IndexColumns.SLICE_URI, buildUri(key).toSafeString());
values.put(SlicesDatabaseHelper.IndexColumns.SLICE_URI, buildUri(key).toString());
values.put(SlicesDatabaseHelper.IndexColumns.HIGHLIGHT_MENU_RESOURCE,
SliceTestUtils.FAKE_HIGHLIGHT_MENU_RES);
mDb.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);

2
tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
View File

@@ -121,7 +121,7 @@ public class SliceDataConverterTest {
assertThat(fakeSlice.getScreenTitle()).isEqualTo(FAKE_SCREEN_TITLE);
assertThat(fakeSlice.getKeywords()).isNull();
assertThat(fakeSlice.getIconResource()).isNotNull();
assertThat(fakeSlice.getUri().toSafeString())
assertThat(fakeSlice.getUri().toString())
.isEqualTo("content://com.android.settings.slices/action/key");
assertThat(fakeSlice.getFragmentClassName()).isEqualTo(FAKE_FRAGMENT_CLASSNAME);
assertThat(fakeSlice.getPreferenceController()).isEqualTo(FAKE_CONTROLLER_NAME);

2
tests/robotests/src/com/android/settings/slices/SliceTestUtils.java
View File

@@ -64,7 +64,7 @@ class SliceTestUtils {
: SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath(key)
.build().toSafeString());
.build().toString());
values.put(SlicesDatabaseHelper.IndexColumns.TITLE, FAKE_TITLE);
values.put(SlicesDatabaseHelper.IndexColumns.SUMMARY, FAKE_SUMMARY);
values.put(SlicesDatabaseHelper.IndexColumns.SCREENTITLE, FAKE_SCREEN_TITLE);

2
tests/unit/src/com/android/settings/slices/SliceTestUtils.java
View File

@@ -64,7 +64,7 @@ class SliceTestUtils {
: SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath(key)
.build().toSafeString());
.build().toString());
values.put(SlicesDatabaseHelper.IndexColumns.TITLE, FAKE_TITLE);
values.put(SlicesDatabaseHelper.IndexColumns.SUMMARY, FAKE_SUMMARY);
values.put(SlicesDatabaseHelper.IndexColumns.SCREENTITLE, FAKE_SCREEN_TITLE);