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

Commit 9ddae005 authored by Alex Salo's avatar Alex Salo Committed by Automerger Merge Worker
Browse files

Merge "Fix long press auto rotate implementation bug" into sc-dev am: 8bfbd346 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I144c7878daa2270954c6f6bcdff091504bbc9e32
parents 3223845b 8bfbd346

AndroidManifest.xml

+18 −1
Original line number Diff line number Diff line
@@ -955,11 +955,28 @@ 
                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

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

                android:value="com.android.settings.display.SmartAutoRotatePreferenceFragment" />

                android:value="com.android.settings.DisplaySettings" />

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

                android:value="true" />

        </activity>



        <activity

            android:name="Settings$SmartAutoRotateSettingsActivity"

            android:label="@string/accelerometer_title"

            android:icon="@drawable/ic_homepage_notification"

            android:exported="true">

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

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

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

            </intent-filter>

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

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

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

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

                android:value="com.android.settings.display.SmartAutoRotatePreferenceFragment" />

        </activity>



        <activity

            android:name="Settings$NightDisplaySettingsActivity"

            android:label="@string/night_display_title"

res/values/strings.xml

+1 −2
Original line number Diff line number Diff line
@@ -102,8 +102,7 @@ 








    <!-- Disclaimer for camera based rotate [CHAR_LIMIT=NONE] -->









    <string name="smart_rotate_text_headline">









        Face based Autorotate uses the front camera to see if and how someone is looking at the screen. It allows









        for reading while lying down and images are never stored or sent to Google.&lt;br>&lt;br>









        Face Detection uses the front-facing camera to improve Auto-Rotate accuracy. Images are never stored or sent to Google.&lt;br>&lt;br>









       &lt;a href="<xliff:g example="http://www.google.com" id="url">http://support.google.com/mobile?p=telephony_rtt</xliff:g>">Learn more&lt;/a>









    </string>









    <string name="font_size_preview_text_headline">Sample text</string>
































src/com/android/settings/Settings.java



+1
−0






























Original line number
Diff line number
Diff line







@@ -97,6 +97,7 @@ public class Settings extends SettingsActivity {







    public static class DisplaySettingsActivity extends SettingsActivity { /* empty */ }









    public static class NightDisplaySettingsActivity extends SettingsActivity { /* empty */ }









    public static class NightDisplaySuggestionActivity extends NightDisplaySettingsActivity { /* empty */ }









    public static class SmartAutoRotateSettingsActivity extends SettingsActivity { /* empty */ }









    public static class MyDeviceInfoActivity extends SettingsActivity { /* empty */ }









    public static class ModuleLicensesActivity extends SettingsActivity { /* empty */ }









    public static class ApplicationSettingsActivity extends SettingsActivity { /* empty */ }