am 4b7c4677: am 24e38f1b: Merge "Add WindowOrientationListener log enable/disable checkbox." into honeycomb

* commit '4b7c4677642eb3d446924de5a52fc035c72eb7eb':
  Add WindowOrientationListener log enable/disable checkbox.
This commit is contained in:
Jeff Brown
2011-01-24 16:24:34 -08:00
committed by Android Git Automerger
3 changed files with 32 additions and 1 deletions

View File

@@ -161,7 +161,14 @@
android:layout_below="@id/font_hinting" android:layout_below="@id/font_hinting"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:text="@string/development_settings_show_xmpp_text" /> android:text="@string/development_settings_show_xmpp_text" />
<CheckBox android:id="@+id/window_orientation_listener_log"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/show_xmpp"
android:layout_alignParentLeft="true"
android:text="@string/development_settings_window_orientation_listener_log" />
</RelativeLayout> </RelativeLayout>
</ScrollView> </ScrollView>

View File

@@ -113,6 +113,7 @@
<string name="development_settings_debug_app_label_text">Debug App:</string> <string name="development_settings_debug_app_label_text">Debug App:</string>
<string name="development_settings_show_sleep_text">Show sleep state on LED</string> <string name="development_settings_show_sleep_text">Show sleep state on LED</string>
<string name="development_settings_keep_screen_on_text">Keep screen on while plugged in</string> <string name="development_settings_keep_screen_on_text">Keep screen on while plugged in</string>
<string name="development_settings_window_orientation_listener_log">Enable window orientation listener log</string>
<string name="monkey_screen_initialActivity_text"></string> <string name="monkey_screen_initialActivity_text"></string>
<string name="monkey_screen_number_of_events_label">Number of Events: </string> <string name="monkey_screen_number_of_events_label">Number of Events: </string>

View File

@@ -64,6 +64,7 @@ public class DevelopmentSettings extends Activity {
private CheckBox mShowBackgroundCB; private CheckBox mShowBackgroundCB;
private CheckBox mShowSleepCB; private CheckBox mShowSleepCB;
private CheckBox mShowXmppCB; private CheckBox mShowXmppCB;
private CheckBox mWindowOrientationListenerLogCB;
private CheckBox mCompatibilityModeCB; private CheckBox mCompatibilityModeCB;
private Spinner mMaxProcsSpinner; private Spinner mMaxProcsSpinner;
private Spinner mWindowAnimationScaleSpinner; private Spinner mWindowAnimationScaleSpinner;
@@ -74,6 +75,7 @@ public class DevelopmentSettings extends Activity {
private boolean mWaitForDebugger; private boolean mWaitForDebugger;
private boolean mAlwaysFinish; private boolean mAlwaysFinish;
private int mPointerLocation; private int mPointerLocation;
private int mWindowOrientationListenerLog;
private int mProcessLimit; private int mProcessLimit;
private boolean mShowSleep; private boolean mShowSleep;
private boolean mShowXmpp; private boolean mShowXmpp;
@@ -136,6 +138,8 @@ public class DevelopmentSettings extends Activity {
mShowSleepCB.setOnClickListener(mShowSleepClicked); mShowSleepCB.setOnClickListener(mShowSleepClicked);
mShowXmppCB = (CheckBox)findViewById(R.id.show_xmpp); mShowXmppCB = (CheckBox)findViewById(R.id.show_xmpp);
mShowXmppCB.setOnClickListener(mShowXmppClicked); mShowXmppCB.setOnClickListener(mShowXmppClicked);
mWindowOrientationListenerLogCB = (CheckBox)findViewById(R.id.window_orientation_listener_log);
mWindowOrientationListenerLogCB.setOnClickListener(mWindowOrientationListenerLogClicked);
mCompatibilityModeCB = (CheckBox)findViewById(R.id.compatibility_mode); mCompatibilityModeCB = (CheckBox)findViewById(R.id.compatibility_mode);
mCompatibilityModeCB.setOnClickListener(mCompatibilityModeClicked); mCompatibilityModeCB.setOnClickListener(mCompatibilityModeClicked);
mMaxProcsSpinner = (Spinner)findViewById(R.id.max_procs); mMaxProcsSpinner = (Spinner)findViewById(R.id.max_procs);
@@ -203,6 +207,7 @@ public class DevelopmentSettings extends Activity {
updateFlingerOptions(); updateFlingerOptions();
updateSleepOptions(); updateSleepOptions();
updateXmppOptions(); updateXmppOptions();
updateWindowOrientationListenerLogOptions();
updateCompatibilityOptions(); updateCompatibilityOptions();
try { try {
@@ -261,6 +266,17 @@ public class DevelopmentSettings extends Activity {
mPointerLocationSpinner.setSelection(mPointerLocation); mPointerLocationSpinner.setSelection(mPointerLocation);
} }
private void writeWindowOrientationListenerLogOptions() {
Settings.System.putInt(getContentResolver(),
Settings.System.WINDOW_ORIENTATION_LISTENER_LOG, mWindowOrientationListenerLog);
}
private void updateWindowOrientationListenerLogOptions() {
mWindowOrientationListenerLog = Settings.System.getInt(getContentResolver(),
Settings.System.WINDOW_ORIENTATION_LISTENER_LOG, 0);
mWindowOrientationListenerLogCB.setChecked(mWindowOrientationListenerLog != 0);
}
// Returns the current state of the system property that controls // Returns the current state of the system property that controls
// strictmode flashes. One of: // strictmode flashes. One of:
// 0: not explicitly set one way or another // 0: not explicitly set one way or another
@@ -478,6 +494,13 @@ public class DevelopmentSettings extends Activity {
} }
}; };
private View.OnClickListener mWindowOrientationListenerLogClicked = new View.OnClickListener() {
public void onClick(View v) {
mWindowOrientationListenerLog = ((CheckBox)v).isChecked() ? 1 : 0;
writeWindowOrientationListenerLogOptions();
}
};
private Spinner.OnItemSelectedListener mPointerLocationChanged private Spinner.OnItemSelectedListener mPointerLocationChanged
= new Spinner.OnItemSelectedListener() { = new Spinner.OnItemSelectedListener() {
public void onItemSelected(android.widget.AdapterView av, View v, public void onItemSelected(android.widget.AdapterView av, View v,