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

Commit 6b4c4d1d authored by narinder Rana's avatar narinder Rana
Browse files

find device notch and update clock location : bug fixed

parent a34c47d2
Loading
Loading
Loading
Loading
+25 −11
Original line number Diff line number Diff line
@@ -18,12 +18,21 @@ package com.android.systemui.statusbar.phone;

import android.util.Log;
import android.view.View;

import com.android.systemui.Dependency;
import com.android.systemui.R;
import com.android.systemui.statusbar.phone.StatusBarIconController;
import com.android.systemui.statusbar.policy.Clock;

import com.android.systemui.tuner.TunerService;
import android.util.DisplayMetrics;

import android.util.Pair;
import android.view.View;
import android.view.WindowInsets;
import android.view.DisplayCutout;
import android.graphics.Rect;
import java.util.List;
import com.android.systemui.util.leak.RotationUtils;

public class ClockController implements TunerService.Tunable {

@@ -38,34 +47,40 @@ public class ClockController implements TunerService.Tunable {

    private Clock mActiveClock, mCenterClock, mLeftClock, mRightClock;

    private int mClockPosition = CLOCK_POSITION_LEFT;
    private int mClockPosition = CLOCK_POSITION_CENTER;
    private boolean mBlackListed = false;
    private DisplayCutout mDisplayCutout;
    private View mStatusBar;

    public ClockController(View statusBar) {

        mCenterClock = statusBar.findViewById(R.id.clock_center);
        mLeftClock = statusBar.findViewById(R.id.clock);
        mRightClock = statusBar.findViewById(R.id.clock_right);

        mStatusBar = statusBar;
        mActiveClock = mLeftClock;

        statusBar.setOnApplyWindowInsetsListener(new android.view.View.OnApplyWindowInsetsListener(){
            public WindowInsets onApplyWindowInsets (View v, WindowInsets insets){
                updateActiveClock();
                return insets;
            }
        });
        Dependency.get(TunerService.class).addTunable(this,
                StatusBarIconController.ICON_BLACKLIST, CLOCK_POSITION);

    }

    public Clock getClock() {
        switch (mClockPosition) {
            case CLOCK_POSITION_RIGHT:
                return mRightClock;
            case CLOCK_POSITION_CENTER:
                return mCenterClock;
            case CLOCK_POSITION_LEFT:
                return mLeftClock;
            case CLOCK_POSITION_CENTER:
            default:
                if(mCutoutLocation == 1)
                {
                    return mRightClock;
                }else {
                    return mLeftClock;
                }
                return mCenterClock;
        }
    }

@@ -103,7 +118,6 @@ public class ClockController implements TunerService.Tunable {
            mCutoutLocation = 2;



        mActiveClock.setClockVisibleByUser(false);
        mActiveClock = getClock();
        mActiveClock.setClockVisibleByUser(true);