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

Commit 2553df8e authored by Anton Potapov's avatar Anton Potapov Committed by Automerger Merge Worker
Browse files

Merge "Increase the height of the bar so the text fits inside the TextViews"... 

Merge "Increase the height of the bar so the text fits inside the TextViews" into tm-qpr-dev am: 5480a55e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21125584



Change-Id: I4bec4471a5531fd251d4da82e1b82e3a7ef11ee9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d392b4fb 5480a55e

packages/SystemUI/res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ 
    <dimen name="qs_tile_margin_horizontal">8dp</dimen>

    <dimen name="qs_tile_margin_vertical">@dimen/qs_tile_margin_horizontal</dimen>

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

    <dimen name="qs_brightness_margin_top">12dp</dimen>

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

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

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

    <dimen name="qqs_layout_padding_bottom">24dp</dimen>
@@ -628,7 +628,7 @@ 
    <dimen name="qs_header_row_min_height">48dp</dimen>



    <dimen name="qs_header_non_clickable_element_height">24dp</dimen>

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

    <dimen name="new_qs_header_non_clickable_element_height">24dp</dimen>



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

    <dimen name="qs_security_footer_height">88dp</dimen>

packages/SystemUI/src/com/android/systemui/battery/BatteryMeterView.java

+3 −5
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import android.util.AttributeSet; 
import android.util.TypedValue;

import android.view.Gravity;

import android.view.LayoutInflater;

import android.view.ViewGroup;

import android.widget.ImageView;

import android.widget.LinearLayout;

import android.widget.TextView;
@@ -347,8 +346,7 @@ public class BatteryMeterView extends LinearLayout implements DarkReceiver { 
                }

                if (mTextColor != 0) mBatteryPercentView.setTextColor(mTextColor);

                updatePercentText();

                addView(mBatteryPercentView,

                        new ViewGroup.LayoutParams(

                addView(mBatteryPercentView, new LayoutParams(

                        LayoutParams.WRAP_CONTENT,

                        LayoutParams.MATCH_PARENT));

            }