From da40cc28d9156d89392dedd83d827967ff6ffb7f Mon Sep 17 00:00:00 2001
From: Daisuke Miyakawa <dmiyakawa@google.com>
Date: Wed, 15 Dec 2010 11:56:35 -0800
Subject: [PATCH] Remove skip button from datetime settings

Also force landscape mode in XLarge screen.

Bug: 3285153
Change-Id: I9f4a0de6a36d0be2b5f80b734a4910f4bb154905
---
 res/layout-xlarge/date_time_settings_setupwizard.xml      | 4 +++-
 src/com/android/settings/DateTimeSettingsSetupWizard.java | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/res/layout-xlarge/date_time_settings_setupwizard.xml b/res/layout-xlarge/date_time_settings_setupwizard.xml
index b690742c8e4..de2065b248c 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 ad529f9469c..73cba0304e1 100644
--- a/src/com/android/settings/DateTimeSettingsSetupWizard.java
+++ b/src/com/android/settings/DateTimeSettingsSetupWizard.java
@@ -20,6 +20,7 @@ import android.app.Activity;
 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 @@ public class DateTimeSettingsSetupWizard extends Activity
         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);