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

Commit 8c68b0e7 authored by Shivangi Dubey's avatar Shivangi Dubey Committed by Android (Google) Code Review
Browse files

Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev

parents 6c12390b 8f4122ad

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -548,6 +548,9 @@ 
    <!-- Whether to show Smooth Display feature in Settings Options -->

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



    <!-- Whether to show Stay awake on fold feature in Settings Options -->

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



    <!-- Whether to show emergency settings in top-level Settings -->

    <bool name="config_show_emergency_settings">true</bool>

res/values/strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -2357,6 +2357,10 @@ 
    <string name="display_white_balance_title">Display white balance</string>

    <!-- Display settings screen, display white balance settings summary [CHAR LIMIT=NONE] -->

    <string name="display_white_balance_summary"></string>

    <!-- Display settings screen, setting name to enable staying awake on fold [CHAR LIMIT=30] -->

    <string name="stay_awake_on_fold_title">Stay unlocked on fold</string>

    <!-- Display settings screen, setting summary to enable staying awake on fold [CHAR LIMIT=NONE] -->

    <string name="stay_awake_on_fold_summary">Keep front display unlocked when folded until screen timeout</string>

    <!-- Display settings screen, peak refresh rate settings title [CHAR LIMIT=30] -->

    <string name="peak_refresh_rate_title">Smooth Display</string>

    <!-- Display settings screen, peak refresh rate settings summary [CHAR LIMIT=NONE] -->
@@ -7028,6 +7032,9 @@ 
    <string name="keywords_app_pinning">screen pinning</string>

    <string name="keywords_profile_challenge">work challenge, work, profile</string>

    <string name="keywords_unification">work profile, managed profile, unify, unification, work, profile</string>

    <string name="keywords_stay_awake_on_lock">

        awake, sleep, do not lock, stay unlocked on fold, folding, closing, fold, close, screen off

    </string>

    <string name="keywords_gesture">gestures</string>

    <string name="keywords_wallet">wallet</string>

    <string name="keywords_payment_settings">pay, tap, payments</string>

res/xml/display_settings.xml

+7 −0
Original line number Diff line number Diff line
@@ -48,6 +48,13 @@ 
            settings:keywords="@string/keywords_ambient_display_screen"

            settings:controller="com.android.settings.security.screenlock.LockScreenPreferenceController"/>



        <SwitchPreference

            android:key="stay_awake_on_fold"

            android:title="@string/stay_awake_on_fold_title"

            android:summary="@string/stay_awake_on_fold_summary"

            settings:keywords="@string/keywords_stay_awake_on_lock"

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



        <com.android.settingslib.RestrictedPreference

            android:key="screen_timeout"

            android:title="@string/screen_timeout"

src/com/android/settings/display/StayAwakeOnFoldPreferenceController.java

0 → 100644
+75 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.

 */



package com.android.settings.display;



import android.content.Context;

import android.content.res.Resources;

import android.provider.Settings;



import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;



/**

 * A preference controller for the "Stay unlocked on fold" setting.

 *

 * This preference controller allows users to control whether or not the device

 * stays awake when it is folded. When this setting is enabled, the device will

 * stay awake even if the device is folded.

 *

 * @link android.provider.Settings.System#STAY_AWAKE_ON_FOLD

 */

public class StayAwakeOnFoldPreferenceController extends TogglePreferenceController {



    private final Resources mResources;



    public StayAwakeOnFoldPreferenceController(Context context, String key) {

        this(context, key, context.getResources());

    }



    public StayAwakeOnFoldPreferenceController(Context context, String key, Resources resources) {

        super(context, key);

        mResources = resources;

    }



    @Override

    public int getAvailabilityStatus() {

        return mResources.getBoolean(R.bool.config_stay_awake_on_fold) ? AVAILABLE

                : UNSUPPORTED_ON_DEVICE;

    }



    @Override

    public boolean isChecked() {

        return Settings.System.getInt(

                mContext.getContentResolver(),

                Settings.System.STAY_AWAKE_ON_FOLD,

                0) == 1;

    }



    @Override

    public boolean setChecked(boolean isChecked) {

        final int stayUnlockedOnFold = isChecked ? 1 : 0;



        return Settings.System.putInt(mContext.getContentResolver(),

                Settings.System.STAY_AWAKE_ON_FOLD, stayUnlockedOnFold);

    }



    @Override

    public int getSliceHighlightMenuRes() {

        return R.string.menu_key_display;

    }



}

tests/robotests/src/com/android/settings/display/StayAwakeOnFoldPreferenceControllerTest.java

0 → 100644
+119 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.

 */



package com.android.settings.display;



import static com.android.settings.core.BasePreferenceController.AVAILABLE;

import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.when;



import android.content.Context;

import android.content.res.Resources;

import android.provider.Settings;



import com.android.settings.R;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.Mockito;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;



@RunWith(RobolectricTestRunner.class)

public class StayAwakeOnFoldPreferenceControllerTest {



    @Mock

    private Resources mResources;

    private Context mContext;

    private StayAwakeOnFoldPreferenceController mController;



    @Before

    public void setUp() {

        mContext = RuntimeEnvironment.application;

        mResources = Mockito.mock(Resources.class);

        mController = new StayAwakeOnFoldPreferenceController(mContext, "key", mResources);

    }



    @Test

    public void getAvailabilityStatus_withConfigNoShow_returnUnsupported() {

        when(mResources.getBoolean(R.bool.config_stay_awake_on_fold)).thenReturn(false);



        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);

    }



    @Test

    public void getAvailabilityStatus_withConfigNoShow_returnAvailable() {

        when(mResources.getBoolean(R.bool.config_stay_awake_on_fold)).thenReturn(true);



        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);

    }



    @Test

    public void setChecked_enableStayAwakeOnFold_setChecked() {

        mController.setChecked(true);



        assertThat(isStayAwakeOnFoldEnabled())

                .isTrue();

    }



    @Test

    public void setChecked_disableStayAwakeOnFold_setUnchecked() {

        mController.setChecked(false);



        assertThat(isStayAwakeOnFoldEnabled())

                .isFalse();

    }



    @Test

    public void isChecked_enableStayAwakeOnFold_returnTrue() {

        enableStayAwakeOnFoldPreference();



        assertThat(mController.isChecked()).isTrue();

    }



    @Test

    public void isChecked_disableStayAwakeOnFold_returnFalse() {

        disableStayAwakeOnFoldPreference();



        assertThat(mController.isChecked()).isFalse();

    }



    private void enableStayAwakeOnFoldPreference() {

        Settings.System.putInt(

                mContext.getContentResolver(),

                Settings.System.STAY_AWAKE_ON_FOLD,

                1);

    }



    private void disableStayAwakeOnFoldPreference() {

        Settings.System.putInt(

                mContext.getContentResolver(),

                Settings.System.STAY_AWAKE_ON_FOLD,

                0);

    }



    private boolean isStayAwakeOnFoldEnabled() {

        return (Settings.System.getInt(

                mContext.getContentResolver(),

                Settings.System.STAY_AWAKE_ON_FOLD,

                0) == 1);

    }

}