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

Commit e42e643e authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Move the volume panel over 4dp for consistency" into qt-qpr1-dev 

am: 2b8d6233

Change-Id: I22480ed25b49d92b7ec10346ab2b507f73c2cf90
parents 53653683 2b8d6233

packages/SystemUI/res/values/dimens.xml

+1 −9
Original line number Diff line number Diff line
@@ -385,22 +385,16 @@ 
    <!-- The width of the panel that holds the quick settings. -->

    <dimen name="qs_panel_width">@dimen/notification_panel_width</dimen>



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

    <dimen name="volume_dialog_panel_transparent_padding_right">4dp</dimen>



    <dimen name="volume_dialog_panel_transparent_padding">20dp</dimen>



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



    <!-- the amount the volume panel should be offset at the end from the view next to it (or

    the screen edge, in portrait-->

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



    <dimen name="volume_dialog_panel_width">64dp</dimen>



    <dimen name="volume_dialog_slider_height">116dp</dimen>



    <dimen name="volume_dialog_row_height">252dp</dimen>



    <dimen name="volume_dialog_ringer_size">64dp</dimen>



    <dimen name="volume_dialog_ringer_icon_padding">20dp</dimen>
@@ -417,8 +411,6 @@ 


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



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



    <dimen name="volume_dialog_elevation">9dp</dimen>



    <dimen name="volume_tool_tip_right_margin">76dp</dimen>

packages/SystemUI/tools/lint/baseline.xml

+0 −33
Original line number Diff line number Diff line
@@ -2683,39 +2683,6 @@ 
            column="12"/>

    </issue>













    <issue













        id="UnusedResources"













        message="The resource `R.dimen.volume_dialog_base_margin` appears to be unused"













        errorLine1="    &lt;dimen name=&quot;volume_dialog_base_margin&quot;>8dp&lt;/dimen>"













        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">













        <location













            file="res/values/dimens.xml"













            line="308"













            column="12"/>













    </issue>

























    <issue













        id="UnusedResources"













        message="The resource `R.dimen.volume_dialog_row_height` appears to be unused"













        errorLine1="    &lt;dimen name=&quot;volume_dialog_row_height&quot;>252dp&lt;/dimen>"













        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">













        <location













            file="res/values/dimens.xml"













            line="314"













            column="12"/>













    </issue>

























    <issue













        id="UnusedResources"













        message="The resource `R.dimen.volume_dialog_settings_icon_size` appears to be unused"













        errorLine1="    &lt;dimen name=&quot;volume_dialog_settings_icon_size&quot;>16dp&lt;/dimen>"













        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">













        <location













            file="res/values/dimens.xml"













            line="328"













            column="12"/>













    </issue>



























    <issue















        id="UnusedResources"















        message="The resource `R.dimen.carrier_label_height` appears to be unused"