Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue #2544466: Car Home brightness icon comes and goes while phone is in car dock in FRE83"

Browse Source
This commit is contained in:
Dianne Hackborn
2010-03-26 00:55:35 -07:00
committed by Android (Google) Code Review
parent 2911e8eff7 3d31bb111a
commit effca85fc4
11 changed files with 132 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/IUiModeManager.aidl
View File

@@ -30,7 +30,7 @@ interface IUiModeManager {
/**
* Disables the car mode.
*/
void disableCarMode();
void disableCarMode(int flags);
/**
* Return the current running mode.

16
core/java/android/app/UiModeManager.java
View File

@@ -116,12 +116,22 @@ public class UiModeManager {
}
/**
* Turn off special mode if currently in car mode.
* Flag for use with {@link #disableCarMode(int)}: go to the normal
* home activity as part of the disable. Disabling this way ensures
* a clean transition between the current activity (in car mode) and
* the original home activity (which was typically last running without
* being in car mode).
*/
public void disableCarMode() {
public static final int DISABLE_CAR_MODE_GO_HOME = 0x0001;
/**
* Turn off special mode if currently in car mode.
* @param flags May be 0 or {@link #DISABLE_CAR_MODE_GO_HOME}.
*/
public void disableCarMode(int flags) {
if (mService != null) {
try {
mService.disableCarMode();
mService.disableCarMode(flags);
} catch (RemoteException e) {
Log.e(TAG, "disableCarMode: RemoteException", e);
}

3
core/java/android/view/ViewRoot.java
View File

@@ -1855,7 +1855,8 @@ public final class ViewRoot extends Handler implements ViewParent,
if (mWinFrame.width() == msg.arg1 && mWinFrame.height() == msg.arg2
&& mPendingContentInsets.equals(ri.coveredInsets)
&& mPendingVisibleInsets.equals(ri.visibleInsets)) {
&& mPendingVisibleInsets.equals(ri.visibleInsets)
&& ((ResizedInfo)msg.obj).newConfig == null) {
break;
}
// fall through...

3
core/java/com/android/internal/app/DisableCarModeActivity.java
View File

@@ -18,6 +18,7 @@ package com.android.internal.app;
import android.app.Activity;
import android.app.IUiModeManager;
import android.app.UiModeManager;
import android.os.Bundle;
import android.os.RemoteException;
import android.os.ServiceManager;
@@ -32,7 +33,7 @@ public class DisableCarModeActivity extends Activity {
try {
IUiModeManager uiModeManager = IUiModeManager.Stub.asInterface(
ServiceManager.getService("uimode"));
uiModeManager.disableCarMode();
uiModeManager.disableCarMode(UiModeManager.DISABLE_CAR_MODE_GO_HOME);
} catch (RemoteException e) {
Log.e(TAG, "Failed to disable car mode", e);
}