diff options
Diffstat (limited to 'java/res/layout')
| -rw-r--r-- | java/res/layout/dictionary_line.xml | 33 | ||||
| -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 | 32 | ||||
| -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, 44 insertions, 32 deletions
diff --git a/java/res/layout/dictionary_line.xml b/java/res/layout/dictionary_line.xml index 9ddbcf714..7268cd468 100644 --- a/java/res/layout/dictionary_line.xml +++ b/java/res/layout/dictionary_line.xml @@ -52,28 +52,35 @@ android:ellipsize="marquee" android:fadingEdge="horizontal" /> - <TextView - android:id="@+android:id/summary" - android:layout_marginLeft="5dip" - android:layout_marginStart="5dip" + <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?android:attr/textColorSecondary" - android:maxLines="1" /> + android:layout_marginStart="5dip" + android:layout_marginLeft="5dip"> + + <TextView + android:id="@+android:id/summary" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="?android:attr/textColorSecondary" + android:maxLines="1" /> - <!-- <ProgressBar --> - <!-- android:id="@+id/dictionary_line_progress_bar" --> - <!-- style="@android:style/Widget.Holo.ProgressBar.Horizontal" --> - <!-- android:layout_width="match_parent" --> - <!-- android:layout_height="match_parent" --> - <!-- android:gravity="center" /> --> + <com.android.inputmethod.dictionarypack.DictionaryDownloadProgressBar + android:id="@+id/dictionary_line_progress_bar" + style="@android:style/Widget.Holo.ProgressBar.Horizontal" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center" /> + </FrameLayout> </LinearLayout> <com.android.inputmethod.dictionarypack.ButtonSwitcher android:id="@+android:id/wordlist_button_switcher" android:layout_weight="0" + android:layout_marginStart="13dip" + android:layout_marginLeft="13dip" android:layout_width="wrap_content" android:layout_height="wrap_content"> <Button 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 da59ec883..751773211 100644 --- a/java/res/layout/setup_welcome_video.xml +++ b/java/res/layout/setup_welcome_video.xml @@ -22,20 +22,30 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> - <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:orientation="horizontal" + 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_marginTop="@dimen/setup_welcome_video_vertical_margin" - android:layout_marginBottom="@dimen/setup_welcome_video_vertical_margin" 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" |