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

Commit 0cf82d3d authored by yueg's avatar yueg Committed by Copybara-Service
Browse files

Rename NUI logging prefix from NUI_ to MAIN_ 

Bug: 72525843
Test: none
PiperOrigin-RevId: 187500135
Change-Id: Iaa73b9355a6b5c299f73fd113eb1f74a3eb47dd4
parent 2e72cdf3

java/com/android/dialer/logging/dialer_impression.proto

+14 −14
Original line number Diff line number Diff line
@@ -659,21 +659,21 @@ message DialerImpression { 
    DUO_CALL_LOG_INVITE_SHOWN = 1326;



    // NUI bottom navigation bar

    NUI_SWITCH_TAB_TO_FAVORITE = 1327;

    NUI_SWITCH_TAB_TO_CALL_LOG = 1328;

    NUI_SWITCH_TAB_TO_CONTACTS = 1329;

    NUI_SWITCH_TAB_TO_VOICEMAIL = 1330;

    MAIN_SWITCH_TAB_TO_FAVORITE = 1327;

    MAIN_SWITCH_TAB_TO_CALL_LOG = 1328;

    MAIN_SWITCH_TAB_TO_CONTACTS = 1329;

    MAIN_SWITCH_TAB_TO_VOICEMAIL = 1330;

    // NUI search

    NUI_TOUCH_DIALPAD_SEARCH_LIST_TO_CLOSE_SEARCH_AND_DIALPAD = 1331;

    NUI_TOUCH_DIALPAD_SEARCH_LIST_TO_HIDE_DIALPAD = 1332;

    NUI_TOUCH_SEARCH_LIST_TO_CLOSE_SEARCH = 1333;

    NUI_TOUCH_SEARCH_LIST_TO_HIDE_KEYBOARD = 1334;

    NUI_PRESS_BACK_BUTTON_TO_CLOSE_SEARCH = 1335;

    NUI_PRESS_BACK_BUTTON_TO_CLOSE_SEARCH_AND_DIALPAD = 1336;

    NUI_PRESS_BACK_BUTTON_TO_HIDE_DIALPAD = 1337;

    NUI_CLICK_SEARCH_BAR = 1338;

    NUI_CLICK_SEARCH_BAR_VOICE_BUTTON = 1339;

    MAIN_TOUCH_DIALPAD_SEARCH_LIST_TO_CLOSE_SEARCH_AND_DIALPAD = 1331;

    MAIN_TOUCH_DIALPAD_SEARCH_LIST_TO_HIDE_DIALPAD = 1332;

    MAIN_TOUCH_SEARCH_LIST_TO_CLOSE_SEARCH = 1333;

    MAIN_TOUCH_SEARCH_LIST_TO_HIDE_KEYBOARD = 1334;

    MAIN_PRESS_BACK_BUTTON_TO_CLOSE_SEARCH = 1335;

    MAIN_PRESS_BACK_BUTTON_TO_CLOSE_SEARCH_AND_DIALPAD = 1336;

    MAIN_PRESS_BACK_BUTTON_TO_HIDE_DIALPAD = 1337;

    MAIN_CLICK_SEARCH_BAR = 1338;

    MAIN_CLICK_SEARCH_BAR_VOICE_BUTTON = 1339;

    // NUI FAB

    NUI_CLICK_FAB_TO_OPEN_DIALPAD = 1340;

    MAIN_CLICK_FAB_TO_OPEN_DIALPAD = 1340;

  }

}

java/com/android/dialer/main/impl/MainSearchController.java

+10 −9
Original line number Diff line number Diff line
@@ -228,21 +228,21 @@ public class MainSearchController implements SearchBarListener { 
      if (TextUtils.isEmpty(getDialpadFragment().getQuery())) {

        Logger.get(mainActivity)

            .logImpression(

                DialerImpression.Type.NUI_TOUCH_DIALPAD_SEARCH_LIST_TO_CLOSE_SEARCH_AND_DIALPAD);

                DialerImpression.Type.MAIN_TOUCH_DIALPAD_SEARCH_LIST_TO_CLOSE_SEARCH_AND_DIALPAD);

        closeSearch(true);

      } else {

        Logger.get(mainActivity)

            .logImpression(DialerImpression.Type.NUI_TOUCH_DIALPAD_SEARCH_LIST_TO_HIDE_DIALPAD);

            .logImpression(DialerImpression.Type.MAIN_TOUCH_DIALPAD_SEARCH_LIST_TO_HIDE_DIALPAD);

        hideDialpad(/* animate=*/ true, /* bottomNavVisible=*/ false);

      }

    } else if (isSearchVisible()) {

      if (TextUtils.isEmpty(toolbar.getQuery())) {

        Logger.get(mainActivity)

            .logImpression(DialerImpression.Type.NUI_TOUCH_SEARCH_LIST_TO_CLOSE_SEARCH);

            .logImpression(DialerImpression.Type.MAIN_TOUCH_SEARCH_LIST_TO_CLOSE_SEARCH);

        closeSearch(true);

      } else {

        Logger.get(mainActivity)

            .logImpression(DialerImpression.Type.NUI_TOUCH_SEARCH_LIST_TO_HIDE_KEYBOARD);

            .logImpression(DialerImpression.Type.MAIN_TOUCH_SEARCH_LIST_TO_HIDE_KEYBOARD);

        toolbar.hideKeyboard();

      }

    }
@@ -257,7 +257,7 @@ public class MainSearchController implements SearchBarListener { 
    if (isDialpadVisible() && !TextUtils.isEmpty(getDialpadFragment().getQuery())) {

      LogUtil.i("MainSearchController.onBackPressed", "Dialpad visible with query");

      Logger.get(mainActivity)

          .logImpression(DialerImpression.Type.NUI_PRESS_BACK_BUTTON_TO_HIDE_DIALPAD);

          .logImpression(DialerImpression.Type.MAIN_PRESS_BACK_BUTTON_TO_HIDE_DIALPAD);

      hideDialpad(/* animate=*/ true, /* bottomNavVisible=*/ false);

      return true;

    } else if (isSearchVisible()) {
@@ -265,8 +265,8 @@ public class MainSearchController implements SearchBarListener { 
      Logger.get(mainActivity)

          .logImpression(

              isDialpadVisible()

                  ? DialerImpression.Type.NUI_PRESS_BACK_BUTTON_TO_CLOSE_SEARCH_AND_DIALPAD

                  : DialerImpression.Type.NUI_PRESS_BACK_BUTTON_TO_CLOSE_SEARCH);

                  ? DialerImpression.Type.MAIN_PRESS_BACK_BUTTON_TO_CLOSE_SEARCH_AND_DIALPAD

                  : DialerImpression.Type.MAIN_PRESS_BACK_BUTTON_TO_CLOSE_SEARCH);

      closeSearch(true);

      return true;

    } else {
@@ -346,7 +346,7 @@ public class MainSearchController implements SearchBarListener { 
  @Override

  public void onSearchBarClicked() {

    LogUtil.enterBlock("MainSearchController.onSearchBarClicked");

    Logger.get(mainActivity).logImpression(DialerImpression.Type.NUI_CLICK_SEARCH_BAR);

    Logger.get(mainActivity).logImpression(DialerImpression.Type.MAIN_CLICK_SEARCH_BAR);

    openSearch(Optional.absent());

  }
@@ -406,7 +406,8 @@ public class MainSearchController implements SearchBarListener { 


  @Override

  public void onVoiceButtonClicked(VoiceSearchResultCallback voiceSearchResultCallback) {

    Logger.get(mainActivity).logImpression(DialerImpression.Type.NUI_CLICK_SEARCH_BAR_VOICE_BUTTON);

    Logger.get(mainActivity)

        .logImpression(DialerImpression.Type.MAIN_CLICK_SEARCH_BAR_VOICE_BUTTON);

    try {

      Intent voiceIntent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH);

      mainActivity.startActivityForResult(voiceIntent, ActivityRequestCodes.DIALTACTS_VOICE_SEARCH);

java/com/android/dialer/main/impl/OldMainActivityPeer.java

+5 −5
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen 
    fab.setOnClickListener(

        v -> {

          Logger.get(mainActivity)

              .logImpression(DialerImpression.Type.NUI_CLICK_FAB_TO_OPEN_DIALPAD);

              .logImpression(DialerImpression.Type.MAIN_CLICK_FAB_TO_OPEN_DIALPAD);

          searchController.showDialpad(true);

        });
@@ -1106,7 +1106,7 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen 
    public void onSpeedDialSelected() {

      LogUtil.enterBlock("MainBottomNavBarBottomNavTabListener.onSpeedDialSelected");

      if (selectedTab != TabIndex.SPEED_DIAL) {

        Logger.get(context).logImpression(DialerImpression.Type.NUI_SWITCH_TAB_TO_FAVORITE);

        Logger.get(context).logImpression(DialerImpression.Type.MAIN_SWITCH_TAB_TO_FAVORITE);

        selectedTab = TabIndex.SPEED_DIAL;

      }

      hideAllFragments();
@@ -1126,7 +1126,7 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen 
    public void onCallLogSelected() {

      LogUtil.enterBlock("MainBottomNavBarBottomNavTabListener.onCallLogSelected");

      if (selectedTab != TabIndex.CALL_LOG) {

        Logger.get(context).logImpression(DialerImpression.Type.NUI_SWITCH_TAB_TO_CALL_LOG);

        Logger.get(context).logImpression(DialerImpression.Type.MAIN_SWITCH_TAB_TO_CALL_LOG);

        selectedTab = TabIndex.CALL_LOG;

      }

      hideAllFragments();
@@ -1146,7 +1146,7 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen 
    public void onContactsSelected() {

      LogUtil.enterBlock("MainBottomNavBarBottomNavTabListener.onContactsSelected");

      if (selectedTab != TabIndex.CONTACTS) {

        Logger.get(context).logImpression(DialerImpression.Type.NUI_SWITCH_TAB_TO_CONTACTS);

        Logger.get(context).logImpression(DialerImpression.Type.MAIN_SWITCH_TAB_TO_CONTACTS);

        selectedTab = TabIndex.CONTACTS;

      }

      hideAllFragments();
@@ -1170,7 +1170,7 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen 
    public void onVoicemailSelected() {

      LogUtil.enterBlock("MainBottomNavBarBottomNavTabListener.onVoicemailSelected");

      if (selectedTab != TabIndex.VOICEMAIL) {

        Logger.get(context).logImpression(DialerImpression.Type.NUI_SWITCH_TAB_TO_VOICEMAIL);

        Logger.get(context).logImpression(DialerImpression.Type.MAIN_SWITCH_TAB_TO_VOICEMAIL);

        selectedTab = TabIndex.VOICEMAIL;

      }

      hideAllFragments();