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

Commit de05a180 authored by Jason Monk's avatar Jason Monk
Browse files

Always show tiles in the new QS 

Change-Id: I536d19206fd03194b76b01a0f159f0a241d19c8b
parent 339e884b

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

+8 −0
Original line number Diff line number Diff line
@@ -19,12 +19,14 @@ package com.android.systemui.qs; 
import android.animation.Animator;

import android.animation.Animator.AnimatorListener;

import android.animation.AnimatorListenerAdapter;

import android.app.ActivityManager;

import android.content.Context;

import android.content.Intent;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.os.Handler;

import android.os.Message;

import android.provider.Settings;

import android.util.AttributeSet;

import android.view.LayoutInflater;

import android.view.View;
@@ -34,6 +36,7 @@ import android.widget.FrameLayout; 
import android.widget.ImageView;

import android.widget.LinearLayout;

import android.widget.TextView;



import com.android.internal.logging.MetricsLogger;

import com.android.systemui.FontSizeUtils;

import com.android.systemui.R;
@@ -620,4 +623,9 @@ public class QSPanel extends FrameLayout implements Tunable { 
        int getOffsetTop(TileRecord tile);

        void updateResources();

    }



    public static boolean isTheNewQS(Context context) {

        return Settings.Secure.getIntForUser(context.getContentResolver(), QS_THE_NEW_QS,

                ActivityManager.getCurrentUser(), 0) != 0;

    }

}

packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.internal.logging.MetricsLogger; 
import com.android.systemui.R;

import com.android.systemui.qs.QSDetailItems;

import com.android.systemui.qs.QSDetailItems.Item;

import com.android.systemui.qs.QSPanel;

import com.android.systemui.qs.QSTile;

import com.android.systemui.statusbar.policy.CastController;

import com.android.systemui.statusbar.policy.CastController.CastDevice;
@@ -93,7 +94,7 @@ public class CastTile extends QSTile<QSTile.BooleanState> { 
    @Override

    protected void handleUpdateState(BooleanState state, Object arg) {

        state.visible = !mKeyguard.isSecure() || !mKeyguard.isShowing()

                || mKeyguard.canSkipBouncer();

                || mKeyguard.canSkipBouncer() || QSPanel.isTheNewQS(mContext);

        state.label = mContext.getString(R.string.quick_settings_cast_title);

        state.value = false;

        state.autoMirrorDrawable = false;

packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.provider.Settings.Secure; 
import com.android.internal.logging.MetricsLogger;

import com.android.systemui.Prefs;

import com.android.systemui.R;

import com.android.systemui.qs.QSPanel;

import com.android.systemui.qs.QSTile;

import com.android.systemui.qs.SecureSetting;

import com.android.systemui.qs.UsageTracker;
@@ -110,7 +111,7 @@ public class ColorInversionTile extends QSTile<QSTile.BooleanState> { 
    protected void handleUpdateState(BooleanState state, Object arg) {

        final int value = arg instanceof Integer ? (Integer) arg : mSetting.getValue();

        final boolean enabled = value != 0;

        state.visible = enabled || mUsageTracker.isRecentlyUsed();

        state.visible = enabled || mUsageTracker.isRecentlyUsed() || QSPanel.isTheNewQS(mContext);

        state.value = enabled;

        state.label = mContext.getString(R.string.quick_settings_inversion_label);

        state.icon = enabled ? mEnable : mDisable;

packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Intent; 
import com.android.internal.logging.MetricsLogger;

import com.android.systemui.Prefs;

import com.android.systemui.R;

import com.android.systemui.qs.QSPanel;

import com.android.systemui.qs.QSTile;

import com.android.systemui.qs.UsageTracker;

import com.android.systemui.statusbar.policy.HotspotController;
@@ -88,7 +89,8 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> { 


    @Override

    protected void handleUpdateState(BooleanState state, Object arg) {

        state.visible = mController.isHotspotSupported() && mUsageTracker.isRecentlyUsed();

        state.visible = (mController.isHotspotSupported() && mUsageTracker.isRecentlyUsed())

                || QSPanel.isTheNewQS(mContext);

        state.label = mContext.getString(R.string.quick_settings_hotspot_label);



        if (arg instanceof Boolean) {

packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.qs.tiles; 


import com.android.internal.logging.MetricsLogger;

import com.android.systemui.R;

import com.android.systemui.qs.QSPanel;

import com.android.systemui.qs.QSTile;

import com.android.systemui.statusbar.policy.KeyguardMonitor;

import com.android.systemui.statusbar.policy.LocationController;
@@ -73,7 +74,7 @@ public class LocationTile extends QSTile<QSTile.BooleanState> { 
        // Work around for bug 15916487: don't show location tile on top of lock screen. After the

        // bug is fixed, this should be reverted to only hiding it on secure lock screens:

        // state.visible = !(mKeyguard.isSecure() && mKeyguard.isShowing());

        state.visible = !mKeyguard.isShowing();

        state.visible = !mKeyguard.isShowing() || QSPanel.isTheNewQS(mContext);

        state.value = locationEnabled;

        if (locationEnabled) {

            state.icon = mEnable;