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

Commit 804fefae authored by Tom Marshall's avatar Tom Marshall Committed by Gerrit Code Review
Browse files

Add LCD density setting 

Change-Id: I3d55615127cc735ea0443d519520d0cb6cfbfb38
parent 306c3dd9

res/values/cm_strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -1103,6 +1103,13 @@ 
    <string name="navigation_ring_title">Navigation ring targets</string>

    <string name="navigation_ring_message">Tap the edit icon to open the navigation ring for editing.\n\nSelect a target to configure its behavior.\n\nTap the \'\u2713\' icon to save your changes, or \'Restore defaults\' to reset the settings to defaults.</string>



    <!-- Display & Lights screen, setting options for LCD density -->

    <string name="lcd_density">LCD density</string>

    <string name="dialog_title_lcd_density">LCD density</string>

    <string name="lcd_density_value_format">%d DPI</string>

    <string name="lcd_density_default_value_format">%d DPI (default)</string>

    <string name="restarting_ui">Restarting UI\u2026</string>



    <!-- Stylus Icon -->

    <string name="stylus_icon_enabled_title">Show icon when using stylus</string>

    <string name="stylus_icon_enabled_summary">Show the pointer icon when hovering or drawing with the stylus</string>

res/xml/display.xml

+6 −0
Original line number Diff line number Diff line
@@ -108,6 +108,12 @@ 
                android:defaultValue="false"

                settings:advanced="true"/>



        <ListPreference

                android:key="lcd_density"

                android:title="@string/lcd_density"

                android:persistent="false"

                settings:advanced="true" />



        <!-- Cast screen -->

        <PreferenceScreen

                android:key="wifi_display"

src/com/android/settings/DisplaySettings.java

+95 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT; 
import android.app.Activity;

import android.app.ActivityManagerNative;

import android.app.Dialog;

import android.app.IActivityManager;

import android.app.ProgressDialog;

import android.app.admin.DevicePolicyManager;

import android.content.ContentResolver;

import android.content.Context;
@@ -43,11 +45,13 @@ import android.content.SharedPreferences; 
import android.hardware.CmHardwareManager;

import android.hardware.Sensor;

import android.hardware.SensorManager;

import android.os.AsyncTask;

import android.os.Build;

import android.database.ContentObserver;

import android.os.Bundle;

import android.os.Handler;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.preference.ListPreference;

import android.preference.Preference;
@@ -60,6 +64,7 @@ import android.preference.TwoStatePreference; 
import android.provider.SearchIndexableResource;

import android.provider.Settings;

import android.text.TextUtils;

import android.util.DisplayMetrics;

import android.util.Log;



import java.util.ArrayList;
@@ -79,6 +84,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
    private static final String KEY_CATEGORY_INTERFACE = "interface";



    private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";

    private static final String KEY_LCD_DENSITY = "lcd_density";

    private static final String KEY_FONT_SIZE = "font_size";

    private static final String KEY_SCREEN_SAVER = "screensaver";

    private static final String KEY_LIFT_TO_WAKE = "lift_to_wake";
@@ -93,6 +99,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 


    private static final int DLG_GLOBAL_CHANGE_WARNING = 1;



    private ListPreference mLcdDensityPreference;

    private FontDialogPreference mFontSizePref;

    private PreferenceScreen mDisplayRotationPreference;
@@ -162,6 +169,41 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
        updateTimeoutPreferenceDescription(currentTimeout);

        updateDisplayRotationPreferenceDescription();



        mLcdDensityPreference = (ListPreference) findPreference(KEY_LCD_DENSITY);

        if (mLcdDensityPreference != null) {

            int defaultDensity = DisplayMetrics.DENSITY_DEVICE;

            int currentDensity = DisplayMetrics.DENSITY_CURRENT;

            if (currentDensity < 10 || currentDensity >= 1000) {

                // Unsupported value, force default

                currentDensity = defaultDensity;

            }



            int factor = defaultDensity >= 480 ? 40 : 20;

            int minimumDensity = defaultDensity - 4 * factor;

            int currentIndex = -1;

            String[] densityEntries = new String[7];

            String[] densityValues = new String[7];

            for (int idx = 0; idx < 7; ++idx) {

                int val = minimumDensity + factor * idx;

                int valueFormatResId = val == defaultDensity

                        ? R.string.lcd_density_default_value_format

                        : R.string.lcd_density_value_format;



                densityEntries[idx] = getString(valueFormatResId, val);

                densityValues[idx] = Integer.toString(val);

                if (currentDensity == val) {

                    currentIndex = idx;

                }

            }

            mLcdDensityPreference.setEntries(densityEntries);

            mLcdDensityPreference.setEntryValues(densityValues);

            if (currentIndex != -1) {

                mLcdDensityPreference.setValueIndex(currentIndex);

            }

            mLcdDensityPreference.setOnPreferenceChangeListener(this);

            updateLcdDensityPreferenceDescription(currentDensity);

        }



        mFontSizePref = (FontDialogPreference) findPreference(KEY_FONT_SIZE);

        mFontSizePref.setOnPreferenceChangeListener(this);

        mFontSizePref.setOnPreferenceClickListener(this);
@@ -319,6 +361,12 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
        preference.setSummary(summary);

    }



    private void updateLcdDensityPreferenceDescription(int currentDensity) {

        final int summaryResId = currentDensity == DisplayMetrics.DENSITY_DEVICE

                ? R.string.lcd_density_default_value_format : R.string.lcd_density_value_format;

        mLcdDensityPreference.setSummary(getString(summaryResId, currentDensity));

    }



    private void disableUnusableTimeouts(ListPreference screenTimeoutPreference) {

        final DevicePolicyManager dpm =

                (DevicePolicyManager) getActivity().getSystemService(
@@ -449,6 +497,44 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
        }

    }



    private void writeLcdDensityPreference(final Context context, int value) {

        try {

            SystemProperties.set("persist.sys.lcd_density", Integer.toString(value));

        } catch (RuntimeException e) {

            Log.e(TAG, "Unable to save LCD density");

            return;

        }

        final IActivityManager am = ActivityManagerNative.asInterface(

                ServiceManager.checkService("activity"));

        AsyncTask<Void, Void, Void> task = new AsyncTask<Void, Void, Void>() {

            @Override

            protected void onPreExecute() {

                ProgressDialog dialog = new ProgressDialog(context);

                dialog.setMessage(getResources().getString(R.string.restarting_ui));

                dialog.setCancelable(false);

                dialog.setIndeterminate(true);

                dialog.show();

            }

            @Override

            protected Void doInBackground(Void... params) {

                // Give the user a second to see the dialog

                try {

                    Thread.sleep(1000);

                } catch (InterruptedException e) {

                    // Ignore

                }

                // Restart the UI

                try {

                    am.restart();

                } catch (RemoteException e) {

                    Log.e(TAG, "Failed to restart");

                }

                return null;

            }

        };

        task.execute();

    }



    // === Pulse notification light ===



    private void initPulse(PreferenceCategory parent) {
@@ -520,6 +606,15 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
                Log.e(TAG, "could not persist screen timeout setting", e);

            }

        }

        if (KEY_LCD_DENSITY.equals(key)) {

            try {

                int value = Integer.parseInt((String) objValue);

                writeLcdDensityPreference(preference.getContext(), value);

                updateLcdDensityPreferenceDescription(value);

            } catch (NumberFormatException e) {

                Log.e(TAG, "could not persist display density setting", e);

            }

        }

        if (KEY_FONT_SIZE.equals(key)) {

            writeFontSizePreference(objValue);

        }