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

Merge "Add live wallpaper metrics to atoms.proto" into qt-dev

Browse Source 
am: 2f6110f832

Change-Id: I44a1191b800ee0d50c68ba4439881eb6379bc899
This commit is contained in:
Hyunyoung Song
2019-05-24 17:35:35 -07:00
committed by android-build-merger
parent 171de819aa 2f6110f832
commit fdc1c61157
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmds/statsd/src/atoms.proto
View File

@@ -269,7 +269,7 @@ message Atom {
AssistGestureProgressReported assist_gesture_progress_reported = 176; AssistGestureProgressReported assist_gesture_progress_reported = 176;
TouchGestureClassified touch_gesture_classified = 177; TouchGestureClassified touch_gesture_classified = 177;
HiddenApiUsed hidden_api_used = 178 [(allow_from_any_uid) = true]; HiddenApiUsed hidden_api_used = 178 [(allow_from_any_uid) = true];
StyleUIChanged style_ui_changed = 179; StyleUIChanged style_ui_changed = 179 [(log_from_module) = "style"];
PrivacyIndicatorsInteracted privacy_indicators_interacted = PrivacyIndicatorsInteracted privacy_indicators_interacted =
180 [(log_from_module) = "permissioncontroller"]; 180 [(log_from_module) = "permissioncontroller"];
AppInstallOnExternalStorageReported app_install_on_external_storage_reported = 181; AppInstallOnExternalStorageReported app_install_on_external_storage_reported = 181;
@@ -2500,6 +2500,8 @@ message StyleUIChanged {
optional int32 launcher_grid = 6; optional int32 launcher_grid = 6;
optional int32 wallpaper_category_hash = 7; optional int32 wallpaper_category_hash = 7;
optional int32 wallpaper_id_hash = 8; optional int32 wallpaper_id_hash = 8;
optional int32 color_preference = 9;
optional android.stats.style.LocationPreference location_preference = 10;
} }
/** /**

12
core/proto/android/stats/style/style_enums.proto
View File

@@ -30,5 +30,17 @@ enum Action {
WALLPAPER_EXPLORE = 8; WALLPAPER_EXPLORE = 8;
WALLPAPER_DOWNLOAD = 9; WALLPAPER_DOWNLOAD = 9;
WALLPAPER_REMOVE = 10; WALLPAPER_REMOVE = 10;
LIVE_WALLPAPER_DOWNLOAD_SUCCESS = 11;
LIVE_WALLPAPER_DOWNLOAD_FAILED = 12;
LIVE_WALLPAPER_DOWNLOAD_CANCELLED = 13;
LIVE_WALLPAPER_DELETE_SUCCESS = 14;
LIVE_WALLPAPER_DELETE_FAILED = 15;
LIVE_WALLPAPER_APPLIED = 16;
} }
enum LocationPreference {
LOCATION_PREFERENCE_UNSPECIFIED = 0;
LOCATION_UNAVAILABLE = 1;
LOCATION_CURRENT = 2;
LOCATION_MANUAL = 3;
}

9
packages/SystemUI/shared/src/com/android/systemui/shared/system/StatsLogCompat.java
View File

@@ -36,13 +36,16 @@ public class StatsLogCompat {
/** /**
* StatsLog.write(StatsLog.STYLE_EVENT, action, colorPackageHash, * StatsLog.write(StatsLog.STYLE_EVENT, action, colorPackageHash,
* fontPackageHash, shapePackageHash, clockPackageHash, * fontPackageHash, shapePackageHash, clockPackageHash,
* launcherGrid, wallpaperCategoryHash, wallpaperIdHash); * launcherGrid, wallpaperCategoryHash, wallpaperIdHash,
* colorPreference, locationPreference);
*/ */
public static void write(int action, int colorPackageHash, public static void write(int action, int colorPackageHash,
int fontPackageHash, int shapePackageHash, int clockPackageHash, int fontPackageHash, int shapePackageHash, int clockPackageHash,
int launcherGrid, int wallpaperCategoryHash, int wallpaperIdHash) { int launcherGrid, int wallpaperCategoryHash, int wallpaperIdHash,
int colorPreference, int locationPreference) {
StatsLog.write(179, action, colorPackageHash, StatsLog.write(179, action, colorPackageHash,
fontPackageHash, shapePackageHash, clockPackageHash, fontPackageHash, shapePackageHash, clockPackageHash,
launcherGrid, wallpaperCategoryHash, wallpaperIdHash); launcherGrid, wallpaperCategoryHash, wallpaperIdHash,
colorPreference, locationPreference);
} }
} }