PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into honeycomb-release

Browse Source
This commit is contained in:
The Android Automerger
2010-12-08 07:21:46 -08:00
parent 5819d7c05a 126f5ecf4f
commit bbe81278b4
4 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout-xlarge/date_time_settings_setupwizard.xml
View File

@@ -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"

3
res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
View File

@@ -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"

4
res/values/strings.xml
View File

@@ -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. -->

2
src/com/android/settings/DateTimeSettings.java
View File

@@ -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: