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

Commit 0e1e6487 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6219949 from 5a846ed2 to qt-qpr3-release 

Change-Id: I0b4ef0099ad0e8519b03d8fbed8e86d06abf6bb9
parents 10b7e2c6 5a846ed2

core/res/res/layout/resolve_grid_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
              android:background="?attr/selectableItemBackgroundBorderless">



    <ImageView android:id="@+id/icon"

               android:layout_width="@dimen/resolver_icon_size"

               android:layout_height="@dimen/resolver_icon_size"

               android:layout_width="@dimen/resolver_grid_icon_size"

               android:layout_height="@dimen/resolver_grid_icon_size"

               android:scaleType="fitCenter" />



    <!-- Size manually tuned to match specs -->

core/res/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -764,6 +764,7 @@ 
    <dimen name="chooser_max_collapsed_height">288dp</dimen>

    <dimen name="chooser_direct_share_label_placeholder_max_width">72dp</dimen>

    <dimen name="resolver_icon_size">32dp</dimen>

    <dimen name="resolver_grid_icon_size">42dp</dimen>

    <dimen name="resolver_button_bar_spacing">8dp</dimen>

    <dimen name="resolver_badge_size">18dp</dimen>

    <dimen name="resolver_icon_margin">16dp</dimen>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -3812,6 +3812,7 @@ 
  <java-symbol type="drawable" name="iconfactory_adaptive_icon_drawable_wrapper"/>

  <java-symbol type="dimen" name="notification_min_height" />

  <java-symbol type="dimen" name="resolver_icon_size"/>

  <java-symbol type="dimen" name="resolver_grid_icon_size"/>

  <java-symbol type="dimen" name="resolver_badge_size"/>

  <java-symbol type="dimen" name="resolver_button_bar_spacing"/>

  <java-symbol type="dimen" name="resolver_icon_margin"/>

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarFacetButton.java

+7 −1
Original line number Diff line number Diff line
@@ -125,13 +125,19 @@ public class CarFacetButton extends LinearLayout { 


    /** Defines the behavior of a button click. */

    protected OnClickListener getButtonClickListener(Intent toSend) {

        return v -> mContext.startActivityAsUser(toSend, UserHandle.CURRENT);

        return v ->  {

            mContext.startActivityAsUser(toSend, UserHandle.CURRENT);

            mContext.sendBroadcastAsUser(

                    new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS), UserHandle.CURRENT);

        };

    }



    /** Defines the behavior of a long click. */

    protected OnLongClickListener getButtonLongClickListener(Intent toSend) {

        return v -> {

            mContext.startActivityAsUser(toSend, UserHandle.CURRENT);

            mContext.sendBroadcastAsUser(

                    new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS), UserHandle.CURRENT);

            return true;

        };

    }

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarNavigationButton.java

+3 −0
Original line number Diff line number Diff line
@@ -112,6 +112,9 @@ public class CarNavigationButton extends com.android.keyguard.AlphaOptimizedImag 
            try {

                if (mBroadcastIntent) {

                    mContext.sendBroadcastAsUser(toSend, UserHandle.CURRENT);

                    mContext.sendBroadcastAsUser(

                            new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS),

                            UserHandle.CURRENT);

                    return;

                }

                mContext.startActivityAsUser(toSend, UserHandle.CURRENT);