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

Commit a063331e authored by Adarsh Fernando's avatar Adarsh Fernando Committed by android-build-merger
Browse files

Redirect for AS error message regarding SDK license agreements am: 5fb0843a... 

Redirect for AS error message regarding SDK license agreements am: 5fb0843a am: fc329098 am: 79cb94b8
am: 779adf88

* commit '779adf88':
  Bug: 28875393 Bug: 28879732

Change-Id: I0e09b58fe2627f0858d44eb52807726c03f32760
parents a9880dcb 779adf88

packages/SystemUI/res/values/config.xml

+5 −1
Original line number Diff line number Diff line
@@ -103,6 +103,11 @@ 
        wifi,cell,battery,dnd,flashlight,rotation,bt,airplane,location

    </string>



    <!-- Tiles native to System UI. Order should match "quick_settings_tiles_default" -->

    <string name="quick_settings_tiles_stock" translatable="false">

        wifi,cell,battery,dnd,flashlight,rotation,bt,airplane,location,hotspot,inversion,saver,work,cast,night

    </string>



    <!-- The tiles to display in QuickSettings -->

    <string name="quick_settings_tiles" translatable="false">default</string>
@@ -265,4 +270,3 @@ 
    <bool name="quick_settings_show_date">false</bool>



</resources>

packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java

+8 −2
Original line number Diff line number Diff line
@@ -55,8 +55,7 @@ public class TileQueryHelper { 
    }



    private void addSystemTiles(final QSTileHost host) {

        String possible = mContext.getString(R.string.quick_settings_tiles_default)

                + ",hotspot,inversion,saver,work,cast,night";

        String possible = mContext.getString(R.string.quick_settings_tiles_stock);

        String[] possibleTiles = possible.split(",");

        final Handler qsHandler = new Handler(host.getLooper());

        final Handler mainHandler = new Handler(Looper.getMainLooper());
@@ -141,9 +140,16 @@ public class TileQueryHelper { 
            PackageManager pm = mContext.getPackageManager();

            List<ResolveInfo> services = pm.queryIntentServicesAsUser(

                    new Intent(TileService.ACTION_QS_TILE), 0, ActivityManager.getCurrentUser());

            String stockTiles = mContext.getString(R.string.quick_settings_tiles_stock);

            for (ResolveInfo info : services) {

                String packageName = info.serviceInfo.packageName;

                ComponentName componentName = new ComponentName(packageName, info.serviceInfo.name);



                // Don't include apps that are a part of the default tile set.

                if (stockTiles.contains(componentName.flattenToString())) {

                    continue;

                }



                final CharSequence appLabel = info.serviceInfo.applicationInfo.loadLabel(pm);

                String spec = CustomTile.toSpec(componentName);

                State state = getState(params[0], spec);