Merge "Maintain TRANSIENT_*_BAR flags until transient bars hidden." into klp-dev (1d5ac159) · Commits · e / os / android_frameworks_base

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -21,16 +21,19 @@ import android.content.Context;
		import android.content.res.Resources;
		import android.graphics.drawable.ColorDrawable;
		import android.graphics.drawable.Drawable;
		import android.util.Log;
		import android.view.View;

		import com.android.systemui.R;

		public class BarTransitions {
		private static final boolean DEBUG = false;

		public static final int MODE_NORMAL = 0;
		public static final int MODE_TRANSIENT = 1;
		public static final int MODE_TRANSPARENT = 2;

		private final String mTag;
		private final View mTarget;
		private final Drawable mOpaque;
		private final Drawable mTransient;
		@@ -39,6 +42,7 @@ public class BarTransitions {
		private int mMode;

		public BarTransitions(Context context, View target, Drawable transparent) {
		mTag = "BarTransitions." + target.getClass().getSimpleName();
		mTarget = target;
		final Resources res = context.getResources();
		mOpaque = new ColorDrawable(res.getColor(R.drawable.status_bar_background));
		@@ -56,9 +60,17 @@ public class BarTransitions {
		public void transitionTo(int mode) {
		mMode = mode;
		if (!ActivityManager.isHighEndGfx()) return;
		if (DEBUG) Log.d(mTag, "transitionTo " + modeToString(mode));
		Drawable background = mode == MODE_TRANSIENT ? mTransient
		: mode == MODE_TRANSPARENT ? mTransparent
		: mOpaque;
		mTarget.setBackground(background);
		}

		public static String modeToString(int mode) {
		if (mode == MODE_NORMAL) return "MODE_NORMAL";
		if (mode == MODE_TRANSIENT) return "MODE_TRANSIENT";
		if (mode == MODE_TRANSPARENT) return "MODE_TRANSPARENT";
		throw new IllegalArgumentException("Unknown mode " + mode);
		}
		}

policy/src/com/android/internal/policy/impl/BarController.java

0 → 100644

+186 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.internal.policy.impl;

		import android.app.StatusBarManager;
		import android.os.Handler;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.util.Slog;
		import android.view.View;
		import android.view.WindowManagerPolicy.WindowState;

		import com.android.internal.statusbar.IStatusBarService;

		import java.io.PrintWriter;

		/**
		* Controls state/behavior specific to a system bar window.
		*/
		public class BarController {
		private static final boolean DEBUG = false;

		private static final int TRANSIENT_BAR_NONE = 0;
		private static final int TRANSIENT_BAR_SHOWING = 1;
		private static final int TRANSIENT_BAR_HIDING = 2;

		private final String mTag;
		private final int mTransientFlag;
		private final int mStatusBarManagerId;
		private final Handler mHandler;
		private final Object mServiceAquireLock = new Object();
		private IStatusBarService mStatusBarService;

		private WindowState mWin;
		private int mTransientBarState;
		private boolean mPendingShow;

		public BarController(String tag, int transientFlag, int statusBarManagerId) {
		mTag = "BarController." + tag;
		mTransientFlag = transientFlag;
		mStatusBarManagerId = statusBarManagerId;
		mHandler = new Handler();
		}

		public void setWindow(WindowState win) {
		mWin = win;
		}

		public void showTransient() {
		if (mWin != null) {
		setTransientBarState(TRANSIENT_BAR_SHOWING);
		}
		}

		public boolean isTransientShowing() {
		return mTransientBarState == TRANSIENT_BAR_SHOWING;
		}

		public void adjustSystemUiVisibilityLw(int visibility) {
		if (mWin != null && mTransientBarState == TRANSIENT_BAR_SHOWING &&
		(visibility & mTransientFlag) == 0) {
		setTransientBarState(TRANSIENT_BAR_HIDING);
		setBarShowingLw(false);
		}
		}

		public boolean setBarShowingLw(final boolean show) {
		if (mWin == null) return false;

		mHandler.post(new Runnable() {
		@Override
		public void run() {
		try {
		IStatusBarService statusbar = getStatusBarService();
		if (statusbar != null) {
		statusbar.setWindowState(mStatusBarManagerId, show
		? StatusBarManager.WINDOW_STATE_SHOWING
		: StatusBarManager.WINDOW_STATE_HIDING);
		}
		} catch (RemoteException e) {
		// re-acquire status bar service next time it is needed.
		mStatusBarService = null;
		}
		}
		});
		if (show && mTransientBarState == TRANSIENT_BAR_HIDING) {
		mPendingShow = true;
		return false;
		}
		return show ? mWin.showLw(true) : mWin.hideLw(true);
		}

		public boolean checkHiddenLw() {
		if (mWin != null && mTransientBarState == TRANSIENT_BAR_HIDING && !mWin.isVisibleLw()) {
		// Finished animating out, clean up and reset style
		setTransientBarState(TRANSIENT_BAR_NONE);
		if (mPendingShow) {
		setBarShowingLw(true);
		mPendingShow = false;
		}
		return true;
		}
		return false;
		}

		public boolean checkShowTransientBarLw() {
		if (mTransientBarState == TRANSIENT_BAR_SHOWING) {
		if (DEBUG) Slog.d(mTag, "Not showing transient bar, already shown");
		return false;
		} else if (mWin == null) {
		if (DEBUG) Slog.d(mTag, "Not showing transient bar, bar doesn't exist");
		return false;
		} else if (mWin.isDisplayedLw()) {
		if (DEBUG) Slog.d(mTag, "Not showing transient bar, bar already visible");
		return false;
		} else {
		return true;
		}
		}

		public int updateVisibilityLw(boolean allowed, int oldVis, int vis) {
		if (mWin == null) return vis;

		if (mTransientBarState == TRANSIENT_BAR_SHOWING) { // transient bar requested
		if (allowed) {
		vis \|= mTransientFlag;
		if ((oldVis & mTransientFlag) == 0) {
		setBarShowingLw(true);
		}
		} else {
		setTransientBarState(TRANSIENT_BAR_NONE); // request denied
		}
		}
		if (mTransientBarState != TRANSIENT_BAR_NONE) {
		vis \|= mTransientFlag; // ignore clear requests until transition completes
		vis &= ~View.SYSTEM_UI_FLAG_LOW_PROFILE; // never show transient bars in low profile
		}
		return vis;
		}

		private void setTransientBarState(int state) {
		if (mWin != null && state != mTransientBarState) {
		mTransientBarState = state;
		if (DEBUG) Slog.d(mTag, "New state: " + transientBarStateToString(state));
		}
		}

		private IStatusBarService getStatusBarService() {
		synchronized (mServiceAquireLock) {
		if (mStatusBarService == null) {
		mStatusBarService = IStatusBarService.Stub.asInterface(
		ServiceManager.getService("statusbar"));
		}
		return mStatusBarService;
		}
		}

		private static String transientBarStateToString(int state) {
		if (state == TRANSIENT_BAR_HIDING) return "TRANSIENT_BAR_HIDING";
		if (state == TRANSIENT_BAR_SHOWING) return "TRANSIENT_BAR_SHOWING";
		if (state == TRANSIENT_BAR_NONE) return "TRANSIENT_BAR_NONE";
		throw new IllegalArgumentException("Unknown state " + state);
		}

		public void dump(PrintWriter pw, String prefix) {
		if (mWin != null) {
		pw.print(prefix); pw.print(mTag); pw.print(' ');
		pw.print("mTransientBar"); pw.print('=');
		pw.println(transientBarStateToString(mTransientBarState));
		}
		}
		}

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+70 −145

File changed.

Preview size limit exceeded, changes collapsed.