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

Commit 56f380cd authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Allow status_bar_height to be RRO controlled" into oc-mr1-dev 

am: 45e8fe20

Change-Id: Ic47deee56fc209b0230eab0358ff426f765735b3
parents 163e7345 45e8fe20

services/core/java/com/android/server/policy/PhoneWindowManager.java

+3 −1
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ import android.app.ActivityManager; 
import android.app.ActivityManager.StackId;

import android.app.ActivityManagerInternal;

import android.app.ActivityManagerInternal.SleepToken;

import android.app.ActivityThread;

import android.app.AppOpsManager;

import android.app.IUiModeManager;

import android.app.ProgressDialog;
@@ -2642,7 +2643,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    @Override

    public void onConfigurationChanged() {

        // TODO(multi-display): Define policy for secondary displays.

        final Resources res = mContext.getResources();

        Context uiContext = ActivityThread.currentActivityThread().getSystemUiContext();

        final Resources res = uiContext.getResources();



        mStatusBarHeight =

                res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height);