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

Merge "Fix difference in icon size for quick QS" into nyc-dev

Browse Source
This commit is contained in:
Jason Monk
2016-03-01 20:10:22 +00:00
committed by Android (Google) Code Review
parent 2f4286b792 ec87a878d3
commit bbcdab6f01
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
View File

@@ -281,7 +281,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback {
} }
} }
private void drawTile(TileRecord r, QSTile.State state) { protected void drawTile(TileRecord r, QSTile.State state) {
r.tileView.onStateChanged(state); r.tileView.onStateChanged(state);
} }

2
packages/SystemUI/src/com/android/systemui/qs/QSTileBaseView.java
View File

@@ -48,7 +48,7 @@ public class QSTileBaseView extends LinearLayout {
// Default to Quick Tile padding, and QSTileView will specify its own padding. // Default to Quick Tile padding, and QSTileView will specify its own padding.
int padding = context.getResources().getDimensionPixelSize(R.dimen.qs_quick_tile_padding); int padding = context.getResources().getDimensionPixelSize(R.dimen.qs_quick_tile_padding);
setPadding(padding, padding, padding, padding); setPadding(0, padding, 0, padding);
setClipChildren(false); setClipChildren(false);
setClipToPadding(false); setClipToPadding(false);
} }

15
packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java
View File

@@ -24,6 +24,8 @@ import android.view.View;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.Space; import android.widget.Space;
import com.android.systemui.R; import com.android.systemui.R;
import com.android.systemui.qs.QSTile.SignalState;
import com.android.systemui.qs.QSTile.State;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@@ -59,6 +61,19 @@ public class QuickQSPanel extends QSPanel {
mHeader = header; mHeader = header;
} }
@Override
protected void drawTile(TileRecord r, State state) {
if (state instanceof SignalState) {
State copy = r.tile.newTileState();
state.copyTo(copy);
// No activity shown in the quick panel.
((SignalState) copy).activityIn = false;
((SignalState) copy).activityOut = false;
state = copy;
}
super.drawTile(r, state);
}
@Override @Override
protected void showDetail(boolean show, Record r) { protected void showDetail(boolean show, Record r) {
// Do nothing, will be handled by the QSPanel. // Do nothing, will be handled by the QSPanel.