SystemUI : improve QS Tile and QS Label options [1/2]

Author: 703joko

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java

@@ -539,8 +539,10 @@ public static int getColorForState(Context context, int state) {
             case Tile.STATE_INACTIVE:
                 if (setQsUseNewTint == 1) {
                     return Utils.getColorAttrDefaultColor(context, android.R.attr.textColorPrimary);
-                } else {
+                } else if (qsIconPrimary) {
                     return Utils.getColorAttrDefaultColor(context, android.R.attr.textColorSecondary);
+                } else {
+                    return Utils.getColorAttrDefaultColor(context, android.R.attr.colorPrimary);
                 }
             case Tile.STATE_ACTIVE:
                 if (setQsUseNewTint == 1) {

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileView.java

@@ -28,6 +28,7 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.graphics.Color;
 
 import com.android.settingslib.Utils;
 import com.android.systemui.FontSizeUtils;
@@ -148,15 +149,33 @@ protected void handleStateChanged(QSTile.State state) {
                 mLabel.setTextColor(mColorLabelActive);
                 mSecondLine.setTextColor(mColorLabelActive);
                 mExpandIndicator.setImageTintList(mColorLabelActive);
+            } else if (setQsLabelUseNewTint == 3) {
+                mLabel.setTextColor(Color.WHITE);
+                mSecondLine.setTextColor(Color.WHITE);
+                mExpandIndicator.setImageTintList(mColorLabelActive);
             } else {
                 mLabel.setTextColor(mColorLabelDefault);
                 mSecondLine.setTextColor(mColorLabelDefault);
                 mExpandIndicator.setImageTintList(mColorLabelDefault);
             }
         } else if (state.state == Tile.STATE_INACTIVE) {
-            mLabel.setTextColor(mColorLabelDefault);
-            mSecondLine.setTextColor(mColorLabelDefault);
-            mExpandIndicator.setImageTintList(mColorLabelDefault);
+            if (setQsLabelUseNewTint == 1) {
+                mLabel.setTextColor(mColorLabelActiveRandom);
+                mSecondLine.setTextColor(mColorLabelActiveRandom);
+                mExpandIndicator.setImageTintList(mColorLabelDefault);
+            } else if (setQsLabelUseNewTint == 2) {
+                mLabel.setTextColor(mColorLabelActive);
+                mSecondLine.setTextColor(mColorLabelActive);
+                mExpandIndicator.setImageTintList(mColorLabelActive);
+            } else if (setQsLabelUseNewTint == 3) {
+                mLabel.setTextColor(Color.WHITE);
+                mSecondLine.setTextColor(Color.WHITE);
+                mExpandIndicator.setImageTintList(mColorLabelActive);
+            } else {
+                mLabel.setTextColor(mColorLabelDefault);
+                mSecondLine.setTextColor(mColorLabelDefault);
+                mExpandIndicator.setImageTintList(mColorLabelDefault);
+            }
         }
         boolean dualTarget = DUAL_TARGET_ALLOWED && state.dualTarget;
         mExpandIndicator.setVisibility(View.GONE);