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

Merge "Bring out your toggles" into nyc-dev

Browse Source
This commit is contained in:
Jason Monk
2016-06-17 17:22:01 +00:00
committed by Android (Google) Code Review
parent 1f0151220e c59249faf5
commit 3aee783837
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,6 +112,11 @@ public class QuickQSPanel extends QSPanel {
}
}
@Override
protected void onTileClick(QSTile<?> tile) {
tile.secondaryClick();
}
@Override
public void onTuningChanged(String key, String newValue) {
// No tunings for you.
@@ -130,7 +135,7 @@ public class QuickQSPanel extends QSPanel {
break;
}
}
super.setTiles(quickTiles, false);
super.setTiles(quickTiles, true);
}
private final Tunable mNumTiles = new Tunable() {

12
packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java
View File

@@ -94,14 +94,6 @@ public class CellularTile extends QSTile<QSTile.SignalState> {
}
}
@Override
protected void handleSecondaryClick() {
boolean dataEnabled = mDataController.isMobileDataSupported()
&& mDataController.isMobileDataEnabled();
MetricsLogger.action(mContext, MetricsEvent.QS_CELLULAR_TOGGLE, !dataEnabled);
mDataController.setMobileDataEnabled(!dataEnabled);
}
@Override
public CharSequence getTileLabel() {
return mContext.getString(R.string.quick_settings_cellular_detail_title);
@@ -152,8 +144,8 @@ public class CellularTile extends QSTile<QSTile.SignalState> {
}
state.contentDescription = state.contentDescription + "," + r.getString(
R.string.accessibility_quick_settings_open_settings, getTileLabel());
state.expandedAccessibilityClassName = Button.class.getName();
state.minimalAccessibilityClassName = Switch.class.getName();
state.minimalAccessibilityClassName = state.expandedAccessibilityClassName
= Button.class.getName();
state.value = mDataController.isMobileDataSupported()
&& mDataController.isMobileDataEnabled();
}