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

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

Merge "Changed the default time for prototype color adaptation to 1500 ms"

parents 90bfeeef d1d45dd3

packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarTransitionsController.java

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.statusbar.phone;



import static com.android.systemui.statusbar.phone.NavBarTintController.DEFAULT_COLOR_ADAPT_TRANSITION_TIME;

import static com.android.systemui.statusbar.phone.NavBarTintController.MIN_COLOR_ADAPT_TRANSITION_TIME;

import static com.android.systemui.statusbar.phone.NavBarTintController.NAV_COLOR_TRANSITION_TIME_SETTING;
@@ -161,7 +162,7 @@ public class LightBarTransitionsController implements Dumpable, Callbacks, 
    public long getTintAnimationDuration() {

        if (NavBarTintController.isEnabled(mContext)) {

            return Math.max(Settings.Global.getInt(mContext.getContentResolver(),

                    NAV_COLOR_TRANSITION_TIME_SETTING, DEFAULT_TINT_ANIMATION_DURATION),

                    NAV_COLOR_TRANSITION_TIME_SETTING, DEFAULT_COLOR_ADAPT_TRANSITION_TIME),

                    MIN_COLOR_ADAPT_TRANSITION_TIME);

        }

        return DEFAULT_TINT_ANIMATION_DURATION;

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavBarTintController.java

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.view.SurfaceControl; 
public class NavBarTintController {

    public static final String NAV_COLOR_TRANSITION_TIME_SETTING = "navbar_color_adapt_transition";

    public static final int MIN_COLOR_ADAPT_TRANSITION_TIME = 400;

    public static final int DEFAULT_COLOR_ADAPT_TRANSITION_TIME = 1500;



    private final HandlerThread mColorAdaptHandlerThread = new HandlerThread("ColorExtractThread");

    private Handler mColorAdaptionHandler;