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

Commit f6bafc83 authored by Massimo Carli's avatar Massimo Carli Committed by Automerger Merge Worker
Browse files

Merge "Use experimental string in user aspect ratio settings" into udc-qpr-dev am: 10050559 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24828451



Change-Id: I50a45b2215e701be23cfd67f3ff1a7869a220f0d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7cbef7df 10050559

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -1582,7 +1582,7 @@ 


        <activity android:name="Settings$UserAspectRatioAppListActivity"

            android:exported="true"

            android:label="@string/aspect_ratio_title">

            android:label="@string/aspect_ratio_experimental_title">

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

                <action android:name="android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS"/>

                <category android:name="android.intent.category.DEFAULT" />
@@ -1595,7 +1595,7 @@ 


        <activity android:name="Settings$UserAspectRatioAppActivity"

                  android:exported="true"

                  android:label="@string/aspect_ratio_title">

                  android:label="@string/aspect_ratio_experimental_title">

            <intent-filter>

                <action android:name="android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS" />

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