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

Commit 2419737c authored by rob43's avatar rob43 Committed by Gerrit Code Review
Browse files

Tablet powerwidget improvements (2/2) 

Removes six togglesl limit

Requires http://review.cyanogenmod.com/#/c/18404/

Change-Id: I4af1839b2397128fc32d4a77f51262865700d47b
parent 854b615a

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -912,8 +912,6 @@ 
    <string name="pref_flash_mode_title">Flash mode</string>

    <string name="pref_flash_mode_summary">Choose High / Death Ray</string>



    <string name="toggles_not_enough_space">Space is limited to six toggles</string>



    <!-- Power Widget, Haptic feedback #CM -->

    <string name="expanded_haptic_feedback_title">Haptic feedback</string>

    <string name="expanded_haptic_feedback_summary">Enable/disable haptic feedback</string>

src/com/android/settings/cyanogenmod/TabletPowerWidget.java

+2 −7
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class TabletPowerWidget extends SettingsPreferenceFragment 


    private static final String TAG = "TabletPowerWidget";



    private CheckBoxPreference[] mToggles = new CheckBoxPreference[9];

    private CheckBoxPreference[] mToggles = new CheckBoxPreference[TabletPowerWidgetUtil.KEY_TOGGLES.length];



    private static Context mContext;

    private static boolean mValue;
@@ -90,12 +90,7 @@ public class TabletPowerWidget extends SettingsPreferenceFragment 
                Settings.System.putString(mContext.getContentResolver(), Settings.System.WIDGET_BUTTONS_TABLET, mPowerWidgets);

        else{

                mPowerWidgets = mPowerWidgets.substring(0, mPowerWidgets.lastIndexOf("\\|"));

                if(mPowerWidgets.split("\\|").length <= 6)

                Settings.System.putString(mContext.getContentResolver(), Settings.System.WIDGET_BUTTONS_TABLET, mPowerWidgets);

                else{

                        Toast.makeText(getActivity(), R.string.toggles_not_enough_space, Toast.LENGTH_SHORT).show();

                        refreshToggles();

                }

       }

    }