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

am 300a1416: Merge changes from topic \'tron\' into mnc-dev

Browse Source 
* commit '300a141650dc17d2a893b55133c62b0353d2a9bb':
  instrument notification longpress controls
  induct a bunch of new logging categories.
This commit is contained in:
Chris Wren
2015-06-10 14:54:35 +00:00
committed by Android Git Automerger
parent 9cf2547d8b 300a141650
commit 7f588404c5
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/com/android/internal/logging/MetricsConstants.java
View File

@@ -208,6 +208,27 @@ public interface MetricsConstants {
public static final int APPLICATIONS_USAGE_ACCESS_DETAIL = 183;
public static final int APPLICATIONS_HIGH_POWER_APPS = 184;
public static final int FUELGAUGE_HIGH_POWER_DETAILS = 185;
public static final int ACTION_LS_UNLOCK = 186;
public static final int ACTION_LS_SHADE = 187;
public static final int ACTION_LS_HINT = 188;
public static final int ACTION_LS_CAMERA = 189;
public static final int ACTION_LS_DIALER = 190;
public static final int ACTION_LS_LOCK = 191;
public static final int ACTION_LS_NOTE = 192;
public static final int ACTION_LS_QS = 193;
public static final int ACTION_SHADE_QS_PULL = 194;
public static final int ACTION_SHADE_QS_TAP = 195;
public static final int LOCKSCREEN = 196;
public static final int BOUNCER = 197;
public static final int SCREEN = 198;
public static final int NOTIFICATION_ALERT = 199;
public static final int ACTION_EMERGENCY_CALL = 200;
public static final int APPLICATIONS_MANAGE_ASSIST = 201;
public static final int PROCESS_STATS_SUMMARY = 202;
public static final int ACTION_ROTATION_LOCK = 203;
public static final int ACTION_NOTE_CONTROLS = 204;
public static final int ACTION_NOTE_INFO = 205;
public static final int ACTION_APP_NOTE_SETTINGS = 206;
//aliases
public static final int DEVICEINFO_STORAGE = DEVICEINFO_MEMORY;

1
core/java/com/android/internal/logging/MetricsLogger.java
View File

@@ -27,7 +27,6 @@ import android.view.View;
*/
public class MetricsLogger implements MetricsConstants {
// Temporary constants go here, to await migration to MetricsConstants.
public static final int ACTION_EMERGENCY_CALL = 200;
public static void visible(Context context, int category) throws IllegalArgumentException {
if (Build.IS_DEBUGGABLE && category == VIEW_UNKNOWN) {

4
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -82,6 +82,7 @@ import android.widget.RemoteViews;
import android.widget.TextView;
import android.widget.Toast;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.statusbar.IStatusBarService;
import com.android.internal.statusbar.StatusBarIcon;
import com.android.internal.statusbar.StatusBarIconList;
@@ -909,6 +910,7 @@ public abstract class BaseStatusBar extends SystemUI implements
final int appUidF = appUid;
settingsButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
MetricsLogger.action(mContext, MetricsLogger.ACTION_NOTE_INFO);
startAppNotificationSettingsActivity(pkg, appUidF);
}
});
@@ -929,6 +931,7 @@ public abstract class BaseStatusBar extends SystemUI implements
.setClassName(pkg, infos.get(0).activityInfo.name);
appSettingsButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
MetricsLogger.action(mContext, MetricsLogger.ACTION_APP_NOTE_SETTINGS);
startAppOwnNotificationSettingsActivity(appSettingsLaunchIntent,
sbn.getId(),
sbn.getTag(),
@@ -975,6 +978,7 @@ public abstract class BaseStatusBar extends SystemUI implements
return false;
}
MetricsLogger.action(mContext, MetricsLogger.ACTION_NOTE_CONTROLS);
guts.setVisibility(View.VISIBLE);
final double horz = Math.max(guts.getWidth() - x, x);
final double vert = Math.max(guts.getActualHeight() - y, y);