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

Commit e4fdb38b authored by Roman Birg's avatar Roman Birg
Browse files

Settings: add a way to reset quick settings tiles 



- Also convert the add tile dialog into a dialog fragment so it persists
  throughout rotations
- remove click sounds from toggle arrange view

Change-Id: Ibe09a6881b499a7157b154833bbf65c1dc12b7e4
Signed-off-by: default avatarRoman Birg <roman@cyngn.com>
parent a2325fb2

res/drawable/ic_qs_reset.xml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (c) 2015 The CyanogenMod 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.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?android:attr/colorControlNormal">



        <path

            android:fillColor="@android:color/white"

            android:pathData="M14 12c0-1.1-.9-2-2-2s-2 .9-2 2 .9 2 2 2 2-.9 2-2zm-2-9c-4.97 0-9 4.03-9 9H0l4 4

4-4H5c0-3.87 3.13-7 7-7s7 3.13 7 7-3.13 7-7 7c-1.51 0-2.91-.49-4.06-1.3l-1.42

1.44C8.04 20.3 9.94 21 12 21c4.97 0 9-4.03 9-9s-4.03-9-9-9z" />



</vector>

res/menu/quick_settings_tiles.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 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.

-->



<menu xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:id="@+id/reset_qs_tiles"

        android:title="@string/settings_reset_button"

        android:icon="@drawable/ic_qs_reset"

        android:showAsAction="collapseActionView|ifRoom"/>

</menu>

res/values/cm_strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1377,4 +1377,6 @@ 
        <![CDATA[<b>Total contributors:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>

                 <b>Total commits:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>

                 <b>Last update:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>



    <string name="quick_settings_reset_message">Reset quick settings tiles?</string>

</resources>

src/com/android/settings/cyanogenmod/qs/DraggableGridView.java

+8 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ public class DraggableGridView extends ViewGroup implements 


        setListeners();

        setChildrenDrawingOrderEnabled(true);

        setSoundEffectsEnabled(false);

        mDefaultColor = mContext.getResources().getColor(R.color.qs_tile_default_background_color);

    }
@@ -130,6 +131,13 @@ public class DraggableGridView extends ViewGroup implements 
        mNewPositions.remove(index);

    };



    public void resetState() {

        removeAllViews();

        mNewPositions.clear();

        mLastTarget = -1;

        mDragged = -1;

    }



    @Override

    protected void onLayout(boolean changed, int l, int t, int r, int b) {

        int width = r - l;

src/com/android/settings/cyanogenmod/qs/QSTiles.java

+160 −66
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
package com.android.settings.cyanogenmod.qs;



import android.app.AlertDialog;

import android.app.Dialog;

import android.app.DialogFragment;

import android.app.Fragment;

import android.content.ContentResolver;

import android.content.Context;
@@ -26,6 +28,9 @@ import android.os.Bundle; 
import android.provider.Settings;

import android.text.TextUtils;

import android.view.LayoutInflater;

import android.view.Menu;

import android.view.MenuInflater;

import android.view.MenuItem;

import android.view.View;

import android.view.ViewGroup;

import android.widget.AdapterView;
@@ -47,7 +52,38 @@ public class QSTiles extends Fragment implements 
    private DraggableGridView mDraggableGridView;

    private View mAddDeleteTile;

    private boolean mDraggingActive;

    private Context mSystemUiContext;



    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        setHasOptionsMenu(true);

    }



    @Override

    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

        super.onCreateOptionsMenu(menu, inflater);

        inflater.inflate(R.menu.quick_settings_tiles, menu);

    }



    @Override

    public void onPrepareOptionsMenu(Menu menu) {

        super.onPrepareOptionsMenu(menu);

        final MenuItem search = menu.findItem(R.id.search);

        if (search != null) {

            search.setVisible(false);

        }

    }



    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        if (item.getItemId() == R.id.reset_qs_tiles) {

            final ConfirmTileResetFragment confirmFrag = new ConfirmTileResetFragment();

            confirmFrag.setTargetFragment(this, 0);

            confirmFrag.show(getFragmentManager(), "confirm_reset");

            return true;

        }

        return super.onOptionsItemSelected(item);

    }



    @Override

    public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -61,13 +97,21 @@ public class QSTiles extends Fragment implements 
    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);



        mSystemUiContext = Utils.createPackageContext(getActivity(), "com.android.systemui");



        ContentResolver resolver = getActivity().getContentResolver();

        String order = Settings.Secure.getString(resolver, Settings.Secure.QS_TILES);

        rebuildTiles();



        mDraggableGridView.setOnRearrangeListener(this);

        mDraggableGridView.setOnItemClickListener(this);

        mDraggableGridView.setUseLargeFirstRow(Settings.Secure.getInt(resolver,

                Settings.Secure.QS_USE_MAIN_TILES, 1) == 1);

    }



    private void rebuildTiles() {

        mDraggableGridView.resetState();

        String order = Settings.Secure.getString(getActivity().getContentResolver(),

                Settings.Secure.QS_TILES);

        if (order == null) {

            order = QSUtils.getDefaultTilesAsString(getActivity());

            Settings.Secure.putString(resolver, Settings.Secure.QS_TILES, order);

            order = resetTiles(getActivity());

        }



        if (!TextUtils.isEmpty(order)) {
@@ -82,11 +126,6 @@ public class QSTiles extends Fragment implements 
        mAddDeleteTile = buildQSTile(QSTileHolder.TILE_ADD_DELETE);

        mDraggableGridView.addView(mAddDeleteTile);

        updateAddDeleteState();



        mDraggableGridView.setOnRearrangeListener(this);

        mDraggableGridView.setOnItemClickListener(this);

        mDraggableGridView.setUseLargeFirstRow(Settings.Secure.getInt(resolver,

                Settings.Secure.QS_USE_MAIN_TILES, 1) == 1);

    }



    @Override
@@ -116,7 +155,9 @@ public class QSTiles extends Fragment implements 
    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {

        // Add / delete button clicked

        if (view == mAddDeleteTile) {

            addTile();

            final ChooseNewTileFragment chooseNewTileFragment = new ChooseNewTileFragment();

            chooseNewTileFragment.setTargetFragment(this, 0);

            chooseNewTileFragment.show(getFragmentManager(), "choose_tile");

        }

    }
@@ -137,60 +178,14 @@ public class QSTiles extends Fragment implements 
        icon.setEnabled(!limitReached);

    }



    private void addTile() {

        ContentResolver resolver = getActivity().getContentResolver();



        // We load the added tiles and compare it to the list of available tiles.

        // We only show the tiles that aren't already on the grid.

        String order = Settings.Secure.getString(resolver, Settings.Secure.QS_TILES);



        List<String> savedTiles = Arrays.asList(order.split(","));



        final List<QSTileHolder> tilesList = new ArrayList<QSTileHolder>();

        for (String tile : QSUtils.getAvailableTiles(getActivity())) {

            // Don't count the already added tiles

            if (!savedTiles.contains(tile)) {

                QSTileHolder holder = QSTileHolder.from(getActivity(), tile);

                if (holder != null) {

                    tilesList.add(holder);

                }

            }

        }



        if (tilesList.isEmpty()) {

            return;

        }



        final DialogInterface.OnClickListener selectionListener =

                new DialogInterface.OnClickListener() {

            @Override

            public void onClick(DialogInterface dialog, int which) {

    private void addTile(String tile) {

        // Add the new tile to the last available position before "Add / Delete" tile

        int newPosition = mDraggableGridView.getChildCount() - 1;

        if (newPosition < 0) newPosition = 0;



                QSTileHolder holder = tilesList.get(which);

                mDraggableGridView.addView(buildQSTile(holder.value), newPosition);

        mDraggableGridView.addView(buildQSTile(tile), newPosition);

        updateAddDeleteState();

        updateSettings();

                dialog.dismiss();

            }

        };



        Collections.sort(tilesList, new Comparator<QSTileHolder>() {

            @Override

            public int compare(QSTileHolder lhs, QSTileHolder rhs) {

                return lhs.name.compareTo(rhs.name);

            }

        });



        final QSListAdapter adapter = new QSListAdapter(getActivity(),

                mSystemUiContext, tilesList);

        new AlertDialog.Builder(getActivity())

                .setTitle(R.string.add_qs)

                .setSingleChoiceItems(adapter, -1, selectionListener)

                .setNegativeButton(R.string.cancel, null)

                .show();

    }



    private void updateSettings() {
@@ -222,7 +217,8 @@ public class QSTiles extends Fragment implements 
        qsTile.setColor(defaultColor);

        if (item.name != null) {

            ImageView icon = (ImageView) qsTile.findViewById(android.R.id.icon);

            Drawable d = Utils.getNamedDrawable(mSystemUiContext, item.resourceName);

            Drawable d = Utils.getNamedDrawable(getSystemUIContext(getActivity()),

                    item.resourceName);

            d.setColorFilter(getResources().getColor(R.color.qs_tile_tint_color),

                    PorterDuff.Mode.SRC_ATOP);

            icon.setImageDrawable(d);
@@ -239,6 +235,13 @@ public class QSTiles extends Fragment implements 
        return qsTile;

    }



    private static String resetTiles(Context context) {

        String tiles = QSUtils.getDefaultTilesAsString(context);

        Settings.Secure.putString(context.getContentResolver(),

                Settings.Secure.QS_TILES, tiles);

        return tiles;

    }



    public static int determineTileCount(Context context) {

        String order = Settings.Secure.getString(context.getContentResolver(),

                Settings.Secure.QS_TILES);
@@ -250,4 +253,95 @@ public class QSTiles extends Fragment implements 
        }

        return order.split(",").length;

    }



    private static Context getSystemUIContext(Context context) {

        return Utils.createPackageContext(context, "com.android.systemui");

    }



    public static class ChooseNewTileFragment extends DialogFragment {

        @Override

        public void onCreate(Bundle savedInstanceState) {

            super.onCreate(savedInstanceState);

            setCancelable(true);

            setShowsDialog(true);

        }



        @Override

        public Dialog onCreateDialog(Bundle savedInstanceState) {

            ContentResolver resolver = getActivity().getContentResolver();



            // We load the added tiles and compare it to the list of available tiles.

            // We only show the tiles that aren't already on the grid.

            String order = Settings.Secure.getString(resolver, Settings.Secure.QS_TILES);



            List<String> savedTiles = Arrays.asList(order.split(","));



            final List<QSTileHolder> tilesList = new ArrayList<QSTileHolder>();

            for (String tile : QSUtils.getAvailableTiles(getActivity())) {

                // Don't count the already added tiles

                if (!savedTiles.contains(tile)) {

                    QSTileHolder holder = QSTileHolder.from(getActivity(), tile);

                    if (holder != null) {

                        tilesList.add(holder);

                    }

                }

            }



            final DialogInterface.OnClickListener selectionListener =

                    new DialogInterface.OnClickListener() {

                        @Override

                        public void onClick(DialogInterface dialog, int which) {

                            dialog.dismiss();

                            final QSTiles tiles = (QSTiles) getTargetFragment();

                            if (tiles != null) {

                                tiles.addTile(tilesList.get(which).value);

                            }

                        }

                    };



            Collections.sort(tilesList, new Comparator<QSTileHolder>() {

                @Override

                public int compare(QSTileHolder lhs, QSTileHolder rhs) {

                    return lhs.name.compareTo(rhs.name);

                }

            });



            final QSListAdapter adapter = new QSListAdapter(getActivity(),

                    getSystemUIContext(getActivity()),

                    tilesList);

            return new AlertDialog.Builder(getActivity())

                    .setTitle(R.string.add_qs)

                    .setSingleChoiceItems(adapter, -1, selectionListener)

                    .setNegativeButton(R.string.cancel, null)

                    .create();

        }

    }



    public static class ConfirmTileResetFragment extends DialogFragment {



        @Override

        public void onCreate(Bundle savedInstanceState) {

            super.onCreate(savedInstanceState);

            setShowsDialog(true);

            setCancelable(true);

        }



        @Override

        public Dialog onCreateDialog(Bundle savedInstanceState) {

            return new AlertDialog.Builder(getActivity())

                    .setMessage(R.string.quick_settings_reset_message)

                    .setNegativeButton(R.string.no, null)

                    .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {

                        @Override

                        public void onClick(DialogInterface dialog, int which) {

                            resetTiles(getActivity());

                            final QSTiles targetFragment = (QSTiles) getTargetFragment();

                            if ((targetFragment != null)) {

                                targetFragment.rebuildTiles();

                            }

                        }

                    })

                    .create();

        }

    }

}