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

Commit 3c65556c authored by Christian Göllner's avatar Christian Göllner Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add support for device state based auto-rotation prefere...""

parents 6eae6d66 a663f10c

res/values/config.xml

+1 −14
Original line number Diff line number Diff line
@@ -571,18 +571,6 @@ 
        <item>3</item>

    </integer-array>

    

    <!-- The settings/preference description for each settable device state defined in the array

         "config_perDeviceStateRotationLockDefaults".

         The item in position "i" describes the auto-rotation setting for the device state also in

         position "i" in the array "config_perDeviceStateRotationLockDefaults". -->

    <string-array name="config_settableAutoRotationDeviceStatesDescriptions">

        <!-- Example:

            <item>Auto-rotate when folded</item>

            <item>@null</item> No description for state in position 1

            <item>Auto-rotate when unfolded</item>

        -->

    </string-array>



    <!-- Whether to aggregate for network selection list-->

    <bool name="config_network_selection_list_aggregation_enabled">false</bool>
@@ -608,5 +596,4 @@ 


    <!-- Whether the dream setup activity should be enabled as part of setupwizard -->

    <bool name="dream_setup_supported">false</bool>



</resources>

res/xml/accessibility_system_controls.xml

+0 −13
Original line number Diff line number Diff line
@@ -42,22 +42,9 @@ 
        android:title="@string/accessibility_power_button_ends_call_prerefence_title"

        settings:controller="com.android.settings.accessibility.PowerButtonEndsCallPreferenceController"/>



    <!-- Standard auto-rotation preference that will be shown when device state based auto-rotation

         settings are NOT available. -->

    <SwitchPreference

        android:key="toggle_lock_screen_rotation_preference"

        android:persistent="false"

        android:title="@string/accelerometer_title"

        settings:controller="com.android.settings.accessibility.LockScreenRotationPreferenceController"/>



    <!-- Auto-rotation preference that will be shown when device state based auto-rotation settings

         are available. -->

    <Preference

        android:key="device_state_auto_rotate_accessibility"

        android:persistent="false"

        android:title="@string/accelerometer_title"

        android:fragment="com.android.settings.display.DeviceStateAutoRotateDetailsFragment"

        settings:keywords="@string/keywords_auto_rotate"

        settings:controller="com.android.settings.display.DeviceStateAutoRotateOverviewController"/>



</PreferenceScreen>

res/xml/device_state_auto_rotate_settings.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2022 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->



<PreferenceScreen

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

    android:title="@string/accelerometer_title" >



    <!-- Device state based auto-rotation preferences will be added programmatically here.  -->



</PreferenceScreen>

res/xml/display_settings.xml

+0 −15
Original line number Diff line number Diff line
@@ -96,27 +96,12 @@ 
    <PreferenceCategory

        android:title="@string/category_name_display_controls">



        <!--

            Standard auto-rotation preference that will be shown when device state based

            auto-rotation settings are NOT available.

          -->

        <SwitchPreference

            android:key="auto_rotate"

            android:title="@string/accelerometer_title"

            settings:keywords="@string/keywords_auto_rotate"

            settings:controller="com.android.settings.display.AutoRotatePreferenceController"/>



        <!--

            Auto-rotation preference that will be shown when device state based auto-rotation

            settings are available.

          -->

        <Preference

            android:key="device_state_auto_rotate"

            android:title="@string/accelerometer_title"

            android:fragment="com.android.settings.display.DeviceStateAutoRotateDetailsFragment"

            settings:keywords="@string/keywords_auto_rotate"

            settings:controller="com.android.settings.display.DeviceStateAutoRotateOverviewController"/>



        <SwitchPreference

            android:key="display_white_balance"

            android:title="@string/display_white_balance_title"

src/com/android/settings/accessibility/LockScreenRotationPreferenceController.java

+1 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import com.android.internal.view.RotationPolicy; 
import com.android.internal.view.RotationPolicy.RotationPolicyListener;

import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settings.display.DeviceStateAutoRotationHelper;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnStart;

import com.android.settingslib.core.lifecycle.events.OnStop;
@@ -60,9 +59,7 @@ public class LockScreenRotationPreferenceController extends TogglePreferenceCont 


    @Override

    public int getAvailabilityStatus() {

        return RotationPolicy.isRotationSupported(mContext)

                && !DeviceStateAutoRotationHelper.isDeviceStateRotationEnabledForA11y(mContext)

                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;

        return RotationPolicy.isRotationSupported(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;

    }



    @Override