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

Merge \"Make Recents button work in demo mode\" into nyc-mr1-dev

Browse Source 
am: 9f311f6827

Change-Id: Ife4a233149a90678d2ac55d473ae32a05020666c
This commit is contained in:
Amith Yamasani
2016-07-13 23:15:21 +00:00
committed by android-build-merger
parent c1262d4505 9f311f6827
commit 06da9f8b54
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -318,7 +318,8 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
public void onClick(View v) {
if (v == mSettingsButton) {
MetricsLogger.action(mContext,
MetricsProto.MetricsEvent.ACTION_QS_EXPANDED_SETTINGS_LAUNCH);
mExpanded ? MetricsProto.MetricsEvent.ACTION_QS_EXPANDED_SETTINGS_LAUNCH
: MetricsProto.MetricsEvent.ACTION_QS_COLLAPSED_SETTINGS_LAUNCH);
if (mSettingsButton.isTunerClick()) {
if (TunerService.isTunerEnabled(mContext)) {
TunerService.showResetRequest(mContext, new Runnable() {

3
proto/src/metrics_constants.proto
View File

@@ -2185,6 +2185,9 @@ message MetricsEvent {
// SUBTYPE: false is off, true is on
ACTION_TOGGLE_STORAGE_MANAGER = 489;
// Settings launched from collapsed quick settings.
ACTION_QS_COLLAPSED_SETTINGS_LAUNCH = 490;
// ---- End N-MR1 Constants, all N-MR1 constants go above this line ----
// Add new aosp constants above this line.
// END OF AOSP CONSTANTS