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

Commit 71995301 authored by Pawit Pornkitprasan's avatar Pawit Pornkitprasan
Browse files

QS: fix filtering additional tiles 

- TILES_AVAILABLE should be filtered instead of TILES_DEFAULT
  (broken in Ia92e562318c05a127ddccc99dc7461feaa7ed9cb)
- tiles.remove(tileKey) is not needed since the remove is done by
  iterator.remove()
- Remove TILES_DEFAULT since it is no longer used

Change-Id: I77804f4eb821cab4edfa90d71dfa0b4fae9bcf31
parent 5e85dc9e

core/java/com/android/internal/util/cm/QSConstants.java

+8 −15
Original line number Diff line number Diff line
@@ -50,24 +50,17 @@ public class QSConstants { 
    public static final String TILE_HEADS_UP = "heads_up";

    public static final String TILE_AMBIENT_DISPLAY = "ambient_display";



    // Order matters

    protected static final ArrayList<String> TILES_DEFAULT = new ArrayList<String>();



    static {

        TILES_DEFAULT.add(TILE_WIFI);

        TILES_DEFAULT.add(TILE_BLUETOOTH);

        TILES_DEFAULT.add(TILE_CELLULAR);

        TILES_DEFAULT.add(TILE_AIRPLANE);

        TILES_DEFAULT.add(TILE_ROTATION);

        TILES_DEFAULT.add(TILE_FLASHLIGHT);

        TILES_DEFAULT.add(TILE_LOCATION);

        TILES_DEFAULT.add(TILE_CAST);

    }



    protected static final ArrayList<String> TILES_AVAILABLE = new ArrayList<String>();



    static {

        TILES_AVAILABLE.addAll(TILES_DEFAULT);

        TILES_AVAILABLE.add(TILE_WIFI);

        TILES_AVAILABLE.add(TILE_BLUETOOTH);

        TILES_AVAILABLE.add(TILE_CELLULAR);

        TILES_AVAILABLE.add(TILE_AIRPLANE);

        TILES_AVAILABLE.add(TILE_ROTATION);

        TILES_AVAILABLE.add(TILE_FLASHLIGHT);

        TILES_AVAILABLE.add(TILE_LOCATION);

        TILES_AVAILABLE.add(TILE_CAST);

        TILES_AVAILABLE.add(TILE_INVERSION);

        TILES_AVAILABLE.add(TILE_HOTSPOT);

        TILES_AVAILABLE.add(TILE_NOTIFICATIONS);

core/java/com/android/internal/util/cm/QSUtils.java

+1 −2
Original line number Diff line number Diff line
@@ -105,14 +105,13 @@ public class QSUtils { 
            }

            if (removeTile) {

                iterator.remove();

                tiles.remove(tileKey);

            }

        }

    }



    private static void filterTiles(Context context) {

        if (!sAvailableTilesFiltered) {

            filterTiles(context, QSConstants.TILES_DEFAULT);

            filterTiles(context, QSConstants.TILES_AVAILABLE);

            sAvailableTilesFiltered = true;

        }

    }