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

Commit 70d2c397 authored by Bruno Martins's avatar Bruno Martins
Browse files

DeviceUtils: Add helper methods to retrieve device's key capabilities 

Only one key related method existed so far, therefore add the remaining ones
and use those.

Change-Id: I586ad2f783087e6bd2606262fa1d067ed76df0a6
parent b3639df4

src/org/lineageos/lineageparts/input/ButtonBacklightBrightness.java

+9 −11
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The CyanogenMod Project

 *               2017 The LineageOS Project

 *               2017-2020 The LineageOS Project

 *

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

 * you may not use this file except in compliance with the License.
@@ -36,11 +36,10 @@ import android.widget.TextView; 


import androidx.preference.PreferenceManager;



import org.lineageos.lineageparts.utils.DeviceUtils;

import org.lineageos.lineageparts.widget.CustomDialogPreference;

import org.lineageos.lineageparts.R;



import static org.lineageos.internal.util.DeviceKeysConstants.*;



import lineageos.providers.LineageSettings;



public class ButtonBacklightBrightness extends CustomDialogPreference<AlertDialog> implements
@@ -227,15 +226,14 @@ public class ButtonBacklightBrightness extends CustomDialogPreference<AlertDialo 
    }



    public boolean isButtonSupported() {

        final Resources res = getContext().getResources();

        final int deviceKeys = res.getInteger(

                org.lineageos.platform.internal.R.integer.config_deviceHardwareKeys);

        final Context context = getContext();

        final Resources res = context.getResources();

        // All hardware keys besides volume and camera can possibly have a backlight

        boolean hasBacklightKey = (deviceKeys & KEY_MASK_HOME) != 0

                || (deviceKeys & KEY_MASK_BACK) != 0

                || (deviceKeys & KEY_MASK_MENU) != 0

                || (deviceKeys & KEY_MASK_ASSIST) != 0

                || (deviceKeys & KEY_MASK_APP_SWITCH) != 0;

        boolean hasBacklightKey = DeviceUtils.hasHomeKey(context)

                || DeviceUtils.hasBackKey(context)

                || DeviceUtils.hasMenuKey(context)

                || DeviceUtils.hasAssistKey(context)

                || DeviceUtils.hasAppSwitchKey(context);

        boolean hasBacklight = res.getInteger(

                com.android.internal.R.integer.config_buttonBrightnessSettingDefault) > 0;

src/org/lineageos/lineageparts/input/ButtonSettings.java

+17 −24
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ import android.util.Log; 
import android.view.Display;

import android.view.DisplayInfo;

import android.view.IWindowManager;

import android.view.KeyCharacterMap;

import android.view.KeyEvent;

import android.view.WindowManagerGlobal;



import androidx.preference.ListPreference;
@@ -140,27 +138,22 @@ public class ButtonSettings extends SettingsPreferenceFragment implements 
        final ContentResolver resolver = getActivity().getContentResolver();

        final PreferenceScreen prefScreen = getPreferenceScreen();



        final int deviceKeys = res.getInteger(

                org.lineageos.platform.internal.R.integer.config_deviceHardwareKeys);

        final int deviceWakeKeys = res.getInteger(

                org.lineageos.platform.internal.R.integer.config_deviceHardwareWakeKeys);



        final boolean hasPowerKey = KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER);

        final boolean hasHomeKey = (deviceKeys & KEY_MASK_HOME) != 0;

        final boolean hasBackKey = (deviceKeys & KEY_MASK_BACK) != 0;

        final boolean hasMenuKey = (deviceKeys & KEY_MASK_MENU) != 0;

        final boolean hasAssistKey = (deviceKeys & KEY_MASK_ASSIST) != 0;

        final boolean hasAppSwitchKey = (deviceKeys & KEY_MASK_APP_SWITCH) != 0;

        final boolean hasCameraKey = (deviceKeys & KEY_MASK_CAMERA) != 0;

        final boolean hasVolumeKeys = (deviceKeys & KEY_MASK_VOLUME) != 0;



        final boolean showHomeWake = (deviceWakeKeys & KEY_MASK_HOME) != 0;

        final boolean showBackWake = (deviceWakeKeys & KEY_MASK_BACK) != 0;

        final boolean showMenuWake = (deviceWakeKeys & KEY_MASK_MENU) != 0;

        final boolean showAssistWake = (deviceWakeKeys & KEY_MASK_ASSIST) != 0;

        final boolean showAppSwitchWake = (deviceWakeKeys & KEY_MASK_APP_SWITCH) != 0;

        final boolean showCameraWake = (deviceWakeKeys & KEY_MASK_CAMERA) != 0;

        final boolean showVolumeWake = (deviceWakeKeys & KEY_MASK_VOLUME) != 0;

        final boolean hasPowerKey = DeviceUtils.hasPowerKey();

        final boolean hasHomeKey = DeviceUtils.hasHomeKey(getActivity());

        final boolean hasBackKey = DeviceUtils.hasBackKey(getActivity());

        final boolean hasMenuKey = DeviceUtils.hasMenuKey(getActivity());

        final boolean hasAssistKey = DeviceUtils.hasAssistKey(getActivity());

        final boolean hasAppSwitchKey = DeviceUtils.hasAppSwitchKey(getActivity());

        final boolean hasCameraKey = DeviceUtils.hasCameraKey(getActivity());

        final boolean hasVolumeKeys = DeviceUtils.hasVolumeKeys(getActivity());



        final boolean showHomeWake = DeviceUtils.canWakeUsingHomeKey(getActivity());

        final boolean showBackWake = DeviceUtils.canWakeUsingBackKey(getActivity());

        final boolean showMenuWake = DeviceUtils.canWakeUsingMenuKey(getActivity());

        final boolean showAssistWake = DeviceUtils.canWakeUsingAssistKey(getActivity());

        final boolean showAppSwitchWake = DeviceUtils.canWakeUsingAppSwitchKey(getActivity());

        final boolean showCameraWake = DeviceUtils.canWakeUsingCameraKey(getActivity());

        final boolean showVolumeWake = DeviceUtils.canWakeUsingVolumeKeys(getActivity());



        boolean hasAnyBindableKey = false;

        final PreferenceCategory powerCategory = prefScreen.findPreference(CATEGORY_POWER);
@@ -363,7 +356,7 @@ public class ButtonSettings extends SettingsPreferenceFragment implements 
            prefScreen.removePreference(cameraCategory);

        }



        if (DeviceUtils.hasVolumeRocker(getActivity())) {

        if (hasVolumeKeys) {

            if (!showVolumeWake) {

                volumeCategory.removePreference(findPreference(LineageSettings.System.VOLUME_WAKE_SCREEN));

            }

src/org/lineageos/lineageparts/utils/DeviceUtils.java

+84 −4
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ import android.os.Build; 
import android.os.SystemProperties;

import android.provider.Settings;

import android.text.TextUtils;

import android.view.KeyCharacterMap;

import android.view.KeyEvent;

import android.view.Surface;



import static org.lineageos.internal.util.DeviceKeysConstants.*;
@@ -48,11 +50,89 @@ public class DeviceUtils { 
                org.lineageos.platform.internal.R.bool.config_haveNotch);

    }



    /* returns whether the device has volume rocker or not. */

    public static boolean hasVolumeRocker(Context context) {

        final int deviceKeys = context.getResources().getInteger(

    public static int getDeviceKeys(Context context) {

        return context.getResources().getInteger(

                org.lineageos.platform.internal.R.integer.config_deviceHardwareKeys);

        return (deviceKeys & KEY_MASK_VOLUME) != 0;

    }



    public static int getDeviceWakeKeys(Context context) {

        return context.getResources().getInteger(

                org.lineageos.platform.internal.R.integer.config_deviceHardwareWakeKeys);

    }



    /* returns whether the device has power key or not. */

    public static boolean hasPowerKey() {

        return KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER);

    }



    /* returns whether the device has home key or not. */

    public static boolean hasHomeKey(Context context) {

        return (getDeviceKeys(context) & KEY_MASK_HOME) != 0;

    }



    /* returns whether the device has back key or not. */

    public static boolean hasBackKey(Context context) {

        return (getDeviceKeys(context) & KEY_MASK_BACK) != 0;

    }



    /* returns whether the device has menu key or not. */

    public static boolean hasMenuKey(Context context) {

        return (getDeviceKeys(context) & KEY_MASK_MENU) != 0;

    }



    /* returns whether the device has assist key or not. */

    public static boolean hasAssistKey(Context context) {

        return (getDeviceKeys(context) & KEY_MASK_ASSIST) != 0;

    }



    /* returns whether the device has app switch key or not. */

    public static boolean hasAppSwitchKey(Context context) {

        return (getDeviceKeys(context) & KEY_MASK_APP_SWITCH) != 0;

    }



    /* returns whether the device has camera key or not. */

    public static boolean hasCameraKey(Context context) {

        return (getDeviceKeys(context) & KEY_MASK_CAMERA) != 0;

    }



    /* returns whether the device has volume rocker or not. */

    public static boolean hasVolumeKeys(Context context) {

        return (getDeviceKeys(context) & KEY_MASK_VOLUME) != 0;

    }



    /* returns whether the device can be waken using the home key or not. */

    public static boolean canWakeUsingHomeKey(Context context) {

        return (getDeviceWakeKeys(context) & KEY_MASK_HOME) != 0;

    }



    /* returns whether the device can be waken using the back key or not. */

    public static boolean canWakeUsingBackKey(Context context) {

        return (getDeviceWakeKeys(context) & KEY_MASK_BACK) != 0;

    }



    /* returns whether the device can be waken using the menu key or not. */

    public static boolean canWakeUsingMenuKey(Context context) {

        return (getDeviceWakeKeys(context) & KEY_MASK_MENU) != 0;

    }



    /* returns whether the device can be waken using the assist key or not. */

    public static boolean canWakeUsingAssistKey(Context context) {

        return (getDeviceWakeKeys(context) & KEY_MASK_ASSIST) != 0;

    }



    /* returns whether the device can be waken using the app switch key or not. */

    public static boolean canWakeUsingAppSwitchKey(Context context) {

        return (getDeviceWakeKeys(context) & KEY_MASK_APP_SWITCH) != 0;

    }



    /* returns whether the device can be waken using the camera key or not. */

    public static boolean canWakeUsingCameraKey(Context context) {

        return (getDeviceWakeKeys(context) & KEY_MASK_CAMERA) != 0;

    }



    /* returns whether the device can be waken using the volume rocker or not. */

    public static boolean canWakeUsingVolumeKeys(Context context) {

        return (getDeviceWakeKeys(context) & KEY_MASK_VOLUME) != 0;

    }



    public static boolean isPackageInstalled(Context context, String pkg, boolean ignoreState) {