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

Commit 664587a9 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

SystemUI: Reinflate on theme change 

Reflect the updated assets immediately once the config_changed
notification happens

Change-Id: I480a719fbdd45875277871af39ce65849918ec0a
parent 839286c5

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+5 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import android.view.ViewGroup; 
import android.view.ViewGroup.LayoutParams;

import android.view.WindowManager;

import android.view.WindowManagerGlobal;

import android.widget.FrameLayout;

import android.widget.ImageView;

import android.widget.LinearLayout;

import android.widget.PopupMenu;
@@ -132,6 +133,8 @@ public abstract class BaseStatusBar extends SystemUI implements 
    PowerManager mPowerManager;

    protected int mRowHeight;



    protected FrameLayout mStatusBarContainer;



    // UI-specific methods



    /**
@@ -237,6 +240,8 @@ public abstract class BaseStatusBar extends SystemUI implements 
        mLocale = mContext.getResources().getConfiguration().locale;

        mLayoutDirection = TextUtils.getLayoutDirectionFromLocale(mLocale);



        mStatusBarContainer = new FrameLayout(mContext);



        // Connect in to the status bar manager service

        StatusBarIconList iconList = new StatusBarIconList();

        ArrayList<IBinder> notificationKeys = new ArrayList<IBinder>();

packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java

+4 −0
Original line number Diff line number Diff line
@@ -131,6 +131,10 @@ public class NotificationData { 
        return e;

    }



    public void clear() {

        mEntries.clear();

    }



    /**

     * Return whether there are any visible items (i.e. items without an error).

     */

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java

+4 −0
Original line number Diff line number Diff line
@@ -213,6 +213,10 @@ public class StatusBarIconView extends AnimatedImageView { 
        }

    }



    public String getStatusBarSlot() {

        return mSlot;

    }



    @Override

    protected void onSizeChanged(int w, int h, int oldw, int oldh) {

        super.onSizeChanged(w, h, oldw, oldh);

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

+98 −13
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.content.res.Configuration;

import android.content.res.CustomTheme;

import android.content.res.Resources;

import android.database.ContentObserver;

import android.graphics.Canvas;
@@ -61,6 +62,7 @@ import android.service.notification.StatusBarNotification; 
import android.util.DisplayMetrics;

import android.util.EventLog;

import android.util.Log;

import android.util.Pair;

import android.view.Display;

import android.view.Gravity;

import android.view.MotionEvent;
@@ -77,6 +79,7 @@ import android.view.animation.AnimationUtils; 
import android.view.animation.DecelerateInterpolator;

import android.widget.FrameLayout;

import android.widget.ImageView;

import android.widget.FrameLayout;

import android.widget.LinearLayout;

import android.widget.ScrollView;

import android.widget.TextView;
@@ -253,6 +256,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
    int[] mAbsPos = new int[2];

    Runnable mPostCollapseCleanup = null;



    // last theme that was applied in order to detect theme change (as opposed

    // to some other configuration change).

    CustomTheme mCurrentTheme;

    private boolean mRecreating = false;



    // for disabling the status bar

    int mDisabled = 0;
@@ -345,6 +353,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
                .getDefaultDisplay();

        updateDisplaySize();



        CustomTheme currentTheme = mContext.getResources().getConfiguration().customTheme;

        if (currentTheme != null) {

            mCurrentTheme = (CustomTheme)currentTheme.clone();

        }



        super.start(); // calls createAndAddWindows()



        addNavigationBar();
@@ -429,7 +442,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
        try {

            boolean showNav = mWindowManagerService.hasNavigationBar();

            if (DEBUG) Log.v(TAG, "hasNavigationBar=" + showNav);

            if (showNav) {

            if (showNav && !mRecreating) {

                mNavigationBarView =

                    (NavigationBarView) View.inflate(context, R.layout.navigation_bar, null);
@@ -796,6 +809,13 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
        if (DEBUG) Log.v(TAG, "addNavigationBar: about to add " + mNavigationBarView);

        if (mNavigationBarView == null) return;



        CustomTheme newTheme = mContext.getResources().getConfiguration().customTheme;

        if (newTheme != null &&

                (mCurrentTheme == null || !mCurrentTheme.equals(newTheme))) {

            // Nevermind, this will be re-created

            return;

        }



        prepareNavigationBarView();



        mWindowManager.addView(mNavigationBarView, getNavigationBarLayoutParams());
@@ -930,7 +950,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
                notification.getNotification().fullScreenIntent.send();

            } catch (PendingIntent.CanceledException e) {

            }

        } else {

        } else if (!mRecreating) {

            // usual case: status bar visible & not immersive



            // show the ticker if there isn't already a heads up
@@ -1412,11 +1432,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 


        // Expand the window to encompass the full screen in anticipation of the drag.

        // This is only possible to do atomically because the status bar is at the top of the screen!

        WindowManager.LayoutParams lp = (WindowManager.LayoutParams) mStatusBarWindow.getLayoutParams();

        WindowManager.LayoutParams lp = (WindowManager.LayoutParams) mStatusBarContainer.getLayoutParams();

        lp.flags &= ~WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;

        lp.flags |= WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;

        lp.height = ViewGroup.LayoutParams.MATCH_PARENT;

        mWindowManager.updateViewLayout(mStatusBarWindow, lp);

        mWindowManager.updateViewLayout(mStatusBarContainer, lp);



        visibilityChanged(true);
@@ -1425,10 +1445,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 


    private void releaseFocus() {

        WindowManager.LayoutParams lp =

                (WindowManager.LayoutParams) mStatusBarWindow.getLayoutParams();

                (WindowManager.LayoutParams) mStatusBarContainer.getLayoutParams();

        lp.flags |= WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;

        lp.flags &= ~WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;

        mWindowManager.updateViewLayout(mStatusBarWindow, lp);

        mWindowManager.updateViewLayout(mStatusBarContainer, lp);

    }



    public void animateCollapsePanels() {
@@ -1697,11 +1717,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
        visibilityChanged(false);



        // Shrink the window to the size of the status bar only

        WindowManager.LayoutParams lp = (WindowManager.LayoutParams) mStatusBarWindow.getLayoutParams();

        WindowManager.LayoutParams lp = (WindowManager.LayoutParams) mStatusBarContainer.getLayoutParams();

        lp.height = getStatusBarHeight();

        lp.flags |= WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;

        lp.flags &= ~WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;

        mWindowManager.updateViewLayout(mStatusBarWindow, lp);

        mWindowManager.updateViewLayout(mStatusBarContainer, lp);



        if ((mDisabled & StatusBarManager.DISABLE_NOTIFICATION_ICONS) == 0) {

            setNotificationIconVisibility(true, com.android.internal.R.anim.fade_in);
@@ -2062,7 +2082,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
        // until status bar window is attached to the window manager,

        // because...  well, what's the point otherwise?  And trying to

        // run a ticker without being attached will crash!

        if (n.getNotification().tickerText != null && mStatusBarWindow.getWindowToken() != null) {

        if (n.getNotification().tickerText != null && mStatusBarContainer.getWindowToken() != null) {

            if (0 == (mDisabled & (StatusBarManager.DISABLE_NOTIFICATION_ICONS

                            | StatusBarManager.DISABLE_NOTIFICATION_TICKER))) {

                mTicker.addEntry(n);
@@ -2251,7 +2271,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
        lp.packageName = mContext.getPackageName();



        makeStatusBarView();

        mWindowManager.addView(mStatusBarWindow, lp);

        mStatusBarContainer.addView(mStatusBarWindow);

        mWindowManager.addView(mStatusBarContainer, lp);

    }



    void setNotificationIconVisibility(boolean visible, int anim) {
@@ -2541,6 +2562,60 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
        }

    }



    private static void copyNotifications(ArrayList<Pair<IBinder, StatusBarNotification>> dest,

            NotificationData source) {

        int N = source.size();

        for (int i = 0; i < N; i++) {

            NotificationData.Entry entry = source.get(i);

            dest.add(Pair.create(entry.key, entry.notification));

        }

    }



    private void recreateStatusBar() {

        mRecreating = true;

        mStatusBarContainer.removeAllViews();



        // extract icons from the soon-to-be recreated viewgroup.

        int nIcons = mStatusIcons.getChildCount();

        ArrayList<StatusBarIcon> icons = new ArrayList<StatusBarIcon>(nIcons);

        ArrayList<String> iconSlots = new ArrayList<String>(nIcons);

        for (int i = 0; i < nIcons; i++) {

            StatusBarIconView iconView = (StatusBarIconView)mStatusIcons.getChildAt(i);

            icons.add(iconView.getStatusBarIcon());

            iconSlots.add(iconView.getStatusBarSlot());

        }



        // extract notifications.

        int nNotifs = mNotificationData.size();

        ArrayList<Pair<IBinder, StatusBarNotification>> notifications =

                new ArrayList<Pair<IBinder, StatusBarNotification>>(nNotifs);

        copyNotifications(notifications, mNotificationData);

        mNotificationData.clear();



        makeStatusBarView();

        repositionNavigationBar();



        // recreate StatusBarIconViews.

        for (int i = 0; i < nIcons; i++) {

            StatusBarIcon icon = icons.get(i);

            String slot = iconSlots.get(i);

            addIcon(slot, i, i, icon);

        }



        // recreate notifications.

        for (int i = 0; i < nNotifs; i++) {

            Pair<IBinder, StatusBarNotification> notifData = notifications.get(i);

            addNotificationViews(createNotificationViews(notifData.first, notifData.second));

        }



        setAreThereNotifications();



        mStatusBarContainer.addView(mStatusBarWindow);



        updateExpandedViewPos(EXPANDED_LEAVE_ALONE);

        mRecreating = false;

    }



    /**

     * Reload some of our resources when the configuration changes.

     *
@@ -2552,14 +2627,23 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
        final Context context = mContext;

        final Resources res = context.getResources();



        // detect theme change.

        CustomTheme newTheme = res.getConfiguration().customTheme;

        if (newTheme != null &&

                (mCurrentTheme == null || !mCurrentTheme.equals(newTheme))) {

            mCurrentTheme = (CustomTheme)newTheme.clone();

            recreateStatusBar();

        } else {



            if (mClearButton instanceof TextView) {

                ((TextView)mClearButton).setText(context.getText(R.string.status_bar_clear_all_button));

            }

            loadDimens();

        }



        // Update the QuickSettings container

        if (mQS != null) mQS.updateResources();



        loadDimens();

    }



    protected void loadDimens() {
@@ -2776,4 +2860,5 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
            ((DemoMode)v).dispatchDemoCommand(command, args);

        }

    }



}

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

+6 −0
Original line number Diff line number Diff line
@@ -72,6 +72,12 @@ public class StatusBarWindowView extends FrameLayout 
        }

    }



    @Override

    public void dispatchWindowFocusChanged(boolean hasFocus) {

        this.setFocusableInTouchMode(hasFocus);

        this.requestFocus();

    }



    @Override

    public boolean dispatchKeyEvent(KeyEvent event) {

        boolean down = event.getAction() == KeyEvent.ACTION_DOWN;