Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fce2e30 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11449429 from 371c96cb to 24Q2-release

Change-Id: I4ad239c35786ce31fd7c1464dd923e73c6b533ca
parents 5b626677 371c96cb
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
package {
    default_team: "trendy_team_android_settings_app",
    default_applicable_licenses: ["packages_apps_Settings_license"],
}

+1 −1
Original line number Diff line number Diff line
@@ -1268,7 +1268,7 @@
    <string name="privatespace_hide_page_summary">To stop other people knowing you have a private space on your device, you can hide it from your apps list</string>
    <!-- Header in hide Private Space settings page to access Private Space when hidden. [CHAR LIMIT=60] -->
    <string name="privatespace_access_header">Access private space when hidden</string>
    <!-- Text in hide Private Space settings page on how to search Private Space when hidden. [CHAR LIMIT=60] -->
    <!-- Text in hide Private Space settings page on how to search Private Space when hidden. [CHAR LIMIT=90] -->
    <string name="privatespace_search_description">From your apps list, enter \"private space\" in the search bar</string>
    <!-- Text in hide Private Space settings page to tap on Private Space tile. [CHAR LIMIT=60] -->
    <string name="privatespace_tap_tile_description">Tap the private space tile</string>
+8 −4
Original line number Diff line number Diff line
@@ -2,10 +2,14 @@
// 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",
+7 −1
Original line number Diff line number Diff line
@@ -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();
+4 −0
Original line number Diff line number Diff line
@@ -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: [
Loading