Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fa017f8 authored by Freeman Ng's avatar Freeman Ng Committed by Android (Google) Code Review
Browse files

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

parents 2e2c4990 5a825280

res/layout/date_time_settings_setupwizard.xml

+7 −0
Original line number Diff line number Diff line
@@ -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"

src/com/android/settings/DateTimeSettingsSetupWizard.java

+0 −2
Original line number Diff line number Diff line
@@ -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,