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

Commit 20fb15ea authored by Xin Li's avatar Xin Li Committed by Android (Google) Code Review
Browse files

Merge "Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future" into aosp-main-future

parents d005b325 e2d326be

AndroidManifest.xml

+11 −0
Original line number Diff line number Diff line
@@ -2832,17 +2832,20 @@ 
        <!-- Note this must not be exported since it returns the password in the intent -->

        <activity android:name=".password.ConfirmLockPattern$InternalActivity"

            android:exported="false"

            android:enableOnBackInvokedCallback="false"

            android:theme="@style/GlifTheme.Light"/>



        <!-- Note this must not be exported since it returns the password in the intent -->

        <activity android:name=".password.ConfirmLockPassword$InternalActivity"

            android:exported="false"

            android:windowSoftInputMode="adjustResize"

            android:enableOnBackInvokedCallback="false"

            android:theme="@style/GlifTheme.Light"/>



        <activity android:name=".password.SetupChooseLockGeneric"

            android:theme="@style/GlifTheme.Light"

            android:exported="true"

            android:enableOnBackInvokedCallback="false"

            android:label="@string/lock_settings_picker_title">

            <intent-filter android:priority="1">

                <action android:name="com.android.settings.SETUP_LOCK_SCREEN" />
@@ -2852,16 +2855,19 @@ 


        <activity android:name=".password.SetupChooseLockGeneric$InternalActivity"

            android:exported="false"

            android:enableOnBackInvokedCallback="false"

            android:excludeFromRecents="true" />



        <activity android:name=".password.ChooseLockGeneric"

            android:label="@string/lockpassword_choose_lock_generic_header"

            android:excludeFromRecents="true"

            android:enableOnBackInvokedCallback="false"

            android:exported="false" />



        <activity android:name=".password.SetNewPasswordActivity"

            android:theme="@android:style/Theme.NoDisplay"

            android:exported="true"

            android:enableOnBackInvokedCallback="false"

            android:excludeFromRecents="true" >

            <intent-filter android:priority="1">

                <action android:name="android.app.action.SET_NEW_PASSWORD" />
@@ -2907,24 +2913,29 @@ 
        <activity android:name=".password.ChooseLockGeneric$InternalActivity"

            android:exported="false"

            android:label="@string/lockpassword_choose_lock_generic_header"

            android:enableOnBackInvokedCallback="false"

            android:excludeFromRecents="true" />



        <activity android:name=".password.SetupChooseLockPattern"

            android:exported="false"

            android:enableOnBackInvokedCallback="false"

            android:theme="@style/GlifTheme.Light" />



        <activity android:name=".password.ChooseLockPattern"

            android:exported="false"

            android:enableOnBackInvokedCallback="false"

            android:theme="@style/GlifTheme.Light" />



        <activity android:name=".password.SetupChooseLockPassword"

            android:exported="false"

            android:theme="@style/GlifTheme.Light"

            android:enableOnBackInvokedCallback="false"

            android:windowSoftInputMode="stateVisible|adjustResize" />



        <activity android:name=".password.ChooseLockPassword"

            android:exported="false"

            android:theme="@style/GlifTheme.Light"

            android:enableOnBackInvokedCallback="false"

            android:windowSoftInputMode="stateVisible|adjustResize"/>



        <activity

res/layout-land/request_manage_credentials.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:fitsSystemWindows="true"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="horizontal"

res/layout-sw600dp/request_manage_credentials.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:fitsSystemWindows="true"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

res/layout/request_manage_credentials.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true"

    android:clipChildren="true">



    <RelativeLayout

res/values-mcc262-mnc02-b+sr+Latn/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ 


<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="wifi_calling_off_explanation_2" msgid="5645212744935818562">\n\n"Ne možete da upućujete hitne pozive pomoću pozivanja preko Wi-Fi-ja. Ako probate da uputite hitan poziv, uređaj će automatski koristiti mobilnu mrežu. Hitni pozivi mogu da se upućuju samo u oblastima pokrivenim mobilnom mrežom."</string>

    <string name="wifi_calling_off_explanation_2" msgid="5645212744935818562">\n\n"Ne možete da upućujete hitne pozive pomoću pozivanja preko WiFi-a. Ako probate da uputite hitan poziv, uređaj će automatski koristiti mobilnu mrežu. Hitni pozivi mogu da se upućuju samo u oblastima pokrivenim mobilnom mrežom."</string>

</resources>