diff options
Diffstat (limited to 'java/res/layout')
| -rw-r--r-- | java/res/layout/dictionary_line.xml | 3 | ||||
| -rw-r--r-- | java/res/layout/setup_steps_cards.xml | 2 | ||||
| -rw-r--r-- | java/res/layout/setup_welcome_title.xml | 2 | ||||
| -rw-r--r-- | java/res/layout/setup_welcome_video.xml | 37 | ||||
| -rw-r--r-- | java/res/layout/setup_wizard.xml | 1 | ||||
| -rw-r--r-- | java/res/layout/user_dictionary_add_word_fullscreen.xml | 6 |
6 files changed, 25 insertions, 26 deletions
diff --git a/java/res/layout/dictionary_line.xml b/java/res/layout/dictionary_line.xml index 26924a52d..7268cd468 100644 --- a/java/res/layout/dictionary_line.xml +++ b/java/res/layout/dictionary_line.xml @@ -55,7 +55,8 @@ <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="5dip"> + android:layout_marginStart="5dip" + android:layout_marginLeft="5dip"> <TextView android:id="@+android:id/summary" diff --git a/java/res/layout/setup_steps_cards.xml b/java/res/layout/setup_steps_cards.xml index 245173122..9b03a3e93 100644 --- a/java/res/layout/setup_steps_cards.xml +++ b/java/res/layout/setup_steps_cards.xml @@ -23,7 +23,7 @@ android:id="@+id/setup_step_bullets" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/setup_step_vertical_padding" + android:paddingTop="@dimen/setup_step_vertical_padding" android:orientation="horizontal"> <TextView android:id="@+id/setup_step1_bullet" diff --git a/java/res/layout/setup_welcome_title.xml b/java/res/layout/setup_welcome_title.xml index 6e6d78147..af7053a37 100644 --- a/java/res/layout/setup_welcome_title.xml +++ b/java/res/layout/setup_welcome_title.xml @@ -27,6 +27,6 @@ <TextView android:id="@+id/setup_welcome_description" android:text="@string/setup_welcome_additional_description" - android:layout_marginTop="12dp" + android:layout_marginTop="@dimen/setup_welcome_description_top_margin" style="@style/setupWelcomeDescritpionStyle" /> </merge> diff --git a/java/res/layout/setup_welcome_video.xml b/java/res/layout/setup_welcome_video.xml index 8c04e637e..751773211 100644 --- a/java/res/layout/setup_welcome_video.xml +++ b/java/res/layout/setup_welcome_video.xml @@ -23,26 +23,29 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingTop="@dimen/setup_welcome_video_vertical_margin" - android:paddingBottom="@dimen/setup_welcome_video_vertical_margin"> - <View - android:layout_weight="@integer/setup_welcome_video_left_padding_weight_in_screen" - android:layout_width="0dp" - android:layout_height="0dp" /> - <VideoView - android:id="@+id/setup_welcome_video" - android:background="@color/setup_background" - android:layout_weight="@integer/setup_welcome_video_weight_in_screen" - android:layout_width="0dp" - android:layout_height="wrap_content" /> - <ImageView - android:id="@+id/setup_welcome_image" - android:visibility="gone" + android:paddingTop="@dimen/setup_welcome_video_top_padding" + android:paddingBottom="@dimen/setup_welcome_video_bottom_padding"> + <LinearLayout android:layout_weight="@integer/setup_welcome_video_weight_in_screen" android:layout_width="0dp" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:orientation="horizontal" + android:padding="1dp" + android:background="@color/setup_welcome_video_margin_color" > + <VideoView + android:id="@+id/setup_welcome_video" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/setup_background" /> + <ImageView + android:id="@+id/setup_welcome_image" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:adjustViewBounds="true" + android:visibility="gone" /> + </LinearLayout> <View - android:layout_weight="@integer/setup_welcome_video_right_padding_weight_in_screen" + android:layout_weight="@integer/setup_welcome_video_end_padding_weight_in_screen" android:layout_width="0dp" android:layout_height="0dp" /> </LinearLayout> diff --git a/java/res/layout/setup_wizard.xml b/java/res/layout/setup_wizard.xml index 176f83630..87db4d012 100644 --- a/java/res/layout/setup_wizard.xml +++ b/java/res/layout/setup_wizard.xml @@ -19,6 +19,7 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/setup_wizard" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/setup_background" diff --git a/java/res/layout/user_dictionary_add_word_fullscreen.xml b/java/res/layout/user_dictionary_add_word_fullscreen.xml index 75e86c509..219485b66 100644 --- a/java/res/layout/user_dictionary_add_word_fullscreen.xml +++ b/java/res/layout/user_dictionary_add_word_fullscreen.xml @@ -19,12 +19,6 @@ android:layout_height="wrap_content" android:orientation="vertical" > - <TextView - style="?android:attr/listSeparatorTextViewStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/user_dict_settings_add_screen_title" /> - <EditText android:id="@+id/user_dictionary_add_word_text" android:layout_width="match_parent" |