Merge "Resolve a metrics conflict." into oc-dev (8e5c67f5) · Commits · e / os / android_packages_apps_DocumentsUI

src/com/android/documentsui/Metrics.java

+29 −35

Original line number	Diff line number	Diff line
		@@ -164,18 +164,10 @@ public final class Metrics {
		// Do not change or rearrange these values, that will break historical data. Only add to the
		// list.
		// Do not use negative numbers or zero; clearcut only handles positive integers.
		//
		// Next available ID: 112
		private static final int FILEOP_OTHER = 1; // any file operation not listed below
		private static final int FILEOP_COPY_INTRA_PROVIDER = 2; // Copy within a provider
		private static final int FILEOP_COPY_SYSTEM_PROVIDER = 3; // Copy to a system provider.
		private static final int FILEOP_COPY_EXTERNAL_PROVIDER = 4; // Copy to a 3rd-party provider.
		private static final int FILEOP_COMPRESS_INTRA_PROVIDER = 106; // Compres within a provider
		private static final int FILEOP_COMPRESS_SYSTEM_PROVIDER = 107; // Compress to a system provider.
		private static final int FILEOP_COMPRESS_EXTERNAL_PROVIDER = 108; // Compress to a 3rd-party provider.
		private static final int FILEOP_EXTRACT_INTRA_PROVIDER = 109; // Extract within a provider
		private static final int FILEOP_EXTRACT_SYSTEM_PROVIDER = 110; // Extract to a system provider.
		private static final int FILEOP_EXTRACT_EXTERNAL_PROVIDER = 111; // Extract to a 3rd-party provider.
		private static final int FILEOP_MOVE_INTRA_PROVIDER = 5; // Move within a provider.
		private static final int FILEOP_MOVE_SYSTEM_PROVIDER = 6; // Move to a system provider.
		private static final int FILEOP_MOVE_EXTERNAL_PROVIDER = 7; // Move to a 3rd-party provider.
		@@ -186,22 +178,22 @@ public final class Metrics {
		private static final int FILEOP_DELETE_ERROR = 101;
		private static final int FILEOP_MOVE_ERROR = 102;
		private static final int FILEOP_COPY_ERROR = 103;
		private static final int FILEOP_COMPRESS_ERROR = 112;
		private static final int FILEOP_EXTRACT_ERROR = 113;
		private static final int FILEOP_RENAME_ERROR = 104;
		private static final int FILEOP_CREATE_DIR_ERROR = 105;
		private static final int FILEOP_COMPRESS_INTRA_PROVIDER = 106; // Compres within a provider
		private static final int FILEOP_COMPRESS_SYSTEM_PROVIDER = 107; // Compress to a system provider.
		private static final int FILEOP_COMPRESS_EXTERNAL_PROVIDER = 108; // Compress to a 3rd-party provider.
		private static final int FILEOP_EXTRACT_INTRA_PROVIDER = 109; // Extract within a provider
		private static final int FILEOP_EXTRACT_SYSTEM_PROVIDER = 110; // Extract to a system provider.
		private static final int FILEOP_EXTRACT_EXTERNAL_PROVIDER = 111; // Extract to a 3rd-party provider.
		private static final int FILEOP_COMPRESS_ERROR = 112;
		private static final int FILEOP_EXTRACT_ERROR = 113;

		@IntDef(flag = true, value = {
		FILEOP_OTHER,
		FILEOP_COPY_INTRA_PROVIDER,
		FILEOP_COPY_SYSTEM_PROVIDER,
		FILEOP_COPY_EXTERNAL_PROVIDER,
		FILEOP_COMPRESS_INTRA_PROVIDER,
		FILEOP_COMPRESS_SYSTEM_PROVIDER,
		FILEOP_COMPRESS_EXTERNAL_PROVIDER,
		FILEOP_EXTRACT_INTRA_PROVIDER,
		FILEOP_EXTRACT_SYSTEM_PROVIDER,
		FILEOP_EXTRACT_EXTERNAL_PROVIDER,
		FILEOP_MOVE_INTRA_PROVIDER,
		FILEOP_MOVE_SYSTEM_PROVIDER,
		FILEOP_MOVE_EXTERNAL_PROVIDER,
		@@ -209,13 +201,19 @@ public final class Metrics {
		FILEOP_RENAME,
		FILEOP_CREATE_DIR,
		FILEOP_OTHER_ERROR,
		FILEOP_COPY_ERROR,
		FILEOP_COMPRESS_ERROR,
		FILEOP_EXTRACT_ERROR,
		FILEOP_MOVE_ERROR,
		FILEOP_DELETE_ERROR,
		FILEOP_MOVE_ERROR,
		FILEOP_COPY_ERROR,
		FILEOP_RENAME_ERROR,
		FILEOP_CREATE_DIR_ERROR
		FILEOP_CREATE_DIR_ERROR,
		FILEOP_COMPRESS_INTRA_PROVIDER,
		FILEOP_COMPRESS_SYSTEM_PROVIDER,
		FILEOP_COMPRESS_EXTERNAL_PROVIDER,
		FILEOP_EXTRACT_INTRA_PROVIDER,
		FILEOP_EXTRACT_SYSTEM_PROVIDER,
		FILEOP_EXTRACT_EXTERNAL_PROVIDER,
		FILEOP_COMPRESS_ERROR,
		FILEOP_EXTRACT_ERROR
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface FileOp {}
		@@ -225,22 +223,20 @@ public final class Metrics {
		// Do not change or rearrange these values, that will break historical data. Only add to the
		// list.
		// Do not use negative numbers or zero; clearcut only handles positive integers.
		//
		// Next available ID: 7
		private static final int OPERATION_UNKNOWN = 1;
		private static final int OPERATION_COPY = 2;
		private static final int OPERATION_COMPRESS = 5;
		private static final int OPERATION_EXTRACT = 6;
		private static final int OPERATION_MOVE = 3;
		private static final int OPERATION_DELETE = 4;
		private static final int OPERATION_COMPRESS = 5;
		private static final int OPERATION_EXTRACT = 6;

		@IntDef(flag = true, value = {
		OPERATION_UNKNOWN,
		OPERATION_COPY,
		OPERATION_COMPRESS,
		OPERATION_EXTRACT,
		OPERATION_MOVE,
		OPERATION_DELETE
		OPERATION_DELETE,
		OPERATION_COMPRESS,
		OPERATION_EXTRACT
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface MetricsOpType {}
		@@ -292,8 +288,6 @@ public final class Metrics {
		// Do not change or rearrange these values, that will break historical data. Only add to the
		// list.
		// Do not use negative numbers or zero; clearcut only handles positive integers.
		//
		// Next available ID: 29
		public static final int USER_ACTION_OTHER = 1;
		public static final int USER_ACTION_GRID = 2;
		public static final int USER_ACTION_LIST = 3;
		@@ -305,8 +299,6 @@ public final class Metrics {
		public static final int USER_ACTION_HIDE_SIZE = 9;
		public static final int USER_ACTION_SETTINGS = 10;
		public static final int USER_ACTION_COPY_TO = 11;
		public static final int USER_ACTION_COMPRESS = 27;
		public static final int USER_ACTION_EXTRACT_TO = 28;
		public static final int USER_ACTION_MOVE_TO = 12;
		public static final int USER_ACTION_DELETE = 13;
		public static final int USER_ACTION_RENAME = 14;
		@@ -322,7 +314,9 @@ public final class Metrics {
		public static final int USER_ACTION_DRAG_N_DROP = 24;
		public static final int USER_ACTION_DRAG_N_DROP_MULTI_WINDOW = 25;
		public static final int USER_ACTION_CUT_CLIPBOARD = 26;
		public static final int USER_ACTION_VIEW_IN_APPLICATION = 27;
		public static final int USER_ACTION_COMPRESS = 27;
		public static final int USER_ACTION_EXTRACT_TO = 28;
		public static final int USER_ACTION_VIEW_IN_APPLICATION = 29;

		@IntDef(flag = false, value = {
		USER_ACTION_OTHER,
		@@ -336,8 +330,6 @@ public final class Metrics {
		USER_ACTION_HIDE_SIZE,
		USER_ACTION_SETTINGS,
		USER_ACTION_COPY_TO,
		USER_ACTION_COMPRESS,
		USER_ACTION_EXTRACT_TO,
		USER_ACTION_MOVE_TO,
		USER_ACTION_DELETE,
		USER_ACTION_RENAME,
		@@ -353,6 +345,8 @@ public final class Metrics {
		USER_ACTION_DRAG_N_DROP,
		USER_ACTION_DRAG_N_DROP_MULTI_WINDOW,
		USER_ACTION_CUT_CLIPBOARD,
		USER_ACTION_COMPRESS,
		USER_ACTION_EXTRACT_TO,
		USER_ACTION_VIEW_IN_APPLICATION
		})
		@Retention(RetentionPolicy.SOURCE)