Disable Status bar in SetupWizard XL.

Bug: 3005211
Change-Id: I468b7d45aceda8fbdc72f723c95c3818c8da20f5
This commit is contained in:
Daisuke Miyakawa
2010-09-27 10:38:12 -07:00
parent 2ae97092c4
commit fe3b6bea01
2 changed files with 49 additions and 0 deletions

View File

@@ -19,11 +19,13 @@ package com.android.settings;
import com.android.settings.ZonePicker.ZoneSelectionListener; import com.android.settings.ZonePicker.ZoneSelectionListener;
import android.app.Activity; import android.app.Activity;
import android.app.StatusBarManager;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Settings; import android.provider.Settings;
import android.provider.Settings.SettingNotFoundException; import android.provider.Settings.SettingNotFoundException;
import android.util.Log;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.Window; import android.view.Window;
@@ -39,6 +41,7 @@ import java.util.TimeZone;
public class DateTimeSettingsSetupWizard extends Activity public class DateTimeSettingsSetupWizard extends Activity
implements OnClickListener, ZoneSelectionListener, OnCheckedChangeListener{ implements OnClickListener, ZoneSelectionListener, OnCheckedChangeListener{
private static final String TAG = DateTimeSettingsSetupWizard.class.getSimpleName();
private boolean mXLargeScreenSize; private boolean mXLargeScreenSize;
@@ -50,11 +53,14 @@ public class DateTimeSettingsSetupWizard extends Activity
private DatePicker mDatePicker; private DatePicker mDatePicker;
private InputMethodManager mInputMethodManager; private InputMethodManager mInputMethodManager;
private StatusBarManager mStatusBarManager;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
requestWindowFeature(Window.FEATURE_NO_TITLE); requestWindowFeature(Window.FEATURE_NO_TITLE);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.date_time_settings_setupwizard); setContentView(R.layout.date_time_settings_setupwizard);
mStatusBarManager = (StatusBarManager)getSystemService(Context.STATUS_BAR_SERVICE);
mXLargeScreenSize = (getResources().getConfiguration().screenLayout mXLargeScreenSize = (getResources().getConfiguration().screenLayout
& Configuration.SCREENLAYOUT_SIZE_MASK) & Configuration.SCREENLAYOUT_SIZE_MASK)
@@ -99,6 +105,24 @@ public class DateTimeSettingsSetupWizard extends Activity
((Button)findViewById(R.id.next_button)).setOnClickListener(this); ((Button)findViewById(R.id.next_button)).setOnClickListener(this);
((Button)findViewById(R.id.skip_button)).setOnClickListener(this); ((Button)findViewById(R.id.skip_button)).setOnClickListener(this);
if (mStatusBarManager != null) {
mStatusBarManager.disable(StatusBarManager.DISABLE_EXPAND
| StatusBarManager.DISABLE_NOTIFICATION_ICONS
| StatusBarManager.DISABLE_NOTIFICATION_ALERTS
| StatusBarManager.DISABLE_SYSTEM_INFO
| StatusBarManager.DISABLE_NAVIGATION);
} else {
Log.e(TAG, "StatusBarManager isn't available.");
}
}
@Override
public void onDestroy() {
if (mStatusBarManager != null) {
mStatusBarManager.disable(StatusBarManager.DISABLE_NONE);
}
super.onDestroy();
} }
@Override @Override

View File

@@ -19,8 +19,11 @@ package com.android.settings.wifi;
import com.android.settings.R; import com.android.settings.R;
import android.app.Activity; import android.app.Activity;
import android.app.StatusBarManager;
import android.content.Context;
import android.net.NetworkInfo.DetailedState; import android.net.NetworkInfo.DetailedState;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.Window; import android.view.Window;
@@ -34,6 +37,7 @@ import java.util.EnumMap;
* WifiSetings Activity specific for SetupWizard with X-Large screen size. * WifiSetings Activity specific for SetupWizard with X-Large screen size.
*/ */
public class WifiSettingsForSetupWizardXL extends Activity implements OnClickListener { public class WifiSettingsForSetupWizardXL extends Activity implements OnClickListener {
private static final String TAG = WifiSettingsForSetupWizardXL.class.getSimpleName();
private static final EnumMap<DetailedState, DetailedState> stateMap = private static final EnumMap<DetailedState, DetailedState> stateMap =
new EnumMap<DetailedState, DetailedState>(DetailedState.class); new EnumMap<DetailedState, DetailedState>(DetailedState.class);
@@ -56,6 +60,8 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
private WifiSettings mWifiSettings; private WifiSettings mWifiSettings;
private TextView mStatusText; private TextView mStatusText;
private StatusBarManager mStatusBarManager;
// This count reduces every time when there's a notification about WiFi status change. // This count reduces every time when there's a notification about WiFi status change.
// During the term this is >0, The system shows the message "connecting", regardless // During the term this is >0, The system shows the message "connecting", regardless
// of the actual WiFi status. After this count's becoming 0, the status message correctly // of the actual WiFi status. After this count's becoming 0, the status message correctly
@@ -73,6 +79,25 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
setup(); setup();
// XXX: should we use method? // XXX: should we use method?
getIntent().putExtra(WifiSettings.IN_XL_SETUP_WIZARD, true); getIntent().putExtra(WifiSettings.IN_XL_SETUP_WIZARD, true);
mStatusBarManager = (StatusBarManager)getSystemService(Context.STATUS_BAR_SERVICE);
if (mStatusBarManager != null) {
mStatusBarManager.disable(StatusBarManager.DISABLE_EXPAND
| StatusBarManager.DISABLE_NOTIFICATION_ICONS
| StatusBarManager.DISABLE_NOTIFICATION_ALERTS
| StatusBarManager.DISABLE_SYSTEM_INFO
| StatusBarManager.DISABLE_NAVIGATION);
} else {
Log.e(TAG, "StatusBarManager isn't available.");
}
}
@Override
public void onDestroy() {
if (mStatusBarManager != null) {
mStatusBarManager.disable(StatusBarManager.DISABLE_NONE);
}
super.onDestroy();
} }
public void setup() { public void setup() {