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

Commit 9bd89a30 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I6ef6593a,Iaa73b935 

* changes:
  Implement overflow menu for RTT call.
  Rename NUI logging prefix from NUI_ to MAIN_
parents 2e72cdf3 604e481f

assets/quantum/res/drawable/quantum_ic_add_call_vd_theme_24.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2018 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

    android:tint="?attr/colorControlNormal">

  <path

      android:fillColor="@android:color/white"

      android:pathData="M20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57 -0.35,-0.11 -0.74,-0.03 -1.02,0.24l-2.2,2.2c-2.83,-1.44 -5.15,-3.75 -6.59,-6.59l2.2,-2.21c0.28,-0.26 0.36,-0.65 0.25,-1C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1 0,9.39 7.61,17 17,17 0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1zM21,6h-3V3h-2v3h-3v2h3v3h2V8h3z"/>

</vector>
 
 No newline at end of file

assets/quantum/res/drawable/quantum_ic_dialpad_vd_theme_24.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2018 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

    android:tint="?attr/colorControlNormal">

  <path

      android:fillColor="@android:color/white"

      android:pathData="M12,19c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM6,1c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM6,7c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM6,13c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,13c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,13c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,7c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,7c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,1c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>

</vector>
 
 No newline at end of file

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();