Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebffe213 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Add IME switcher button logging" into sc-v2-dev am: e6d024b7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16443316

Change-Id: Ib4cd936c0de69266ce6e8bcc9d920723435b9d4e
parents 5c32e894 e6d024b7

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

+1 −0
Original line number Diff line number Diff line
@@ -1252,6 +1252,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
    private void onImeSwitcherClick(View v) {

        mInputMethodManager.showInputMethodPickerFromSystem(

                true /* showAuxiliarySubtypes */, mDisplayId);

        mUiEventLogger.log(KeyButtonView.NavBarButtonEvent.NAVBAR_IME_SWITCHER_BUTTON_TAP);

    };



    private boolean onLongPressBackHome(View v) {

packages/SystemUI/src/com/android/systemui/navigationbar/buttons/KeyButtonView.java

+3 −0
Original line number Diff line number Diff line
@@ -96,6 +96,9 @@ public class KeyButtonView extends ImageView implements ButtonInterface { 
        @UiEvent(doc = "The overview button was pressed in the navigation bar.")

        NAVBAR_OVERVIEW_BUTTON_TAP(535),



        @UiEvent(doc = "The ime switcher button was pressed in the navigation bar.")

        NAVBAR_IME_SWITCHER_BUTTON_TAP(923),



        @UiEvent(doc = "The home button was long-pressed in the navigation bar.")

        NAVBAR_HOME_BUTTON_LONGPRESS(536),

packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java

+6 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ import androidx.annotation.NonNull; 


import com.android.internal.accessibility.dialog.AccessibilityButtonChooserActivity;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.UiEventLogger;

import com.android.internal.policy.ScreenDecorationsUtils;

import com.android.internal.util.ScreenshotHelper;

import com.android.systemui.Dumpable;
@@ -88,6 +89,7 @@ import com.android.systemui.navigationbar.NavigationBar; 
import com.android.systemui.navigationbar.NavigationBarController;

import com.android.systemui.navigationbar.NavigationBarView;

import com.android.systemui.navigationbar.NavigationModeController;

import com.android.systemui.navigationbar.buttons.KeyButtonView;

import com.android.systemui.recents.OverviewProxyService.OverviewProxyListener;

import com.android.systemui.settings.CurrentUserTracker;

import com.android.systemui.shared.recents.IOverviewProxy;
@@ -161,6 +163,7 @@ public class OverviewProxyService extends CurrentUserTracker implements 
    private final Optional<StartingSurface> mStartingSurface;

    private final SmartspaceTransitionController mSmartspaceTransitionController;

    private final Optional<RecentTasks> mRecentTasks;

    private final UiEventLogger mUiEventLogger;



    private Region mActiveNavBarRegion;
@@ -248,6 +251,7 @@ public class OverviewProxyService extends CurrentUserTracker implements 
            mContext.getSystemService(InputMethodManager.class)

                    .showInputMethodPickerFromSystem(true /* showAuxiliarySubtypes */,

                            DEFAULT_DISPLAY);

            mUiEventLogger.log(KeyButtonView.NavBarButtonEvent.NAVBAR_IME_SWITCHER_BUTTON_TAP);

        }



        @Override
@@ -560,6 +564,7 @@ public class OverviewProxyService extends CurrentUserTracker implements 
            ShellTransitions shellTransitions,

            ScreenLifecycle screenLifecycle,

            SmartspaceTransitionController smartspaceTransitionController,

            UiEventLogger uiEventLogger,

            DumpManager dumpManager) {

        super(broadcastDispatcher);

        mContext = context;
@@ -581,6 +586,7 @@ public class OverviewProxyService extends CurrentUserTracker implements 
        mOneHandedOptional = oneHandedOptional;

        mShellTransitions = shellTransitions;

        mRecentTasks = recentTasks;

        mUiEventLogger = uiEventLogger;



        // Assumes device always starts with back button until launcher tells it that it does not

        mNavBarButtonAlpha = 1.0f;