Merge "Revert: Add checkbox to enable PTP USB mode."
diff --git a/res/layout-xlarge/date_time_settings_setupwizard.xml b/res/layout-xlarge/date_time_settings_setupwizard.xml
index b690742..de2065b 100644
--- a/res/layout-xlarge/date_time_settings_setupwizard.xml
+++ b/res/layout-xlarge/date_time_settings_setupwizard.xml
@@ -127,6 +127,7 @@
</RelativeLayout>
</LinearLayout>
+ <!-- TODO: remove this button when we are sure it is needless -->
<Button
android:id="@+id/skip_button"
android:layout_width="250dip"
@@ -135,7 +136,8 @@
android:layout_toLeftOf="@+id/next_button"
android:layout_marginRight="20dip"
android:textSize="24dip"
- android:text="@string/skip_label"/>
+ android:text="@string/skip_label"
+ android:visibility="gone" />
<Button
android:id="@+id/next_button"
diff --git a/src/com/android/settings/DateTimeSettingsSetupWizard.java b/src/com/android/settings/DateTimeSettingsSetupWizard.java
index ad529f9..73cba03 100644
--- a/src/com/android/settings/DateTimeSettingsSetupWizard.java
+++ b/src/com/android/settings/DateTimeSettingsSetupWizard.java
@@ -20,6 +20,7 @@
import android.app.AlarmManager;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.os.Bundle;
import android.provider.Settings;
@@ -91,6 +92,8 @@
mAutoTimeZoneButton.setText(autoTimeZoneEnabled ? R.string.zone_auto_summaryOn :
R.string.zone_auto_summaryOff);*/
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+
final TimeZone tz = TimeZone.getDefault();
mSelectedTimeZone = tz;
mTimeZoneButton = (Button)findViewById(R.id.time_zone_button);