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

Commit 41eb2f5a authored by yueg's avatar yueg Committed by Copybara-Service
Browse files

Add arrow icon to bubble sound button when Bluetooth is connected. 

It's an indicator that the button triggers another list.

Bug: 67605985
Test: manual
PiperOrigin-RevId: 184042869
Change-Id: I3fea526a322dcc3935af111ebd0916b7c5ffcb24
parent c61a76fc

assets/quantum/res/drawable/quantum_ic_arrow_drop_down_vd_theme_24.xml

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

  ~ Copyright (C) 2017 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="M7,10l5,5 5,-5z"/>

</vector>
 
 No newline at end of file

java/com/android/incallui/NewReturnToCallController.java

+4 −0
Original line number Diff line number Diff line
@@ -275,6 +275,10 @@ public class NewReturnToCallController implements InCallUiListener, Listener, Au 
    actions.add(

        Action.builder()

            .setIconDrawable(context.getDrawable(speakerButtonInfo.icon))

            .setSecondaryIconDrawable(

                speakerButtonInfo.checkable

                    ? null

                    : context.getDrawable(R.drawable.quantum_ic_arrow_drop_down_vd_theme_24))

            .setName(context.getText(speakerButtonInfo.label))

            .setCheckable(speakerButtonInfo.checkable)

            .setChecked(speakerButtonInfo.isChecked)

java/com/android/newbubble/NewBubbleInfo.java

+7 −1
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ public abstract class NewBubbleInfo { 


    public abstract Drawable getIconDrawable();



    @Nullable

    public abstract Drawable getSecondaryIconDrawable();



    @NonNull

    public abstract CharSequence getName();
@@ -100,7 +103,8 @@ public abstract class NewBubbleInfo { 
          .setChecked(action.isChecked())

          .setCheckable(action.isCheckable())

          .setName(action.getName())

          .setIconDrawable(action.getIconDrawable());

          .setIconDrawable(action.getIconDrawable())

          .setSecondaryIconDrawable(action.getSecondaryIconDrawable());

    }



    /** Builder for {@link Action} */
@@ -109,6 +113,8 @@ public abstract class NewBubbleInfo { 


      public abstract Builder setIconDrawable(Drawable iconDrawable);



      public abstract Builder setSecondaryIconDrawable(@Nullable Drawable secondaryIconDrawable);



      public abstract Builder setName(@NonNull CharSequence name);



      public abstract Builder setIntent(@NonNull PendingIntent intent);