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

Commit 78a0e714 authored by Christian Göllner's avatar Christian Göllner
Browse files

Add support for device state based auto-rotation preferences in Settings. 

- Creates new preferences that are shown when device-state rotation
  is supported.
- Hides standard preferences when device-state rotation is supported.
- Controllers/Preferences for individual folded/unfolded rotation
  settings are created and added programatically based on the settable
  device states available.

Test: Manually + Unit tests
Bug: 195757480
Change-Id: If254220ca3018bc6ec1c4e3947375733f6816f92
parent 6e652765

res/values/config.xml

+14 −1
Original line number Diff line number Diff line
@@ -568,6 +568,18 @@ 
        <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>
@@ -593,4 +605,5 @@ 


    <!-- 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

+13 −0
Original line number Diff line number Diff line
@@ -42,9 +42,22 @@ 
        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

0 → 100644
+24 −0
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

+15 −0
Original line number Diff line number Diff line
@@ -103,12 +103,27 @@ 
    <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

+4 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 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;
@@ -59,7 +60,9 @@ public class LockScreenRotationPreferenceController extends TogglePreferenceCont 


    @Override

    public int getAvailabilityStatus() {

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

        return RotationPolicy.isRotationSupported(mContext)

                && !DeviceStateAutoRotationHelper.isDeviceStateRotationEnabledForA11y(mContext)

                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;

    }



    @Override