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

Commit d09b6484 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5567188 from 6b2030a1 to qt-release 

Change-Id: Ia549bb5ad8604b2759033e1c24b4a02307db5cab
parents 13e11f0d 6b2030a1

AndroidManifest.xml

+11 −3
Original line number Diff line number Diff line
@@ -1448,6 +1448,16 @@ 
                <action android:name="android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.accessibility.AccessibilitySettingsForSetupWizard" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>



        <activity-alias

            android:name=".FontSizeSettingsForSetupWizardActivity"

            android:exported="true"

            android:targetActivity=".accessibility.AccessibilitySettingsForSetupWizardActivity">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.DISPLAY_SETTINGS" />
@@ -1458,9 +1468,7 @@ 
                android:value="true" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.accessibility.AccessibilitySettingsForSetupWizard" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>

        </activity-alias>



        <activity

            android:name="Settings$AccessibilityDaltonizerSettingsActivity"

color-check-baseline.xml

+123 −139

File changed.

Preview size limit exceeded, changes collapsed.

res/layout/preference_list_fragment.xml

+3 −1
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
    <FrameLayout android:id="@+id/pinned_header"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="?android:attr/windowBackground"

        android:elevation="1dp"

        android:visibility="gone"/>



    <FrameLayout

res/layout/settings_main_prefs.xml

+13 −19
Original line number Diff line number Diff line
@@ -22,13 +22,8 @@ 
              android:layout_height="match_parent"

              android:layout_width="match_parent">



    <LinearLayout

            android:orientation="vertical"

            android:layout_height="0px"

            android:layout_width="match_parent"

            android:layout_weight="1">



        <com.android.settings.widget.SwitchBar android:id="@+id/switch_bar"

    <com.android.settings.widget.SwitchBar

        android:id="@+id/switch_bar"

        android:layout_height="?android:attr/actionBarSize"

        android:layout_width="match_parent"

        android:theme="?attr/switchBarTheme"/>
@@ -36,9 +31,8 @@ 
    <FrameLayout

        android:id="@+id/main_content"

        android:layout_width="match_parent"

                android:layout_height="match_parent" />



    </LinearLayout>

        android:layout_height="0dp"

        android:layout_weight="1"/>



    <RelativeLayout android:id="@+id/button_bar"

                    android:layout_height="wrap_content"

res/values/strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -890,10 +890,12 @@ 
    <string name="security_settings_face_preference_title">Face authentication</string>

    <!-- Introduction title shown in face enrollment education screen [CHAR LIMIT=40] -->

    <string name="security_settings_face_enroll_education_title">How to set up Face unlock</string>

    <!-- Introduction title shown in face enrollment education screen to show the face authentication feature, when face unlock is disabled by device admin [CHAR LIMIT=40] -->

    <!-- Introduction title shown in face enrollment education screen to show the face authentication feature, when face unlock is disabled by device admin [CHAR LIMIT=60] -->

    <string name="security_settings_face_enroll_education_title_unlock_disabled">Use your face to authenticate</string>

    <!-- Introduction detail message shown in face education [CHAR LIMIT=NONE] -->

    <string name="security_settings_face_enroll_education_message"></string>

    <!-- Button that takes the user to the enrollment activity [CHAR LIMIT=20] -->

    <string name="security_settings_face_enroll_education_start">Start</string>

    <!-- Button shown which shows accessibility toggles for face enrollment when clicked. [CHAR LIMIT=32] -->

    <string name="security_settings_face_enroll_introduction_accessibility">Use accessibility setup</string>

    <!-- Additional details shown when the accessibility toggle is expanded. [CHAR LIMIT=NONE]-->
@@ -906,7 +908,7 @@ 
    <string name="security_settings_face_enroll_introduction_cancel">Cancel</string>

    <!-- Introduction title shown in face enrollment to introduce the face unlock feature [CHAR LIMIT=40] -->

    <string name="security_settings_face_enroll_introduction_title">Unlock with your face</string>

    <!-- Introduction title shown in face enrollment to introduce the face authentication feature, when face unlock is disabled by device admin [CHAR LIMIT=40] -->

    <!-- Introduction title shown in face enrollment to introduce the face authentication feature, when face unlock is disabled by device admin [CHAR LIMIT=60] -->

    <string name="security_settings_face_enroll_introduction_title_unlock_disabled">Use your face to authenticate</string>

    <!-- Introduction detail message shown in face enrollment dialog [CHAR LIMIT=NONE]-->

    <string name="security_settings_face_enroll_introduction_message">Use your face to unlock your phone, authorize purchases, or sign in to apps.</string>