diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2017-05-16 18:58:07 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-16 18:58:07 +0000 |
commit | ec6a48ce608b5d18a09ce709d6f47803dcf451b0 (patch) | |
tree | 95e7b2a10e1a8015e31194d5497011f3bb51b60b /src | |
parent | f79e54b8acb988203e20505039572dd4a5072793 (diff) | |
parent | 441c628a751be4960b6955dfdf4e9557f0fc5220 (diff) | |
download | android_packages_apps_Trebuchet-ec6a48ce608b5d18a09ce709d6f47803dcf451b0.tar.gz android_packages_apps_Trebuchet-ec6a48ce608b5d18a09ce709d6f47803dcf451b0.tar.bz2 android_packages_apps_Trebuchet-ec6a48ce608b5d18a09ce709d6f47803dcf451b0.zip |
Merge "Log whether an event happened during landscape mode or not b/38211234" into ub-launcher3-dorval
am: 441c628a75
Change-Id: I2101f93fc5dca6e0f216a2cc8b86b976dc052bbe
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/BaseActivity.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/logging/UserEventDispatcher.java | 7 |
2 files changed, 7 insertions, 2 deletions
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 7899846d8..7585be613 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 = FeatureFlags.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); } |