From dd57b9326696f744d3afbd9a4811d804f180c4ef Mon Sep 17 00:00:00 2001 From: josephpv Date: Tue, 13 Feb 2024 20:44:46 +0000 Subject: [PATCH 1/3] Change CHAR limit for localization query Increase privatespace_search_description limit to 90 chars Bug: 324559345 Test: Manual Change-Id: I9b6b7c5a0a3391dea32192a3866fd531d93f5ce5 --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 836a27f0a5c..97a9cd53add 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1268,7 +1268,7 @@ To stop other people knowing you have a private space on your device, you can hide it from your apps list Access private space when hidden - + From your apps list, enter \"private space\" in the search bar Tap the private space tile From c44fca064be18753a852a1a8acc6b21395c2680f Mon Sep 17 00:00:00 2001 From: Prabir Pradhan Date: Wed, 14 Feb 2024 04:20:57 +0000 Subject: [PATCH 2/3] Fix StylusDevicesControllerTest after adding a stylus setting When the build allows for pointer icons to be shown for styluses, a third preference controller will be shown to toggle the pointer icon for styluses. Bug: 325014309 Test: atest StylusDevicesControllerTest Change-Id: I0b4d2a9b19492fb8e4c8c904116ca763ca77cb8e --- .../stylus/StylusDevicesControllerTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java index 135be4bc055..6c96f852ddc 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java @@ -108,6 +108,9 @@ public class StylusDevicesControllerTest { MockitoAnnotations.initMocks(this); mContext = spy(ApplicationProvider.getApplicationContext()); + final var spiedResources = spy(mContext.getResources()); + when(mContext.getResources()).thenReturn(spiedResources); + PreferenceManager preferenceManager = new PreferenceManager(mContext); mScreen = preferenceManager.createPreferenceScreen(mContext); mPreferenceContainer = new PreferenceCategory(mContext); @@ -144,6 +147,9 @@ public class StylusDevicesControllerTest { when(mInputDevice.hasKeys(KEYCODE_STYLUS_BUTTON_TAIL)).thenReturn( new boolean[]{true}); + when(spiedResources.getBoolean( + com.android.internal.R.bool.config_enableStylusPointerIcon)).thenReturn(true); + mController = new StylusDevicesController(mContext, mInputDevice, null, mLifecycle); } @@ -237,7 +243,7 @@ public class StylusDevicesControllerTest { Preference handwritingPref = mPreferenceContainer.getPreference(0); Preference buttonPref = mPreferenceContainer.getPreference(1); - assertThat(mPreferenceContainer.getPreferenceCount()).isEqualTo(2); + assertThat(mPreferenceContainer.getPreferenceCount()).isEqualTo(3); assertThat(handwritingPref.getTitle().toString()).isEqualTo( mContext.getString(R.string.stylus_textfield_handwriting)); assertThat(handwritingPref.isVisible()).isTrue(); From 4326b43cc3fa4ce6d58ed58570cb4f51e0353de1 Mon Sep 17 00:00:00 2001 From: Ronish Kalia Date: Wed, 14 Feb 2024 14:25:53 +0000 Subject: [PATCH 3/3] [DON'T BLOCK] Test ownership migration rules This CL is created as a best effort to migrate test targets to the new android ownership model. If you find incorrect or unnecessary attribution in this CL, please create a separate CL to fix that. For more details please refer to the link below, Bug: 304529413 Test: N/A Change-Id: I921e99879cf2be50bc0232d88c5bb2dfcbdc1123 --- aconfig/Android.bp | 1 + .../settings/biometrics/fingerprint2/lib/Android.bp | 12 ++++++++---- tests/screenshot/Android.bp | 4 ++++ tests/shared/Android.bp | 6 +++++- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/aconfig/Android.bp b/aconfig/Android.bp index b2ffa222e2f..d511d0463c2 100644 --- a/aconfig/Android.bp +++ b/aconfig/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_android_settings_app", default_applicable_licenses: ["packages_apps_Settings_license"], } diff --git a/src/com/android/settings/biometrics/fingerprint2/lib/Android.bp b/src/com/android/settings/biometrics/fingerprint2/lib/Android.bp index 145f3d682ea..9f753b2d5d7 100644 --- a/src/com/android/settings/biometrics/fingerprint2/lib/Android.bp +++ b/src/com/android/settings/biometrics/fingerprint2/lib/Android.bp @@ -2,13 +2,17 @@ // unit/robo/screenshot etc. // // This library shouldn't have many dependencies. +package { + default_team: "trendy_team_android_settings_app", +} + android_library { name: "FingerprintManagerInteractor", srcs: [ - "**/*.kt" + "**/*.kt", ], static_libs: [ - "BiometricsSharedLib", - "kotlinx-coroutines-android", + "BiometricsSharedLib", + "kotlinx-coroutines-android", ], -} \ No newline at end of file +} diff --git a/tests/screenshot/Android.bp b/tests/screenshot/Android.bp index 59893816813..5130fe50cb9 100644 --- a/tests/screenshot/Android.bp +++ b/tests/screenshot/Android.bp @@ -13,6 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_team: "trendy_team_android_settings_app", +} + android_app { name: "ScreenshotTestStub", defaults: [ diff --git a/tests/shared/Android.bp b/tests/shared/Android.bp index 27573e8c8e1..6fd9f6473f2 100644 --- a/tests/shared/Android.bp +++ b/tests/shared/Android.bp @@ -1,7 +1,11 @@ +package { + default_team: "trendy_team_android_settings_app", +} + android_library { name: "Settings-testutils2", srcs: [ - "src/**/*.kt" + "src/**/*.kt", ], libs: [ "BiometricsSharedLib",