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

Commit 01702af7 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Add auto tiles by config" into rvc-dev

parents bea01585 a8d3df46

core/res/res/values/config.xml

+0 −6
Original line number Diff line number Diff line
@@ -3603,12 +3603,6 @@ 
    <!-- Whether the device supports quick settings and its associated APIs -->

    <bool name="config_quickSettingsSupported">true</bool>



    <!-- Comma separated list of extra quick settings tiles to be added to the default set as

         defined in SystemUi (com.android.systemui.R.string.quick_settings_tiles_default).

         Custom tiles (TileService) must be specified as "custom(pkg_name/class_in_package)"

         (without the quotes, both absolute and relative class works). -->

    <string name="config_defaultExtraQuickSettingsTiles" translatable="false"></string>



    <!-- The component name, flattened to a string, for the default autofill service

         to  enabled for an user. This service must be trusted, as it can be activated

         without explicit consent of the user. If no autofill service with the

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -3447,7 +3447,6 @@ 
  <java-symbol type="string" name="etws_primary_default_message_others" />



  <java-symbol type="bool" name="config_quickSettingsSupported" />

  <java-symbol type="string" name="config_defaultExtraQuickSettingsTiles" />



  <java-symbol type="style" name="Theme.DeviceDefault.QuickSettings" />

packages/SystemUI/res/values/config.xml

+7 −0
Original line number Diff line number Diff line
@@ -128,6 +128,13 @@ 
        night,dark,dnd,flashlight,rotation,location

    </string>



    <!-- Tiles to auto add to Quick Settings upon first change of a given secure setting.

         The syntax is setting-name:spec. If the tile is a TileService, the spec should be specified

         as custom(package/class). Relative class name is supported. -->

    <string-array name="config_quickSettingsAutoAdd" translatable="false">

        <item>accessibility_display_inversion_enabled:inversion</item>

    </string-array>



    <!-- Whether or not the RSSI tile is capitalized or not. -->

    <bool name="quick_settings_rssi_tile_capitalization">true</bool>

packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java

+0 −3
Original line number Diff line number Diff line
@@ -454,11 +454,8 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, D 


        final Resources res = context.getResources();

        final String defaultTileList = res.getString(R.string.quick_settings_tiles_default);

        final String extraTileList = res.getString(

                com.android.internal.R.string.config_defaultExtraQuickSettingsTiles);



        tiles.addAll(Arrays.asList(defaultTileList.split(",")));

        tiles.addAll(Arrays.asList(extraTileList.split(",")));

        if (Build.IS_DEBUGGABLE

                && GarbageMonitor.MemoryTile.ADD_TO_DEFAULT_ON_DEBUGGABLE_BUILDS) {

            tiles.add(GarbageMonitor.MemoryTile.TILE_SPEC);

packages/SystemUI/src/com/android/systemui/qs/SecureSetting.java

+8 −0
Original line number Diff line number Diff line
@@ -88,4 +88,12 @@ public abstract class SecureSetting extends ContentObserver implements Listenabl 
    public int getCurrentUser() {

        return mUserId;

    }



    public String getKey() {

        return mSettingName;

    }



    public boolean isListening() {

        return mListening;

    }

}