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

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

Merge "Get dimens values from resources in pixels"

parents b77466b1 b33db3f6

packages/SystemUI/res/values/dimens.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -506,6 +506,10 @@ 
    <dimen name="qs_header_tile_margin_bottom">18dp</dimen>

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

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

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

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

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

    <!-- The size of a single dot in relation to the whole animation.

         Scaled @dimen/qs_page_indicator-width by .4f.

    -->

    <dimen name="qs_page_indicator_dot_width">6.4dp</dimen>

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

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

    <dimen name="qs_tile_text_size">12sp</dimen>

    <dimen name="qs_tile_text_size">12sp</dimen>

    <dimen name="qs_tile_divider_height">1dp</dimen>

    <dimen name="qs_tile_divider_height">1dp</dimen>

packages/SystemUI/src/com/android/systemui/qs/PageIndicator.java

+5 −8
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ package com.android.systemui.qs; 




import android.content.Context;

import android.content.Context;

import android.content.res.ColorStateList;

import android.content.res.ColorStateList;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.content.res.TypedArray;

import android.graphics.drawable.Animatable2;

import android.graphics.drawable.Animatable2;

import android.graphics.drawable.AnimatedVectorDrawable;

import android.graphics.drawable.AnimatedVectorDrawable;
@@ -31,9 +32,6 @@ public class PageIndicator extends ViewGroup { 




    private static final long ANIMATION_DURATION = 250;

    private static final long ANIMATION_DURATION = 250;





    // The size of a single dot in relation to the whole animation.

    private static final float SINGLE_SCALE = .4f;



    private static final float MINOR_ALPHA = .42f;

    private static final float MINOR_ALPHA = .42f;





    private final ArrayList<Integer> mQueuedPositions = new ArrayList<>();

    private final ArrayList<Integer> mQueuedPositions = new ArrayList<>();
@@ -75,11 +73,10 @@ public class PageIndicator extends ViewGroup { 
        }

        }

        array.recycle();

        array.recycle();





        mPageIndicatorWidth =

        Resources res = context.getResources();

                (int) mContext.getResources().getDimension(R.dimen.qs_page_indicator_width);

        mPageIndicatorWidth = res.getDimensionPixelSize(R.dimen.qs_page_indicator_width);

        mPageIndicatorHeight =

        mPageIndicatorHeight = res.getDimensionPixelSize(R.dimen.qs_page_indicator_height);

                (int) mContext.getResources().getDimension(R.dimen.qs_page_indicator_height);

        mPageDotWidth = res.getDimensionPixelSize(R.dimen.qs_page_indicator_dot_width);

        mPageDotWidth = (int) (mPageIndicatorWidth * SINGLE_SCALE);

    }

    }





    public void setNumPages(int numPages) {

    public void setNumPages(int numPages) {