Merge "Bring out your toggles" into nyc-dev (3aee7838) · Commits · e / os / android_frameworks_base

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -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() {

+2 −10

Original line number	Diff line number	Diff line
		@@ -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();
		}