resolve merge conflicts of 407c434 to nyc-mr1-dev (94ad652c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,9 @@ import android.view.ViewGroup;
		import android.widget.ImageView;
		import android.widget.TextView;
		import android.widget.Toast;

		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.MetricsProto;
		import com.android.keyguard.KeyguardStatusView;
		import com.android.systemui.FontSizeUtils;
		import com.android.systemui.R;
		@@ -340,6 +343,8 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
		@Override
		public void onClick(View v) {
		if (v == mSettingsButton) {
		MetricsLogger.action(mContext,
		MetricsProto.MetricsEvent.ACTION_QS_EXPANDED_SETTINGS_LAUNCH);
		if (mSettingsButton.isTunerClick()) {
		if (TunerService.isTunerEnabled(mContext)) {
		TunerService.showResetRequest(mContext, new Runnable() {

+3 −0

Original line number	Diff line number	Diff line
		@@ -2203,6 +2203,9 @@ message MetricsEvent {
		// The dialog shown by 3P intent to change current webview implementation.
		WEBVIEW_IMPLEMENTATION = 405;

		// Settings launched from expanded quick settings.
		ACTION_QS_EXPANDED_SETTINGS_LAUNCH = 406;

		// ---- End N Constants, all N constants go above this line ----

		// ------- Begin N App Disambig Shade -----