From 8b441e3252d422616655a5a9e6ed938ef8ebf817 Mon Sep 17 00:00:00 2001
From: Freeman Ng <tenorslowworm@google.com>
Date: Tue, 7 Dec 2010 10:54:11 -0800
Subject: [PATCH 1/2] remove all keepScreenOn flags from setup wizard flow bug:
 3253922

Change-Id: I71ef24dcb19437d0666ea3206f184e511b5f047e
---
 res/layout-xlarge/date_time_settings_setupwizard.xml    | 1 -
 res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/res/layout-xlarge/date_time_settings_setupwizard.xml b/res/layout-xlarge/date_time_settings_setupwizard.xml
index d9297d01e2c..b690742c8e4 100644
--- a/res/layout-xlarge/date_time_settings_setupwizard.xml
+++ b/res/layout-xlarge/date_time_settings_setupwizard.xml
@@ -19,7 +19,6 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:keepScreenOn="true"
     android:paddingTop="60dip"
     android:paddingLeft="100dip"
     android:paddingRight="100dip"
diff --git a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
index 97b8d2d8125..e438fab0e38 100644
--- a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
@@ -18,7 +18,6 @@
     android:orientation="horizontal"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:keepScreenOn="true"
     android:paddingTop="60dip"
     android:paddingLeft="100dip"
     android:paddingRight="100dip"
@@ -60,7 +59,7 @@
         android:layout_below="@id/wifi_setup_title"
         android:background="@color/divider_color"
         android:layout_marginBottom="5dip" />
-    
+
     <TextView
         android:id="@+id/wifi_setup_status"
         android:layout_width="match_parent"

From 126f5ecf4f5e53c08b0b68a81c44bd9840fd0907 Mon Sep 17 00:00:00 2001
From: Svetoslav Ganov <svetoslavganov@google.com>
Date: Fri, 3 Dec 2010 09:58:20 -0800
Subject: [PATCH 2/2] removing explicit setting of time/date pciker dialogs

Change-Id: Ic92a3de895735fc019ca506f904d63f23c82ec8f
---
 res/values/strings.xml                         | 4 ----
 src/com/android/settings/DateTimeSettings.java | 2 --
 2 files changed, 6 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c709871c818..5df08d7d1a0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -272,10 +272,6 @@
     <string name="date_time_12_hour_sample">1:00 pm</string>
     <!-- Date/time settings.  Summary of the checkbox for choosing between 12 hour time or 24 hour time.  Sample of 24-hour time -->
     <string name="date_time_24_hour_sample">13:00</string>
-    <!-- Title of the dialog for setting the time. -->
-    <string name="date_time_changeTime_text">Change time</string>
-    <!-- Title of the dialog for setting the date. -->
-    <string name="date_time_changeDate_text">Date</string>
     <!-- The title of the activity to pick a time zone. -->
     <string name="choose_timezone">Select time zone</string>
     <!-- Do not translate. Used as the value for a setting. -->
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index 1a37207a9e7..f1edbb91e31 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -220,7 +220,6 @@ public class DateTimeSettings extends SettingsPreferenceFragment
                 calendar.get(Calendar.YEAR),
                 calendar.get(Calendar.MONTH),
                 calendar.get(Calendar.DAY_OF_MONTH));
-            d.setTitle(getResources().getString(R.string.date_time_changeDate_text));
             break;
         }
         case DIALOG_TIMEPICKER: {
@@ -231,7 +230,6 @@ public class DateTimeSettings extends SettingsPreferenceFragment
                     calendar.get(Calendar.HOUR_OF_DAY),
                     calendar.get(Calendar.MINUTE),
                     DateFormat.is24HourFormat(getActivity()));
-            d.setTitle(getResources().getString(R.string.date_time_changeTime_text));
             break;
         }
         default: