Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change the label color to textColorSecondary" into qt-dev

Browse Source 
am: 48e0b6b91b

Change-Id: I99f2c93dc92e1308ccb49c06f980c3d5acdc6a87
This commit is contained in:
Fabian Kozynski
2019-04-16 09:58:17 -07:00
committed by android-build-merger
parent 7b5a0a84e8 48e0b6b91b
commit b81ec3fadc
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/layout/qs_tile_label.xml
View File

@@ -44,8 +44,7 @@
android:padding="0dp" android:padding="0dp"
android:gravity="center" android:gravity="center"
android:ellipsize="marquee" android:ellipsize="marquee"
android:textAppearance="@style/TextAppearance.QS.TileLabel" android:textAppearance="@style/TextAppearance.QS.TileLabel"/>
android:textColor="?android:attr/textColorPrimary"/>
<ImageView android:id="@+id/restricted_padlock" <ImageView android:id="@+id/restricted_padlock"
android:layout_width="@dimen/qs_tile_text_size" android:layout_width="@dimen/qs_tile_text_size"

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

@@ -15,11 +15,10 @@
package com.android.systemui.qs.tileimpl; package com.android.systemui.qs.tileimpl;
import android.content.Context; import android.content.Context;
import android.content.res.ColorStateList;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.service.quicksettings.Tile; import android.service.quicksettings.Tile;
import android.text.SpannableStringBuilder;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.style.ForegroundColorSpan;
import android.view.Gravity; import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@@ -27,6 +26,7 @@ import android.view.ViewGroup;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.android.settingslib.Utils;
import com.android.systemui.FontSizeUtils; import com.android.systemui.FontSizeUtils;
import com.android.systemui.R; import com.android.systemui.R;
import com.android.systemui.plugins.qs.QSIconView; import com.android.systemui.plugins.qs.QSIconView;
@@ -46,6 +46,8 @@ public class QSTileView extends QSTileBaseView {
private ViewGroup mLabelContainer; private ViewGroup mLabelContainer;
private View mExpandIndicator; private View mExpandIndicator;
private View mExpandSpace; private View mExpandSpace;
private ColorStateList mColorLabelDefault;
private ColorStateList mColorLabelUnavailable;
public QSTileView(Context context, QSIconView icon) { public QSTileView(Context context, QSIconView icon) {
this(context, icon, false); this(context, icon, false);
@@ -62,6 +64,11 @@ public class QSTileView extends QSTileBaseView {
createLabel(); createLabel();
setOrientation(VERTICAL); setOrientation(VERTICAL);
setGravity(Gravity.CENTER_HORIZONTAL | Gravity.TOP); setGravity(Gravity.CENTER_HORIZONTAL | Gravity.TOP);
mColorLabelDefault = Utils.getColorAttr(getContext(), android.R.attr.textColorPrimary);
// The text color for unavailable tiles is textColorSecondary, same as secondaryLabel for
// contrast purposes
mColorLabelUnavailable = Utils.getColorAttr(getContext(),
android.R.attr.textColorSecondary);
} }
TextView getLabel() { TextView getLabel() {
@@ -111,12 +118,8 @@ public class QSTileView extends QSTileBaseView {
protected void handleStateChanged(QSTile.State state) { protected void handleStateChanged(QSTile.State state) {
super.handleStateChanged(state); super.handleStateChanged(state);
if (!Objects.equals(mLabel.getText(), state.label) || mState != state.state) { if (!Objects.equals(mLabel.getText(), state.label) || mState != state.state) {
if (state.state == Tile.STATE_UNAVAILABLE) { mLabel.setTextColor(state.state == Tile.STATE_UNAVAILABLE ? mColorLabelUnavailable
int color = QSTileImpl.getColorForState(getContext(), state.state); : mColorLabelDefault);
state.label = new SpannableStringBuilder().append(state.label,
new ForegroundColorSpan(color),
SpannableStringBuilder.SPAN_INCLUSIVE_INCLUSIVE);
}
mState = state.state; mState = state.state;
mLabel.setText(state.label); mLabel.setText(state.label);
} }