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

Commit 753647d5 authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Automerger Merge Worker
Browse files

Merge "Add "Show key presses" to input developer options" into udc-qpr-dev am: 8fca8a72 

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



Change-Id: Icc77794741fcbeb32726dddc972d75819b77428a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ca5faa59 8fca8a72

res/xml/development_settings.xml

+5 −0
Original line number Diff line number Diff line
@@ -464,6 +464,11 @@ 
            android:title="@string/pointer_location"

            android:summary="@string/pointer_location_summary" />



        <SwitchPreference

            android:key="show_key_presses"

            android:title="@string/show_key_presses"

            android:summary="@string/show_key_presses_summary" />



    </PreferenceCategory>



    <PreferenceCategory

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

+1 −0
Original line number Diff line number Diff line
@@ -675,6 +675,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        controllers.add(new NfcVerboseVendorLogPreferenceController(context, fragment));

        controllers.add(new ShowTapsPreferenceController(context));

        controllers.add(new PointerLocationPreferenceController(context));

        controllers.add(new ShowKeyPressesPreferenceController(context));

        controllers.add(new ShowSurfaceUpdatesPreferenceController(context));

        controllers.add(new ShowLayoutBoundsPreferenceController(context));

        controllers.add(new ShowRefreshRatePreferenceController(context));

src/com/android/settings/development/ShowKeyPressesPreferenceController.java

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

 * Copyright 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.development;



import android.content.Context;

import android.provider.Settings;



import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.SwitchPreference;



import com.android.settings.core.PreferenceControllerMixin;

import com.android.settingslib.development.DeveloperOptionsPreferenceController;



/** PreferenceController that controls the "Show key presses" developer option. */

public class ShowKeyPressesPreferenceController extends

        DeveloperOptionsPreferenceController implements

        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {



    private static final String SHOW_KEY_PRESSES_KEY = "show_key_presses";



    @VisibleForTesting

    static final int SETTING_VALUE_ON = 1;

    @VisibleForTesting

    static final int SETTING_VALUE_OFF = 0;



    public ShowKeyPressesPreferenceController(Context context) {

        super(context);

    }



    @Override

    public String getPreferenceKey() {

        return SHOW_KEY_PRESSES_KEY;

    }



    @Override

    public boolean onPreferenceChange(Preference preference, Object newValue) {

        final boolean isEnabled = (Boolean) newValue;

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

                Settings.System.SHOW_KEY_PRESSES, isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);

        return true;

    }



    @Override

    public void updateState(Preference preference) {

        int showKeyPresses = Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.SHOW_KEY_PRESSES, SETTING_VALUE_OFF);

        ((SwitchPreference) mPreference).setChecked(showKeyPresses != SETTING_VALUE_OFF);

    }



    @Override

    protected void onDeveloperOptionsSwitchDisabled() {

        super.onDeveloperOptionsSwitchDisabled();

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

                SETTING_VALUE_OFF);

        ((SwitchPreference) mPreference).setChecked(false);

    }

}

tests/robotests/src/com/android/settings/development/ShowKeyPressesPreferenceControllerTest.java

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

 * Copyright 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.development;



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



import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.provider.Settings;



import androidx.preference.PreferenceScreen;

import androidx.preference.SwitchPreference;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;



@RunWith(RobolectricTestRunner.class)

public class ShowKeyPressesPreferenceControllerTest {



    @Mock

    private PreferenceScreen mScreen;

    @Mock

    private SwitchPreference mPreference;



    private Context mContext;



    private ShowKeyPressesPreferenceController mController;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        mController = new ShowKeyPressesPreferenceController(mContext);

        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);

        mController.displayPreference(mScreen);

    }



    @Test

    public void updateState_showKeyPressesEnabled_shouldCheckedPreference() {

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

                Settings.System.SHOW_KEY_PRESSES, ShowTapsPreferenceController.SETTING_VALUE_ON);



        mController.updateState(mPreference);



        verify(mPreference).setChecked(true);

    }



    @Test

    public void updateState_showKeyPressesDisabled_shouldUncheckedPreference() {

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

                Settings.System.SHOW_KEY_PRESSES, ShowTapsPreferenceController.SETTING_VALUE_OFF);



        mController.updateState(mPreference);



        verify(mPreference).setChecked(false);

    }



    @Test

    public void onPreferenceChange_preferenceChecked_shouldEnableShowKeyPresses() {

        mController.onPreferenceChange(mPreference, true /* new value */);



        final int showKeyPresses = Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.SHOW_KEY_PRESSES, -1 /* default */);



        assertThat(showKeyPresses).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_ON);

    }



    @Test

    public void onPreferenceChange_preferenceUnchecked_shouldDisableShowKeyPresses() {

        mController.onPreferenceChange(mPreference, false /* new value */);



        final int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.SHOW_KEY_PRESSES, -1 /* default */);



        assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_OFF);

    }



    @Test

    public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {

        mController.onDeveloperOptionsSwitchDisabled();



        final int showTapsMode = Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.SHOW_KEY_PRESSES, -1 /* default */);



        assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_OFF);

        verify(mPreference).setEnabled(false);

        verify(mPreference).setChecked(false);

    }

}