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

Commit 592192f8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Sharesheet - navbar color integration" into qt-dev

parents 9cca9b4e 031afcac

core/java/com/android/internal/app/ChooserActivity.java

+0 −6
Original line number Diff line number Diff line
@@ -2592,10 +2592,8 @@ public class ChooserActivity extends ResolverActivity { 


            if (startType != lastStartType || rowPosition == getContentPreviewRowCount()) {

                row.setBackground(mChooserRowLayer);

                setVertPadding(row, 0, 0);

            } else {

                row.setBackground(null);

                setVertPadding(row, 0, 0);

            }



            int columnCount = holder.getColumnCount();
@@ -2642,10 +2640,6 @@ public class ChooserActivity extends ResolverActivity { 
            }

        }



        private void setVertPadding(ViewGroup row, int top, int bottom) {

            row.setPadding(row.getPaddingLeft(), top, row.getPaddingRight(), bottom);

        }



        int getFirstRowPosition(int row) {

            row -= getContentPreviewRowCount();

core/res/res/values-night/colors.xml

+3 −1
Original line number Diff line number Diff line
@@ -28,4 +28,6 @@ 


    <!-- The background color of a notification card. -->

    <color name="notification_material_background_color">@color/black</color>



    <color name="chooser_row_divider">@color/list_divider_color_dark</color>

</resources>

core/res/res/values-night/themes_device_defaults.xml

+4 −0
Original line number Diff line number Diff line
@@ -71,4 +71,8 @@ easier. 
    <style name="ThemeOverlay.DeviceDefault.Accent.DayNight"

           parent="@style/ThemeOverlay.DeviceDefault.Accent" />



    <style name="Theme.DeviceDefault.Resolver" parent="Theme.DeviceDefault.ResolverCommon">

        <item name="windowLightNavigationBar">false</item>

    </style>



</resources>

core/res/res/values/colors.xml

+1 −2
Original line number Diff line number Diff line
@@ -215,6 +215,5 @@ 
    <!-- Magnifier -->

    <color name="default_magnifier_color_overlay">#00FFFFFF</color>



    <color name="chooser_row_divider">#1f000000</color>



    <color name="chooser_row_divider">@color/list_divider_color_light</color>

</resources>

core/res/res/values/themes_device_defaults.xml

+7 −1
Original line number Diff line number Diff line
@@ -1658,7 +1658,7 @@ easier. 
    <style name="Theme.DeviceDefault.DayNight" parent="Theme.DeviceDefault.Light" />



    <!-- Theme used for the intent picker activity. -->

    <style name="Theme.DeviceDefault.Resolver" parent="Theme.DeviceDefault.DayNight">

    <style name="Theme.DeviceDefault.ResolverCommon" parent="Theme.DeviceDefault.DayNight">

        <item name="windowEnterTransition">@empty</item>

        <item name="windowExitTransition">@empty</item>

        <item name="windowIsTranslucent">true</item>
@@ -1670,6 +1670,12 @@ easier. 
        <item name="colorControlActivated">?attr/colorControlHighlight</item>

        <item name="listPreferredItemPaddingStart">?attr/dialogPreferredPadding</item>

        <item name="listPreferredItemPaddingEnd">?attr/dialogPreferredPadding</item>

        <item name="navigationBarColor">?attr/colorBackgroundFloating</item>

        <item name="navigationBarDividerColor">@color/chooser_row_divider</item>

    </style>



    <style name="Theme.DeviceDefault.Resolver" parent="Theme.DeviceDefault.ResolverCommon">

        <item name="windowLightNavigationBar">true</item>

    </style>



    <!-- @hide DeviceDefault themes for the autofill FillUi -->