diff options
Diffstat (limited to 'res/layout-sw600dp-land')
7 files changed, 33 insertions, 33 deletions
diff --git a/res/layout-sw600dp-land/choose_lock_password.xml b/res/layout-sw600dp-land/choose_lock_password.xml index 3895529..05d4a24 100644 --- a/res/layout-sw600dp-land/choose_lock_password.xml +++ b/res/layout-sw600dp-land/choose_lock_password.xml @@ -34,11 +34,11 @@ android:layout_height="wrap_content" android:layout_weight="1" android:orientation="horizontal" - android:layout_marginRight="6dip" - android:layout_marginLeft="6dip" + android:layout_marginEnd="6dip" + android:layout_marginStart="6dip" android:layout_marginTop="10dip" android:layout_marginBottom="10dip" - android:gravity="left" + android:gravity="start" android:ellipsize="marquee" android:textAppearance="?android:attr/textAppearanceLarge" /> @@ -66,7 +66,7 @@ <!-- confirm / restart buttons --> <LinearLayout style="@style/SecurityPreferenceButtonContainer" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" android:orientation="horizontal"> diff --git a/res/layout-sw600dp-land/choose_lock_pattern.xml b/res/layout-sw600dp-land/choose_lock_pattern.xml index a32a5fb..506570d 100644 --- a/res/layout-sw600dp-land/choose_lock_pattern.xml +++ b/res/layout-sw600dp-land/choose_lock_pattern.xml @@ -49,15 +49,15 @@ android:layout_height="wrap_content" android:layout_below="@id/headerText" android:layout_marginTop="16dip" - android:layout_toRightOf="@id/lockPattern" - android:layout_marginLeft="100dip" + android:layout_toEndOf="@id/lockPattern" + android:layout_marginStart="100dip" android:textAppearance="?android:attr/textAppearanceLarge" android:visibility="gone"/> <!-- confirm / restart buttons --> <LinearLayout android:id="@+id/buttonContainer" style="@style/SecurityPreferenceButtonContainer" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" android:orientation="horizontal"> @@ -79,7 +79,7 @@ android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_marginTop="20dip" - android:layout_marginLeft="20dip" + android:layout_marginStart="20dip" android:layout_above="@id/buttonContainer" android:gravity="center_vertical|center_horizontal"> diff --git a/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml b/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml index 1320ba0..00ef039 100644 --- a/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml +++ b/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml @@ -46,7 +46,7 @@ <!-- navigation buttons --> <LinearLayout android:id="@+id/buttonContainer" style="@style/SecurityPreferenceButtonContainer" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" android:orientation="horizontal"> @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_marginTop="20dip" - android:layout_marginLeft="20dip" + android:layout_marginStart="20dip" android:gravity="center_vertical|center_horizontal" android:layout_above="@id/buttonContainer"> diff --git a/res/layout-sw600dp-land/confirm_lock_password.xml b/res/layout-sw600dp-land/confirm_lock_password.xml index c4472db..5844a60 100644 --- a/res/layout-sw600dp-land/confirm_lock_password.xml +++ b/res/layout-sw600dp-land/confirm_lock_password.xml @@ -35,11 +35,11 @@ android:layout_height="wrap_content" android:layout_weight="1" android:orientation="horizontal" - android:layout_marginRight="6dip" - android:layout_marginLeft="6dip" + android:layout_marginEnd="6dip" + android:layout_marginStart="6dip" android:layout_marginTop="10dip" android:layout_marginBottom="10dip" - android:gravity="left" + android:gravity="start" android:ellipsize="marquee" android:textAppearance="?android:attr/textAppearanceLarge" /> @@ -67,7 +67,7 @@ <!-- confirm / restart buttons --> <LinearLayout style="@style/SecurityPreferenceButtonContainer" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" android:orientation="horizontal"> diff --git a/res/layout-sw600dp-land/confirm_lock_pattern.xml b/res/layout-sw600dp-land/confirm_lock_pattern.xml index 3e642d5..627ff02 100644 --- a/res/layout-sw600dp-land/confirm_lock_pattern.xml +++ b/res/layout-sw600dp-land/confirm_lock_pattern.xml @@ -45,7 +45,7 @@ <!-- confirm / restart buttons --> <LinearLayout android:id="@+id/buttonContainer" style="@style/SecurityPreferenceButtonContainer" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" android:orientation="horizontal" android:visibility="invisible"> @@ -76,7 +76,7 @@ android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_marginTop="20dip" - android:layout_marginLeft="20dip" + android:layout_marginStart="20dip" android:layout_above="@id/footerText" android:gravity="center_vertical|center_horizontal"> diff --git a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml index a8f5651..81222cc 100644 --- a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml +++ b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml @@ -43,9 +43,9 @@ <TextView android:id="@+id/passwordLabel" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:layout_toRightOf="@+id/encroid" + android:layout_toEndOf="@+id/encroid" android:layout_centerVertical="true" - android:paddingRight="17dip" + android:paddingEnd="17dip" android:singleLine="true" android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/crypt_keeper_enter_password" @@ -55,7 +55,7 @@ <LinearLayout android:layout_height="wrap_content" android:layout_width="320dip" - android:layout_toRightOf="@+id/passwordLabel" + android:layout_toEndOf="@+id/passwordLabel" android:layout_centerVertical="true" android:orientation="horizontal" > diff --git a/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml b/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml index 8094b74..70d868a 100644 --- a/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml +++ b/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml @@ -21,8 +21,8 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:paddingTop="60dip" - android:paddingLeft="@dimen/screen_margin_sides" - android:paddingRight="@dimen/screen_margin_sides" + android:paddingStart="@dimen/screen_margin_sides" + android:paddingEnd="@dimen/screen_margin_sides" android:paddingBottom="0dip" > <FrameLayout @@ -42,9 +42,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:minHeight="48dip" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_centerVertical="true" - android:layout_marginLeft="16dip" + android:layout_marginStart="16dip" android:layout_below="@id/top_padding_layout" android:textSize="32dip" android:textColor="@color/title_color" @@ -88,7 +88,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/top_divider" - android:layout_alignLeft="@id/dummy_for_left_edge" + android:layout_alignStart="@id/dummy_for_left_edge" android:layout_centerHorizontal="true"> <!-- Padding for @id/content shown when keyboard isn't available --> @@ -115,7 +115,7 @@ android:layout_height="wrap_content" android:minHeight="160dip" android:layout_marginTop="10dip" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:visibility="gone" /> <LinearLayout android:id="@+id/connecting_status_layout" @@ -174,7 +174,7 @@ android:layout_height="3dip" android:layout_marginBottom="16dip" android:layout_below="@id/bottom_padding_layout" - android:layout_alignLeft="@id/content" + android:layout_alignStart="@id/content" android:background="@color/divider_color" /> <!-- TODO: fix this --> <RelativeLayout @@ -182,21 +182,21 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/bottom_divider" - android:layout_alignLeft="@id/bottom_divider" - android:layout_alignParentRight="true" + android:layout_alignStart="@id/bottom_divider" + android:layout_alignParentEnd="true" android:layout_alignParentBottom="true"> <Button android:id="@+id/wifi_setup_add_network" style="@style/setup_wizard_button" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:text="@string/wifi_setup_add_network" android:enabled="false" /> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:orientation="horizontal"> <!-- This misleading name is for keeping consistency between non-XL @@ -208,20 +208,20 @@ <Button android:id="@+id/wifi_setup_connect" style="@style/setup_wizard_button" - android:layout_marginLeft="16dip" + android:layout_marginStart="16dip" android:text="@string/wifi_setup_connect" android:enabled="false" android:visibility="gone" /> <Button android:id="@+id/wifi_setup_refresh_list" style="@style/setup_wizard_button" - android:layout_marginLeft="16dip" + android:layout_marginStart="16dip" android:text="@string/wifi_setup_refresh_list" android:enabled="false" /> <Button android:id="@+id/wifi_setup_skip_or_next" style="@style/setup_wizard_button" - android:layout_marginLeft="16dip" + android:layout_marginStart="16dip" android:text="@string/wifi_setup_skip" /> </LinearLayout> </RelativeLayout> |