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

am 06af7620: am 17de1532: Merge "Fix issue #2581524: Car home icon should always go to car home" into froyo

Browse Source 
Merge commit '06af762033467bb578b9ed2be8af580cc11505a8' into kraken

* commit '06af762033467bb578b9ed2be8af580cc11505a8':
  Fix issue #2581524: Car home icon should always go to car home
This commit is contained in:
Dianne Hackborn
2010-04-10 11:48:15 -07:00
committed by Android Git Automerger
parent 6890bfba4f 06af762033
commit e1b462d76d
4 changed files with 106 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
api/current.xml
View File

@@ -25428,6 +25428,17 @@
visibility="public" visibility="public"
> >
</field> </field>
<field name="ENABLE_CAR_MODE_GO_CAR_HOME"
type="int"
transient="false"
volatile="false"
value="1"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="MODE_NIGHT_AUTO" <field name="MODE_NIGHT_AUTO"
type="int" type="int"
transient="false" transient="false"
@@ -89029,7 +89040,7 @@
<method name="getMobileRxBytes" <method name="getMobileRxBytes"
return="long" return="long"
abstract="false" abstract="false"
native="false" native="true"
synchronized="false" synchronized="false"
static="true" static="true"
final="false" final="false"
@@ -89040,7 +89051,7 @@
<method name="getMobileRxPackets" <method name="getMobileRxPackets"
return="long" return="long"
abstract="false" abstract="false"
native="false" native="true"
synchronized="false" synchronized="false"
static="true" static="true"
final="false" final="false"
@@ -89051,7 +89062,7 @@
<method name="getMobileTxBytes" <method name="getMobileTxBytes"
return="long" return="long"
abstract="false" abstract="false"
native="false" native="true"
synchronized="false" synchronized="false"
static="true" static="true"
final="false" final="false"
@@ -89062,7 +89073,7 @@
<method name="getMobileTxPackets" <method name="getMobileTxPackets"
return="long" return="long"
abstract="false" abstract="false"
native="false" native="true"
synchronized="false" synchronized="false"
static="true" static="true"
final="false" final="false"
@@ -89073,7 +89084,7 @@
<method name="getTotalRxBytes" <method name="getTotalRxBytes"
return="long" return="long"
abstract="false" abstract="false"
native="false" native="true"
synchronized="false" synchronized="false"
static="true" static="true"
final="false" final="false"
@@ -89084,7 +89095,7 @@
<method name="getTotalRxPackets" <method name="getTotalRxPackets"
return="long" return="long"
abstract="false" abstract="false"
native="false" native="true"
synchronized="false" synchronized="false"
static="true" static="true"
final="false" final="false"
@@ -89095,7 +89106,7 @@
<method name="getTotalTxBytes" <method name="getTotalTxBytes"
return="long" return="long"
abstract="false" abstract="false"
native="false" native="true"
synchronized="false" synchronized="false"
static="true" static="true"
final="false" final="false"
@@ -89106,7 +89117,7 @@
<method name="getTotalTxPackets" <method name="getTotalTxPackets"
return="long" return="long"
abstract="false" abstract="false"
native="false" native="true"
synchronized="false" synchronized="false"
static="true" static="true"
final="false" final="false"
@@ -89117,7 +89128,7 @@
<method name="getUidRxBytes" <method name="getUidRxBytes"
return="long" return="long"
abstract="false" abstract="false"
native="false" native="true"
synchronized="false" synchronized="false"
static="true" static="true"
final="false" final="false"
@@ -89130,7 +89141,7 @@
<method name="getUidTxBytes" <method name="getUidTxBytes"
return="long" return="long"
abstract="false" abstract="false"
native="false" native="true"
synchronized="false" synchronized="false"
static="true" static="true"
final="false" final="false"

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

@@ -25,7 +25,7 @@ interface IUiModeManager {
* Enables the car mode. Only the system can do this. * Enables the car mode. Only the system can do this.
* @hide * @hide
*/ */
void enableCarMode(); void enableCarMode(int flags);
/** /**
* Disables the car mode. * Disables the car mode.

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

@@ -116,13 +116,13 @@ public class UiModeManager {
} }
/** /**
* Flag for use with {@link #disableCarMode(int)}: go to the normal * Flag for use with {@link #enableCarMode(int)}: go to the car
* home activity as part of the disable. Disabling this way ensures * home activity as part of the enable. Enabling this way ensures
* a clean transition between the current activity (in car mode) and * a clean transition between the current activity (in non-car-mode) and
* the original home activity (which was typically last running without * the car home activity that will serve as home while in car mode. This
* being in car mode). * will switch to the car home activity even if we are already in car mode.
*/ */
public static final int DISABLE_CAR_MODE_GO_HOME = 0x0001; public static final int ENABLE_CAR_MODE_GO_CAR_HOME = 0x0001;
/** /**
* Force device into car mode, like it had been placed in the car dock. * Force device into car mode, like it had been placed in the car dock.
@@ -133,13 +133,22 @@ public class UiModeManager {
public void enableCarMode(int flags) { public void enableCarMode(int flags) {
if (mService != null) { if (mService != null) {
try { try {
mService.enableCarMode(); mService.enableCarMode(flags);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "disableCarMode: RemoteException", e); Log.e(TAG, "disableCarMode: RemoteException", e);
} }
} }
} }
/**
* 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 static final int DISABLE_CAR_MODE_GO_HOME = 0x0001;
/** /**
* Turn off special mode if currently in car mode. * Turn off special mode if currently in car mode.
* @param flags May be 0 or {@link #DISABLE_CAR_MODE_GO_HOME}. * @param flags May be 0 or {@link #DISABLE_CAR_MODE_GO_HOME}.

108
services/java/com/android/server/UiModeManagerService.java
View File

@@ -25,6 +25,7 @@ import android.app.NotificationManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.app.StatusBarManager; import android.app.StatusBarManager;
import android.app.UiModeManager; import android.app.UiModeManager;
import android.content.ActivityNotFoundException;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -103,6 +104,14 @@ class UiModeManagerService extends IUiModeManager.Stub {
private StatusBarManager mStatusBarManager; private StatusBarManager mStatusBarManager;
private final PowerManager.WakeLock mWakeLock; private final PowerManager.WakeLock mWakeLock;
static Intent buildHomeIntent(String category) {
Intent intent = new Intent(Intent.ACTION_MAIN);
intent.addCategory(category);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
return intent;
}
// The broadcast receiver which receives the result of the ordered broadcast sent when // The broadcast receiver which receives the result of the ordered broadcast sent when
// the dock state changes. The original ordered broadcast is sent with an initial result // the dock state changes. The original ordered broadcast is sent with an initial result
// code of RESULT_OK. If any of the registered broadcast receivers changes this value, e.g., // code of RESULT_OK. If any of the registered broadcast receivers changes this value, e.g.,
@@ -114,24 +123,36 @@ class UiModeManagerService extends IUiModeManager.Stub {
return; return;
} }
final int enableFlags = intent.getIntExtra("enableFlags", 0);
final int disableFlags = intent.getIntExtra("disableFlags", 0);
synchronized (mLock) { synchronized (mLock) {
// Launch a dock activity // Launch a dock activity
String category; String category = null;
if (UiModeManager.ACTION_ENTER_CAR_MODE.equals(intent.getAction())) { if (UiModeManager.ACTION_ENTER_CAR_MODE.equals(intent.getAction())) {
// Only launch car home when car mode is enabled. // Only launch car home when car mode is enabled and the caller
// has asked us to switch to it.
if ((enableFlags&UiModeManager.ENABLE_CAR_MODE_GO_CAR_HOME) != 0) {
category = Intent.CATEGORY_CAR_DOCK; category = Intent.CATEGORY_CAR_DOCK;
} else if (UiModeManager.ACTION_ENTER_DESK_MODE.equals(intent.getAction())) {
category = Intent.CATEGORY_DESK_DOCK;
} else {
category = null;
} }
} else if (UiModeManager.ACTION_ENTER_DESK_MODE.equals(intent.getAction())) {
// Only launch car home when desk mode is enabled and the caller
// has asked us to switch to it. Currently re-using the car
// mode flag since we don't have a formal API for "desk mode".
if ((enableFlags&UiModeManager.ENABLE_CAR_MODE_GO_CAR_HOME) != 0) {
category = Intent.CATEGORY_DESK_DOCK;
}
} else {
// Launch the standard home app if requested.
if ((disableFlags&UiModeManager.DISABLE_CAR_MODE_GO_HOME) != 0) {
category = Intent.CATEGORY_HOME;
}
}
if (category != null) { if (category != null) {
// This is the new activity that will serve as home while // This is the new activity that will serve as home while
// we are in care mode. // we are in care mode.
intent = new Intent(Intent.ACTION_MAIN); Intent homeIntent = buildHomeIntent(category);
intent.addCategory(category);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
// Now we are going to be careful about switching the // Now we are going to be careful about switching the
// configuration and starting the activity -- we need to // configuration and starting the activity -- we need to
@@ -148,7 +169,7 @@ class UiModeManagerService extends IUiModeManager.Stub {
} }
try { try {
ActivityManagerNative.getDefault().startActivityWithConfig( ActivityManagerNative.getDefault().startActivityWithConfig(
null, intent, null, null, 0, null, null, 0, false, false, null, homeIntent, null, null, 0, null, null, 0, false, false,
newConfig); newConfig);
mHoldingConfiguration = false; mHoldingConfiguration = false;
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -188,7 +209,7 @@ class UiModeManagerService extends IUiModeManager.Stub {
mCharging = (intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) != 0); mCharging = (intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) != 0);
synchronized (mLock) { synchronized (mLock) {
if (mSystemReady) { if (mSystemReady) {
updateLocked(0); updateLocked(0, 0);
} }
} }
} }
@@ -302,16 +323,16 @@ class UiModeManagerService extends IUiModeManager.Stub {
synchronized (mLock) { synchronized (mLock) {
setCarModeLocked(false); setCarModeLocked(false);
if (mSystemReady) { if (mSystemReady) {
updateLocked(flags); updateLocked(0, flags);
} }
} }
} }
public void enableCarMode() { public void enableCarMode(int flags) {
synchronized (mLock) { synchronized (mLock) {
setCarModeLocked(true); setCarModeLocked(true);
if (mSystemReady) { if (mSystemReady) {
updateLocked(0); updateLocked(flags, 0);
} }
} }
} }
@@ -342,7 +363,7 @@ class UiModeManagerService extends IUiModeManager.Stub {
Settings.Secure.UI_NIGHT_MODE, mode); Settings.Secure.UI_NIGHT_MODE, mode);
Binder.restoreCallingIdentity(ident); Binder.restoreCallingIdentity(ident);
mNightMode = mode; mNightMode = mode;
updateLocked(0); updateLocked(0, 0);
} }
} }
} }
@@ -355,7 +376,7 @@ class UiModeManagerService extends IUiModeManager.Stub {
synchronized (mLock) { synchronized (mLock) {
mSystemReady = true; mSystemReady = true;
mCarModeEnabled = mDockState == Intent.EXTRA_DOCK_STATE_CAR; mCarModeEnabled = mDockState == Intent.EXTRA_DOCK_STATE_CAR;
updateLocked(0); updateLocked(0, 0);
mHandler.sendEmptyMessage(MSG_ENABLE_LOCATION_UPDATES); mHandler.sendEmptyMessage(MSG_ENABLE_LOCATION_UPDATES);
} }
} }
@@ -376,7 +397,7 @@ class UiModeManagerService extends IUiModeManager.Stub {
mDockState = newState; mDockState = newState;
setCarModeLocked(mDockState == Intent.EXTRA_DOCK_STATE_CAR); setCarModeLocked(mDockState == Intent.EXTRA_DOCK_STATE_CAR);
if (mSystemReady) { if (mSystemReady) {
updateLocked(0); updateLocked(UiModeManager.ENABLE_CAR_MODE_GO_CAR_HOME, 0);
} }
} }
} }
@@ -426,7 +447,7 @@ class UiModeManagerService extends IUiModeManager.Stub {
} }
} }
final void updateLocked(int flags) { final void updateLocked(int enableFlags, int disableFlags) {
long ident = Binder.clearCallingIdentity(); long ident = Binder.clearCallingIdentity();
try { try {
@@ -469,34 +490,39 @@ class UiModeManagerService extends IUiModeManager.Stub {
// not launch the corresponding dock application. This gives apps a chance // not launch the corresponding dock application. This gives apps a chance
// to override the behavior and stay in their app even when the device is // to override the behavior and stay in their app even when the device is
// placed into a dock. // placed into a dock.
mContext.sendOrderedBroadcast(new Intent(action), null, Intent intent = new Intent(action);
intent.putExtra("enableFlags", enableFlags);
intent.putExtra("disableFlags", disableFlags);
mContext.sendOrderedBroadcast(intent, null,
mResultReceiver, null, Activity.RESULT_OK, null, null); mResultReceiver, null, Activity.RESULT_OK, null, null);
// Attempting to make this transition a little more clean, we are going // Attempting to make this transition a little more clean, we are going
// to hold off on doing a configuration change until we have finished // to hold off on doing a configuration change until we have finished
// the broacast and started the home activity. // the broadcast and started the home activity.
mHoldingConfiguration = true; mHoldingConfiguration = true;
} else {
Intent homeIntent = null;
if (mCarModeEnabled) {
if ((enableFlags&UiModeManager.ENABLE_CAR_MODE_GO_CAR_HOME) != 0) {
homeIntent = buildHomeIntent(Intent.CATEGORY_CAR_DOCK);
} }
} else if (mDockState == Intent.EXTRA_DOCK_STATE_DESK) {
if (oldAction != null && (flags&UiModeManager.DISABLE_CAR_MODE_GO_HOME) != 0) { if ((enableFlags&UiModeManager.ENABLE_CAR_MODE_GO_CAR_HOME) != 0) {
// We are exiting the special mode, and have been asked to return homeIntent = buildHomeIntent(Intent.CATEGORY_DESK_DOCK);
// to the main home screen while doing so. To keep this clean, we
// have the activity manager switch the configuration for us at the
// same time as the switch.
try {
Intent intent = new Intent(Intent.ACTION_MAIN);
intent.addCategory(Intent.CATEGORY_HOME);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mHoldingConfiguration = false;
updateConfigurationLocked(false);
ActivityManagerNative.getDefault().startActivityWithConfig(
null, intent, null, null, 0, null, null, 0, false, false,
mConfiguration);
} catch (RemoteException e) {
Slog.w(TAG, e.getCause());
} }
} else { } else {
updateConfigurationLocked(true); if ((disableFlags&UiModeManager.DISABLE_CAR_MODE_GO_HOME) != 0) {
homeIntent = buildHomeIntent(Intent.CATEGORY_HOME);
} }
}
if (homeIntent != null) {
try {
mContext.startActivity(homeIntent);
} catch (ActivityNotFoundException e) {
}
}
}
updateConfigurationLocked(true);
// keep screen on when charging and in car mode // keep screen on when charging and in car mode
boolean keepScreenOn = mCharging && boolean keepScreenOn = mCharging &&
@@ -569,7 +595,7 @@ class UiModeManagerService extends IUiModeManager.Stub {
if (isDoingNightMode() && mLocation != null if (isDoingNightMode() && mLocation != null
&& mNightMode == UiModeManager.MODE_NIGHT_AUTO) { && mNightMode == UiModeManager.MODE_NIGHT_AUTO) {
updateTwilightLocked(); updateTwilightLocked();
updateLocked(0); updateLocked(0, 0);
} }
} }
break; break;
@@ -597,7 +623,7 @@ class UiModeManagerService extends IUiModeManager.Stub {
if (isDoingNightMode() && mLocation != null if (isDoingNightMode() && mLocation != null
&& mNightMode == UiModeManager.MODE_NIGHT_AUTO) { && mNightMode == UiModeManager.MODE_NIGHT_AUTO) {
updateTwilightLocked(); updateTwilightLocked();
updateLocked(0); updateLocked(0, 0);
} }
} }
} }