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

Commit 7f4385e0 authored by Nextbit's avatar Nextbit Committed by Adnan Begovic
Browse files

Settings: ButtonSettings: Introduce recents long press action 

Add a new preference in Settings > Buttons > Recents long press action
that controls the behavior of recents long press intent
ACTION_RECENTS_LONG_PRESS.

The user preference is saved in
Settings.Secure.RECENTS_LONG_PRESS_ACTIVITY; if empty the default is the
system's "switch to last app" behavior. Settings.Secure is used
intentionally over Settings.System for permission reasons.

Change-Id: Ifc61b5958a88360e32db31459f0205b6ba5306b3
parent fd77db5e

res/values/cm_strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ 
    <string name="navigation_bar_reset_message">Delete current settings and restore the default layout?</string>

    <string name="navigation_bar_arrow_keys_title">Show arrow keys while typing</string>

    <string name="navigation_bar_arrow_keys_summary">Display left and right cursor buttons while typing. Overrides IME switcher.</string>

    <string name="navigation_bar_recents_title">Recents long press action</string>



    <string name="header_category_personalization">Personalization</string>

res/xml/button_settings.xml

+6 −0
Original line number Diff line number Diff line
@@ -59,6 +59,12 @@ 
            android:title="@string/navigation_ring_title"

            settings:advanced="true"/>



        <ListPreference

            android:key="navigation_recents_long_press"

            android:dialogTitle="@string/navigation_bar_recents_title"

            android:title="@string/navigation_bar_recents_title"

            android:persistent="false" />



    </PreferenceCategory>



    <PreferenceCategory

src/com/android/settings/ButtonSettings.java

+83 −0
Original line number Diff line number Diff line
@@ -16,9 +16,12 @@ 


package com.android.settings;



import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.res.Resources;

import android.content.SharedPreferences;

import android.content.SharedPreferences.Editor;
@@ -70,6 +73,7 @@ public class ButtonSettings extends SettingsPreferenceFragment implements 
    private static final String KEY_SWAP_VOLUME_BUTTONS = "swap_volume_buttons";

    private static final String DISABLE_NAV_KEYS = "disable_nav_keys";

    private static final String KEY_NAVIGATION_BAR_LEFT = "navigation_bar_left";

    private static final String KEY_NAVIGATION_RECENTS_LONG_PRESS = "navigation_recents_long_press";

    private static final String KEY_POWER_END_CALL = "power_end_call";

    private static final String KEY_HOME_ANSWER_CALL = "home_answer_call";
@@ -119,6 +123,7 @@ public class ButtonSettings extends SettingsPreferenceFragment implements 
    private SwitchPreference mSwapVolumeButtons;

    private SwitchPreference mDisableNavigationKeys;

    private SwitchPreference mNavigationBarLeftPref;

    private ListPreference mNavigationRecentsLongPressAction;

    private SwitchPreference mPowerEndCall;

    private SwitchPreference mHomeAnswerCall;
@@ -150,6 +155,9 @@ public class ButtonSettings extends SettingsPreferenceFragment implements 
        // Navigation bar left

        mNavigationBarLeftPref = (SwitchPreference) findPreference(KEY_NAVIGATION_BAR_LEFT);



        // Navigation bar recents long press activity needs custom setup

        mNavigationRecentsLongPressAction = initRecentsLongPressAction(KEY_NAVIGATION_RECENTS_LONG_PRESS);



        HashMap<String, String> prefsToRemove = (HashMap<String, String>)

                getPreferencesToRemove(this, getActivity());

        for (String key : prefsToRemove.keySet()) {
@@ -437,6 +445,68 @@ public class ButtonSettings extends SettingsPreferenceFragment implements 
        return list;

    }



    private ListPreference initRecentsLongPressAction(String key) {

        ListPreference list = (ListPreference) getPreferenceScreen().findPreference(key);

        list.setOnPreferenceChangeListener(this);



        // Read the componentName from Settings.Secure, this is the user's prefered setting

        String componentString = Settings.Secure.getString(getContentResolver(),

                Settings.Secure.RECENTS_LONG_PRESS_ACTIVITY);

        ComponentName targetComponent = null;

        if (componentString == null) {

            list.setSummary(getString(R.string.hardware_keys_action_last_app));

        } else {

            targetComponent = ComponentName.unflattenFromString(componentString);

        }



        // Dyanamically generate the list array, query PackageManager for all Activites that are registered for

        // ACTION_RECENTS_LONG_PRESS

        PackageManager pm = getPackageManager();

        Intent intent = new Intent(Intent.ACTION_RECENTS_LONG_PRESS);

        List<ResolveInfo> recentsActivities = pm.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);

        if (recentsActivities.size() == 0) {

            // No entries available, disable

            list.setSummary(getString(R.string.hardware_keys_action_last_app));

            Settings.Secure.putString(getContentResolver(), Settings.Secure.RECENTS_LONG_PRESS_ACTIVITY, null);

            list.setEnabled(false);

            return list;

        }



        CharSequence[] entries = new CharSequence[recentsActivities.size() + 1];

        CharSequence[] values = new CharSequence[recentsActivities.size() + 1];

        // First entry is always default last app

        entries[0] = getString(R.string.hardware_keys_action_last_app);

        values[0] = "";

        list.setValue(values[0].toString());

        int i = 1;

        for (ResolveInfo info : recentsActivities) {

            try {

                // Use pm.getApplicationInfo for the label, we cannot rely on ResolveInfo that comes back from

                // queryIntentActivities.

                entries[i] = pm.getApplicationInfo(info.activityInfo.packageName, 0).loadLabel(pm);

            } catch (PackageManager.NameNotFoundException e) {

                Log.e(TAG, "Error package not found: " + info.activityInfo.packageName, e);

                // Fallback to package name

                entries[i] = info.activityInfo.packageName;

            }



            // Set the value to the ComponentName that will handle this intent

            ComponentName entryComponent = new ComponentName(info.activityInfo.packageName, info.activityInfo.name);

            values[i] = entryComponent.flattenToString();

            if (targetComponent != null) {

                if (entryComponent.equals(targetComponent)) {

                    // Update the selected value and the preference summary

                    list.setSummary(entries[i]);

                    list.setValue(values[i].toString());

                }

            }

            i++;

        }

        list.setEntries(entries);

        list.setEntryValues(values);

        return list;

    }



    private void handleActionListChange(ListPreference pref, Object newValue, String setting) {

        String value = (String) newValue;

        int index = pref.findIndexOfValue(value);
@@ -482,6 +552,19 @@ public class ButtonSettings extends SettingsPreferenceFragment implements 
            handleActionListChange(mVolumeKeyCursorControl, newValue,

                    Settings.System.VOLUME_KEY_CURSOR_CONTROL);

            return true;

        } else if (preference == mNavigationRecentsLongPressAction) {

            // RecentsLongPressAction is handled differently because it intentionally uses Settings.

            // Settings.System.

            String putString = (String) newValue;

            int index = mNavigationRecentsLongPressAction.findIndexOfValue(putString);

            CharSequence summary = mNavigationRecentsLongPressAction.getEntries()[index];

            // Update the summary

            mNavigationRecentsLongPressAction.setSummary(summary);

            if (putString.length() == 0) {

                putString = null;

            }

            Settings.Secure.putString(getContentResolver(), Settings.Secure.RECENTS_LONG_PRESS_ACTIVITY, putString);

            return true;

        }

        return false;

    }