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

Merge "fix datetime layout for phones and remove orientation locking" into ics-mr1

Browse Source
This commit is contained in:
Freeman Ng
2011-11-21 16:05:45 -08:00
committed by Android (Google) Code Review
parent 2e2c49901f 5a82528089
commit 2fa017f874
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/layout/date_time_settings_setupwizard.xml
View File

@@ -20,6 +20,13 @@
android:layout_width="fill_parent"
android:orientation="vertical">
<View
android:id="@+id/timezone_dropdown_anchor"
android:layout_width="match_parent"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
android:layout_height="0px" />
<LinearLayout android:layout_height="0px"
android:layout_weight="1"
android:layout_width="fill_parent"

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

@@ -88,10 +88,8 @@ public class DateTimeSettingsSetupWizard extends Activity
// not present in the standard layout
mUsingXLargeLayout = findViewById(R.id.time_zone_button) != null;
if (mUsingXLargeLayout) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
initUiForXl();
} else {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
findViewById(R.id.next_button).setOnClickListener(this);
}
mTimeZoneAdapter = ZonePicker.constructTimezoneAdapter(this, false,