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

Commit 5ed50af0 authored by Maurice Lam's avatar Maurice Lam
Browse files

Clean up DatetimeSettingsSetupWizard 

Test: Clean up. Existing tests pass
Bug: 32516406
Change-Id: Id7361f6eee26a30d179277c1d425b2f61a99d07d
parent 5abaef7d

AndroidManifest.xml

+0 −9
Original line number Diff line number Diff line
@@ -560,15 +560,6 @@ 
                android:value="true" />

        </activity>



        <activity android:name="DateTimeSettingsSetupWizard"

                  android:label="@string/date_and_time"

                  android:theme="@android:style/Theme.DeviceDefault.Light.NoActionBar"

                  android:screenOrientation="behind">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

            </intent-filter>

        </activity>



        <activity android:name="Settings$LocalePickerActivity"

                android:label="@string/language_picker_title"

                android:icon="@drawable/ic_settings_language"

res/layout-sw600dp/date_time_settings_setupwizard.xml

deleted100644 → 0
+0 −68
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/layout_root"

        android:layout_height="match_parent"

        android:layout_width="match_parent"

        android:paddingTop="96dip"

        android:paddingStart="40dip"

        android:paddingEnd="40dip"

        android:paddingBottom="96dip"

        android:orientation="vertical">



    <FrameLayout android:id="@+id/timezone_dropdown_anchor"

            android:layout_height="0px"

            android:layout_width="match_parent"

            android:layout_marginStart="40dip"

            android:layout_marginEnd="40dip"/>



    <LinearLayout android:layout_height="0px"

                  android:layout_weight="1"

                  android:layout_width="match_parent"

                  android:orientation="vertical">



        <fragment android:id="@+id/date_time_settings_fragment"

                  class="com.android.settings.DateTimeSettings"

                  android:layout_width="match_parent"

                  android:layout_height="match_parent" />



    </LinearLayout>



    <RelativeLayout android:layout_height="wrap_content"

                    android:layout_weight="0"

                    android:layout_width="match_parent">



        <View

            android:id="@+id/bottom_divider"

            android:layout_height="3dip"

            android:layout_width="match_parent"

            android:layout_marginTop="0dip"

            android:layout_marginBottom="16dip"

            android:background="@color/divider_color"

            android:layout_above="@+id/next_button"/>



        <Button android:id="@+id/next_button"

            android:layout_width="wrap_content"

            android:minWidth="208dip"

            android:layout_height="48dip"

            android:layout_marginTop="10dip"

            android:layout_alignParentEnd="true"

            android:text="@string/next_label"/>



    </RelativeLayout>



</LinearLayout>

res/layout-sw720dp/date_time_settings_setupwizard.xml

deleted100644 → 0
+0 −168
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

  -->

<RelativeLayout

    android:id="@+id/layout_root"

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingTop="@dimen/datetime_margin_top"

    android:paddingStart="@dimen/screen_margin_sides"

    android:paddingEnd="@dimen/screen_margin_sides"

    android:paddingBottom="@dimen/datetime_margin_bottom">



    <!-- Title: Set date & time-->

    <TextView

        android:id="@+id/title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:minHeight="48dip"

        android:layout_alignParentStart="true"

        android:layout_marginStart="16dip"

        android:layout_alignParentTop="true"

        android:textSize="32dip"

        android:textColor="@color/title_color"

        android:text="@string/date_and_time_settings_title_setup_wizard"

        android:gravity="bottom" />



    <!-- Divider -->

    <View

        android:id="@+id/top_divider"

        android:layout_width="match_parent"

        android:layout_height="3dip"

        android:layout_below="@id/title"

        android:layout_marginTop="6dip"

        android:layout_marginBottom="17dip"

        android:background="@color/divider_color" />



    <RelativeLayout

        android:id="@+id/timezone_auto_time"

        android:layout_width="716dip"

        android:layout_height="wrap_content"

        android:layout_centerHorizontal="true"

        android:layout_below="@id/top_divider">

        <!-- timezone -->

        <Button

            android:id="@+id/time_zone_button"

            style="?android:attr/dropDownSpinnerStyle"

            android:layout_width="304dip"

            android:layout_height="48dip"

            android:layout_alignParentStart="true"

            android:layout_alignBottom="@+id/date_time_auto"

            android:gravity="start|center_vertical"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textSize="20dip" />



        <LinearLayout

            android:id="@+id/date_time_auto"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:layout_toEndOf="@id/time_zone_button"

            android:layout_marginStart="32dip"

            android:layout_alignParentEnd="true">



            <Switch

                android:id="@+id/date_time_auto_button"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:minHeight="?android:attr/listPreferredItemHeight"

                android:layout_marginStart="16dip"

                android:text="@string/date_time_auto"

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:textSize="20dip" />



            <!-- Divider -->

            <View

                android:layout_width="match_parent"

                android:layout_height="1px"

                android:background="@color/divider_color" />

        </LinearLayout>

    </RelativeLayout>



    <LinearLayout

        android:layout_width="624dip"

        android:layout_height="wrap_content"

        android:layout_centerHorizontal="true"

        android:layout_below="@+id/timezone_auto_time"

        android:layout_marginTop="48dip"

        android:orientation="horizontal">



        <LinearLayout

            android:layout_width="312dip"

            android:layout_height="wrap_content"

            android:orientation="vertical">

            <TextView

                android:id="@+id/date_picker_title"

                android:layout_width="match_parent"

                android:layout_height="48dip"

                android:text="@string/date_picker_title"

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:textSize="20dip"

                android:clickable="false"

                android:longClickable="false"

                android:gravity="center" />

            <DatePicker

                android:id="@+id/date_picker"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_below="@id/date_picker_title" />

        </LinearLayout>



        <!-- divider -->

        <View

            android:id="@+id/center_divider"

            android:layout_width="1dip"

            android:layout_height="match_parent"

            android:background="@color/divider_color" />



        <LinearLayout

            android:layout_width="312dip"

            android:layout_height="wrap_content"

            android:orientation="vertical">

            <TextView

                android:id="@+id/time_picker_title"

                android:layout_width="match_parent"

                android:layout_height="48dip"

                android:text="@string/time_picker_title"

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:textSize="20dip"

                android:gravity="center" />



            <TimePicker

                android:id="@+id/time_picker"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_below="@id/time_picker_title" />

        </LinearLayout>

    </LinearLayout>



    <View

        android:id="@+id/bottom_divider"

        android:layout_width="match_parent"

        android:layout_height="3dip"

        android:layout_alignStart="@id/timezone_auto_time"

        android:layout_above="@+id/next_button"

        android:layout_marginBottom="16dip"

        android:background="@color/divider_color" />



    <Button

        android:id="@+id/next_button"

        style="@style/setup_wizard_button"

        android:layout_alignParentBottom="true"

        android:layout_alignParentEnd="true"

        android:text="@string/next_label" />

</RelativeLayout>

res/layout/date_time_settings_setupwizard.xml

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/layout_root"

        android:layout_height="fill_parent"

        android:layout_width="fill_parent"

        android:orientation="vertical">



    <View

        android:id="@+id/timezone_dropdown_anchor"

        android:layout_width="match_parent"

        android:layout_marginStart="20dip"

        android:layout_marginEnd="20dip"

        android:layout_height="0px" />



    <LinearLayout android:layout_height="0px"

                  android:layout_weight="1"

                  android:layout_width="fill_parent"

                  android:orientation="vertical">

        <fragment android:id="@+id/date_time_settings_fragment"

                  class="com.android.settings.DateTimeSettings"

                  android:layout_width="fill_parent"

                  android:layout_height="fill_parent" />

    </LinearLayout>



    <RelativeLayout android:layout_height="wrap_content"

                    android:layout_weight="0"

                    android:padding="10dip"

                    android:layout_width="fill_parent">



        <Button android:id="@+id/next_button"

            android:layout_width="150dip"

            android:layout_height="wrap_content"

            android:layout_alignParentEnd="true"

            android:text="@string/next_label"

        />



    </RelativeLayout>



</LinearLayout>