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

fix datetime layout for phones and remove orientation locking

Browse Source 
The first fixes the bug, the second was something I noticed
while debugging. We're no longer locking setup wizard orientation
for anything screen size, and so no activities it calls needs
to do that any more, either.

bug: 5642402
Change-Id: I5911223112a19841f6b4754a70148f28a753f736
This commit is contained in:
Freeman Ng
2011-11-21 13:07:08 -08:00
parent 6f0ea441e4
commit 5a82528089
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:layout_width="fill_parent"
android:orientation="vertical"> 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" <LinearLayout android:layout_height="0px"
android:layout_weight="1" android:layout_weight="1"
android:layout_width="fill_parent" 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 // not present in the standard layout
mUsingXLargeLayout = findViewById(R.id.time_zone_button) != null; mUsingXLargeLayout = findViewById(R.id.time_zone_button) != null;
if (mUsingXLargeLayout) { if (mUsingXLargeLayout) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
initUiForXl(); initUiForXl();
} else { } else {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
findViewById(R.id.next_button).setOnClickListener(this); findViewById(R.id.next_button).setOnClickListener(this);
} }
mTimeZoneAdapter = ZonePicker.constructTimezoneAdapter(this, false, mTimeZoneAdapter = ZonePicker.constructTimezoneAdapter(this, false,