Android 展讯12 去掉通话菜单中的speaker选项

最新推荐文章于 2024-09-30 16:48:19 发布

juzi_bug

最新推荐文章于 2024-09-30 16:48:19 发布

阅读量978

点赞数 12

分类专栏： Android 文章标签： android

本文链接：https://blog.csdn.net/juzi_bug/article/details/142384327

版权

Android 专栏收录该内容

93 篇文章 0 订阅

订阅专栏

— a/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/CallButtonPresenter.java
+++ b/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/CallButtonPresenter.java
@@ -784,7 +784,7 @@ public class CallButtonPresenter
boolean showUpgradeToRtt = call.canUpgradeToRttCall();
boolean enableUpgradeToRtt = showUpgradeToRtt && callState == DialerCallState.ACTIVE;

inCallButtonUi.showButton(InCallButtonIds.BUTTON_AUDIO, true);

//inCallButtonUi.showButton(InCallButtonIds.BUTTON_AUDIO, true);
inCallButtonUi.showButton(InCallButtonIds.BUTTON_SWAP, showSwap);
/* UNISOC:add for bug1136438 @{ */
DialerCall activeCall = CallList.getInstance().getActiveCall();
diff --git a/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/incall/impl/InCallButtonGridFragment.java b/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/incall/impl/InCallButtonGridFragment.java
index 1128bb65d51…a9fd901e8be 100644
— a/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/incall/impl/InCallButtonGridFragment.java
+++ b/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/incall/impl/InCallButtonGridFragment.java
@@ -37,7 +37,7 @@ public class InCallButtonGridFragment extends Fragment {
// UNISOC : InCallUI Layout Refactor
private static final String PAGE = “page”;

private static final int BUTTON_COUNT = 6;

private static final int BUTTON_COUNT = 5;
public static final int BUTTONS_PER_ROW = 3;

private CheckableLabeledButton[] buttons = new CheckableLabeledButton[BUTTON_COUNT];
@@ -75,10 +75,10 @@ public class InCallButtonGridFragment extends Fragment {

buttons[0] = ((CheckableLabeledButton) view.findViewById(R.id.incall_first_button));
buttons[1] = ((CheckableLabeledButton) view.findViewById(R.id.incall_second_button));

buttons[2] = ((CheckableLabeledButton) view.findViewById(R.id.incall_third_button));
buttons[3] = ((CheckableLabeledButton) view.findViewById(R.id.incall_fourth_button));
buttons[4] = ((CheckableLabeledButton) view.findViewById(R.id.incall_fifth_button));
buttons[5] = ((CheckableLabeledButton) view.findViewById(R.id.incall_sixth_button));

//buttons[2] = ((CheckableLabeledButton) view.findViewById(R.id.incall_third_button));
buttons[2] = ((CheckableLabeledButton) view.findViewById(R.id.incall_fourth_button));
buttons[3] = ((CheckableLabeledButton) view.findViewById(R.id.incall_fifth_button));
buttons[4] = ((CheckableLabeledButton) view.findViewById(R.id.incall_sixth_button));

return view;
}
diff --git a/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/incall/impl/InCallFragment.java b/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/incall/impl/InCallFragment.java
index fd68c89fc55…b8c0004b67d 100644
— a/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/incall/impl/InCallFragment.java
+++ b/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/incall/impl/InCallFragment.java
@@ -270,7 +270,7 @@ public class InCallFragment extends Fragment
Assert.isNotNull(inCallScreenDelegate);

buttonControllers.add(new ButtonController.MuteButtonController(inCallButtonUiDelegate));

buttonControllers.add(new ButtonController.SpeakerButtonController(inCallButtonUiDelegate));

//buttonControllers.add(new ButtonController.SpeakerButtonController(inCallButtonUiDelegate));
buttonControllers.add(new ButtonController.DialpadButtonController(inCallButtonUiDelegate));
buttonControllers.add(new ButtonController.HoldButtonController(inCallButtonUiDelegate));
buttonControllers.add(new ButtonController.AddCallButtonController(inCallButtonUiDelegate));
@@ -565,8 +565,8 @@ public class InCallFragment extends Fragment
@Override
public void setAudioState(CallAudioState audioState) {
LogUtil.i(“InCallFragment.setAudioState”, "audioState: " + audioState);

((SpeakerButtonController) getButtonController(InCallButtonIds.BUTTON_AUDIO))
```
   .setAudioState(audioState);
```

//((SpeakerButtonController) getButtonController(InCallButtonIds.BUTTON_AUDIO))
// .setAudioState(audioState);
getButtonController(InCallButtonIds.BUTTON_MUTE).setChecked(audioState.isMuted());
}

diff --git a/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/incall/impl/res/layout/incall_button_grid.xml b/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/incall/impl/res/layout/incall_button_grid.xml
index 59e99440e63…43e2222d5b7 100644
— a/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/incall/impl/res/layout/incall_button_grid.xml
+++ b/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/incall/impl/res/layout/incall_button_grid.xml
@@ -33,7 +33,7 @@
tools:background=“#FFFF0000”
tools:layout_height=“@dimen/tools_button_height”
tools:layout_width=“@dimen/incall_labeled_button_size”/>

<com.android.incallui.incall.impl.CheckableLabeledButton

@@ -42,7 +42,7 @@
app:incall_labelText=“@string/incall_label_speaker”
tools:background=“#FFFF0000”
tools:layout_height=“@dimen/tools_button_height”

 tools:layout_width="@dimen/incall_labeled_button_size"/>

```
 tools:layout_width="@dimen/incall_labeled_button_size"/>-->
```
<com.android.incallui.incall.impl.CheckableLabeledButton
android:id=“@+id/incall_fourth_button”
android:layout_marginTop=“@dimen/incall_button_vertical_padding”
diff --git a/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/rtt/impl/RttOverflowMenu.java b/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/rtt/impl/RttOverflowMenu.java
index e9f9d0428ea…6c3f69f854f 100644
— a/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/rtt/impl/RttOverflowMenu.java
+++ b/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/rtt/impl/RttOverflowMenu.java
@@ -29,7 +29,7 @@ import com.android.incallui.speakerbuttonlogic.SpeakerButtonInfo;
public class RttOverflowMenu extends PopupWindow implements OnCheckedChangeListener {

private final RttCheckableButton muteButton;

private final RttCheckableButton speakerButton;

//private final RttCheckableButton speakerButton;
private final RttCheckableButton dialpadButton;
private final RttCheckableButton addCallButton;
private final RttCheckableButton swapCallButton;
@@ -52,8 +52,8 @@ public class RttOverflowMenu extends PopupWindow implements OnCheckedChangeListe
setWidth(context.getResources().getDimensionPixelSize(R.dimen.rtt_overflow_menu_width));
muteButton = view.findViewById(R.id.menu_mute);
muteButton.setOnCheckedChangeListener(this);

speakerButton = view.findViewById(R.id.menu_speaker);
speakerButton.setOnCheckedChangeListener(this);

//speakerButton = view.findViewById(R.id.menu_speaker);
//speakerButton.setOnCheckedChangeListener(this);
dialpadButton = view.findViewById(R.id.menu_keypad);
dialpadButton.setOnCheckedChangeListener(this);
addCallButton = view.findViewById(R.id.menu_add_call);
@@ -74,9 +74,7 @@ public class RttOverflowMenu extends PopupWindow implements OnCheckedChangeListe
public void onCheckedChanged(RttCheckableButton button, boolean isChecked) {
if (button == muteButton) {
inCallButtonUiDelegate.muteClicked(isChecked, true);

} else if (button == speakerButton) {

 inCallButtonUiDelegate.toggleSpeakerphone();

} else if (button == dialpadButton) {

}else if (button == dialpadButton) {
inCallButtonUiDelegate.showDialpadClicked(isChecked);
}
}
@@ -88,18 +86,18 @@ public class RttOverflowMenu extends PopupWindow implements OnCheckedChangeListe
void setAudioState(CallAudioState audioState) {
SpeakerButtonInfo info = new SpeakerButtonInfo(audioState);
if (info.nonBluetoothMode) {

 speakerButton.setChecked(info.isChecked);

 speakerButton.setOnClickListener(null);

 speakerButton.setOnCheckedChangeListener(this);

 //speakerButton.setChecked(info.isChecked);

 //speakerButton.setOnClickListener(null);

 //speakerButton.setOnCheckedChangeListener(this);

} else {

```
 speakerButton.setText(info.label);
```

 speakerButton.setCompoundDrawablesWithIntrinsicBounds(info.icon, 0, 0, 0);

```
 speakerButton.setOnClickListener(
```
```
     v -> {
```

       inCallButtonUiDelegate.showAudioRouteSelector();

```
       dismiss();
```
```
     });
```

 speakerButton.setOnCheckedChangeListener(null);

```
 //speakerButton.setText(info.label);
```

 //speakerButton.setCompoundDrawablesWithIntrinsicBounds(info.icon, 0, 0, 0);

```
 //speakerButton.setOnClickListener(
```
```
 //    v -> {
```

 //      inCallButtonUiDelegate.showAudioRouteSelector();

```
 //      dismiss();
```
```
 //    });
```

 //speakerButton.setOnCheckedChangeListener(null);

}
}

diff --git a/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/rtt/impl/res/layout/overflow_menu.xml b/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/rtt/impl/res/layout/overflow_menu.xml
index 0ec36f33eb7…41f5e188aa4 100644
— a/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/rtt/impl/res/layout/overflow_menu.xml
+++ b/vendor/sprd/platform/packages/apps/SprdDialer/java/com/android/incallui/rtt/impl/res/layout/overflow_menu.xml
@@ -28,13 +28,13 @@
android:text=“@string/incall_label_mute”
app:contentDescriptionChecked=“@string/incall_content_description_muted”
app:contentDescriptionUnchecked=“@string/incall_content_description_unmuted”/>

<com.android.incallui.rtt.impl.RttCheckableButton

 app:contentDescriptionUnchecked="@string/incall_content_description_earpiece"/>

```
 app:contentDescriptionUnchecked="@string/incall_content_description_earpiece"/>-->
```
<com.android.incallui.rtt.impl.RttCheckableButton
android:id=“@+id/menu_keypad”
style="@style/RttButton