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

resolve merge conflicts of 407c434 to nyc-mr1-dev

Browse Source 
am: 94ad652c7a

* commit '94ad652c7a23d8464e2ac30a9c9de33e16431308':
  Logging for QS settings launch.

Change-Id: Ic10a2f37a79211422758cd533994f1a30bb7e69e
This commit is contained in:
Julia Reynolds
2016-05-12 16:53:38 +00:00
committed by android-build-merger
parent fffe934f00 94ad652c7a
commit fbb267d4f4
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
proto/src/metrics_constants.proto
View File

@@ -2203,6 +2203,9 @@ message MetricsEvent {
// The dialog shown by 3P intent to change current webview implementation. // The dialog shown by 3P intent to change current webview implementation.
WEBVIEW_IMPLEMENTATION = 405; 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 ---- // ---- End N Constants, all N constants go above this line ----
// ------- Begin N App Disambig Shade ----- // ------- Begin N App Disambig Shade -----