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

Commit c6cbb12d authored by wangqi's avatar wangqi Committed by Copybara-Service
Browse files

Add audio select menu. 

Bug: 67596257
Test: manual
PiperOrigin-RevId: 189204691
Change-Id: I9ecd36ce1c27072dea4ae87beeecd4565bf05378
parent 6b576be4

assets/quantum/res/drawable/quantum_ic_bluetooth_audio_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="M14.24,12.01l2.32,2.32c0.28,-0.72 0.44,-1.51 0.44,-2.33 0,-0.82 -0.16,-1.59 -0.43,-2.31l-2.33,2.32zM19.53,6.71l-1.26,1.26c0.63,1.21 0.98,2.57 0.98,4.02s-0.36,2.82 -0.98,4.02l1.2,1.2c0.97,-1.54 1.54,-3.36 1.54,-5.31 -0.01,-1.89 -0.55,-3.67 -1.48,-5.19zM15.71,7.71L10,2L9,2v7.59L4.41,5 3,6.41 8.59,12 3,17.59 4.41,19 9,14.41L9,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM11,5.83l1.88,1.88L11,9.59L11,5.83zM12.88,16.29L11,18.17v-3.76l1.88,1.88z"/>

</vector>

assets/quantum/res/drawable/quantum_ic_headset_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,1c-4.97,0 -9,4.03 -9,9v7c0,1.66 1.34,3 3,3h3v-8H5v-2c0,-3.87 3.13,-7 7,-7s7,3.13 7,7v2h-4v8h3c1.66,0 3,-1.34 3,-3v-7c0,-4.97 -4.03,-9 -9,-9z"/>

</vector>

assets/quantum/res/drawable/quantum_ic_phone_in_talk_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,-1L4,3c-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,-1zM19,12h2c0,-4.97 -4.03,-9 -9,-9v2c3.87,0 7,3.13 7,7zM15,12h2c0,-2.76 -2.24,-5 -5,-5v2c1.66,0 3,1.34 3,3z"/>

</vector>

java/com/android/incallui/commontheme/res/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -21,4 +21,6 @@ 


  <!-- Background color for spam. This color must match one of background_colors_dark in call UI. -->

  <color name="incall_call_spam_background_color">@color/blocked_contact_background</color>



  <color name="divider_line_color">#D8D8D8</color>

</resources>

java/com/android/incallui/rtt/impl/AudioSelectMenu.java

0 → 100644
+83 −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

 */



package com.android.incallui.rtt.impl;



import android.content.Context;

import android.content.res.ColorStateList;

import android.graphics.PorterDuff.Mode;

import android.telecom.CallAudioState;

import android.view.View;

import android.widget.PopupWindow;

import com.android.incallui.incall.protocol.InCallButtonUiDelegate;



/** Audio select menu for RTT call. */

public class AudioSelectMenu extends PopupWindow {



  private final InCallButtonUiDelegate inCallButtonUiDelegate;

  private final Context context;

  private final OnButtonClickListener onButtonClickListener;



  interface OnButtonClickListener {

    void onBackPressed();

  }



  AudioSelectMenu(

      Context context,

      InCallButtonUiDelegate inCallButtonUiDelegate,

      OnButtonClickListener onButtonClickListener) {

    super(context);

    this.context = context;

    this.inCallButtonUiDelegate = inCallButtonUiDelegate;

    this.onButtonClickListener = onButtonClickListener;

    View view = View.inflate(context, R.layout.audio_route, null);

    setContentView(view);

    setOnDismissListener(this::dismiss);

    setFocusable(true);

    setWidth(context.getResources().getDimensionPixelSize(R.dimen.rtt_overflow_menu_width));

    view.findViewById(R.id.audioroute_back)

        .setOnClickListener(

            v -> {

              dismiss();

              this.onButtonClickListener.onBackPressed();

            });

    CallAudioState audioState = inCallButtonUiDelegate.getCurrentAudioState();

    initItem(

        view.findViewById(R.id.audioroute_bluetooth), CallAudioState.ROUTE_BLUETOOTH, audioState);

    initItem(view.findViewById(R.id.audioroute_speaker), CallAudioState.ROUTE_SPEAKER, audioState);

    initItem(

        view.findViewById(R.id.audioroute_headset), CallAudioState.ROUTE_WIRED_HEADSET, audioState);

    initItem(

        view.findViewById(R.id.audioroute_earpiece), CallAudioState.ROUTE_EARPIECE, audioState);

  }



  private void initItem(RttCheckableButton item, final int itemRoute, CallAudioState audioState) {

    int selectedColor =

        context.getColor(com.android.incallui.audioroute.R.color.dialer_theme_color);

    if ((audioState.getSupportedRouteMask() & itemRoute) == 0) {

      item.setVisibility(View.GONE);

    } else if (audioState.getRoute() == itemRoute) {

      item.setTextColor(selectedColor);

      item.setCompoundDrawableTintList(ColorStateList.valueOf(selectedColor));

      item.setCompoundDrawableTintMode(Mode.SRC_ATOP);

    }

    item.setOnClickListener(

        (v) -> {

          dismiss();

          inCallButtonUiDelegate.setAudioRoute(itemRoute);

        });

  }

}