diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-05-16 18:43:24 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-16 18:43:30 +0000 |
commit | 441c628a751be4960b6955dfdf4e9557f0fc5220 (patch) | |
tree | 1e3dc3047c56a586146e54b0b514d3562656116d | |
parent | e7539e9be6e446fb97b12af0b3899d8b64197f3c (diff) | |
parent | d5a9b57713953131d78c6a79c8b58edbdf04099b (diff) | |
download | android_packages_apps_Trebuchet-441c628a751be4960b6955dfdf4e9557f0fc5220.tar.gz android_packages_apps_Trebuchet-441c628a751be4960b6955dfdf4e9557f0fc5220.tar.bz2 android_packages_apps_Trebuchet-441c628a751be4960b6955dfdf4e9557f0fc5220.zip |
Merge "Log whether an event happened during landscape mode or not b/38211234" into ub-launcher3-dorval
-rw-r--r-- | protos/launcher_log.proto | 1 | ||||
-rw-r--r-- | src/com/android/launcher3/BaseActivity.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/logging/UserEventDispatcher.java | 7 |
3 files changed, 8 insertions, 2 deletions
diff --git a/protos/launcher_log.proto b/protos/launcher_log.proto index 909a42987..93e09aea8 100644 --- a/protos/launcher_log.proto +++ b/protos/launcher_log.proto @@ -156,4 +156,5 @@ message LauncherEvent { optional int64 elapsed_session_millis = 6; optional bool is_in_multi_window_mode = 7; + optional bool is_in_landscape_mode = 8; } diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java index 410d590ad..08cd955a5 100644 --- a/src/com/android/launcher3/BaseActivity.java +++ b/src/com/android/launcher3/BaseActivity.java @@ -39,7 +39,7 @@ public abstract class BaseActivity extends Activity { public final UserEventDispatcher getUserEventDispatcher() { if (mUserEventDispatcher == null) { mUserEventDispatcher = UserEventDispatcher.newInstance(this, - isInMultiWindowModeCompat()); + mDeviceProfile.isLandscape, isInMultiWindowModeCompat()); } return mUserEventDispatcher; } diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java index 07e99c693..258af1689 100644 --- a/src/com/android/launcher3/logging/UserEventDispatcher.java +++ b/src/com/android/launcher3/logging/UserEventDispatcher.java @@ -62,9 +62,11 @@ public class UserEventDispatcher { private static final boolean IS_VERBOSE = ProviderConfig.IS_DOGFOOD_BUILD && Utilities.isPropertyEnabled(LogConfig.USEREVENT); - public static UserEventDispatcher newInstance(Context context, boolean isInMultiWindowMode) { + public static UserEventDispatcher newInstance(Context context, boolean isInLandscapeMode, + boolean isInMultiWindowMode) { UserEventDispatcher ued = Utilities.getOverrideObject(UserEventDispatcher.class, context.getApplicationContext(), R.string.user_event_dispatcher_class); + ued.mIsInLandscapeMode = isInLandscapeMode; ued.mIsInMultiWindowMode = isInMultiWindowMode; return ued; } @@ -112,6 +114,7 @@ public class UserEventDispatcher { private long mElapsedSessionMillis; private long mActionDurationMillis; private boolean mIsInMultiWindowMode; + private boolean mIsInLandscapeMode; // Used for filling in predictedRank on {@link Target}s. private List<ComponentKey> mPredictedApps; @@ -296,6 +299,7 @@ public class UserEventDispatcher { } public void dispatchUserEvent(LauncherEvent ev, Intent intent) { + ev.isInLandscapeMode = mIsInLandscapeMode; ev.isInMultiWindowMode = mIsInMultiWindowMode; ev.elapsedContainerMillis = SystemClock.uptimeMillis() - mElapsedContainerMillis; ev.elapsedSessionMillis = SystemClock.uptimeMillis() - mElapsedSessionMillis; @@ -315,6 +319,7 @@ public class UserEventDispatcher { ev.elapsedContainerMillis, ev.elapsedSessionMillis, ev.actionDurationMillis); + log += "\n isInLandscapeMode " + ev.isInLandscapeMode; log += "\n isInMultiWindowMode " + ev.isInMultiWindowMode; Log.d(TAG, log); } |