diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-land-hdpi/bg_cling1.png | bin | 0 -> 671 bytes | |||
| -rw-r--r-- | res/drawable-land-hdpi/bg_cling2.png | bin | 0 -> 639 bytes | |||
| -rw-r--r-- | res/drawable-land-hdpi/bg_cling3.png | bin | 0 -> 765 bytes | |||
| -rw-r--r-- | res/drawable-land-hdpi/hotseat_bg_panel.9.png | bin | 159 -> 171 bytes | |||
| -rw-r--r-- | res/drawable-land-mdpi/bg_cling1.png | bin | 0 -> 509 bytes | |||
| -rw-r--r-- | res/drawable-land-mdpi/bg_cling2.png | bin | 0 -> 484 bytes | |||
| -rw-r--r-- | res/drawable-land-mdpi/bg_cling3.png | bin | 0 -> 621 bytes | |||
| -rw-r--r-- | res/drawable-land-mdpi/hotseat_bg_panel.9.png | bin | 158 -> 167 bytes | |||
| -rw-r--r-- | res/drawable-land-xhdpi/bg_cling1.png | bin | 0 -> 815 bytes | |||
| -rw-r--r-- | res/drawable-land-xhdpi/bg_cling2.png | bin | 0 -> 794 bytes | |||
| -rw-r--r-- | res/drawable-land-xhdpi/bg_cling3.png | bin | 0 -> 1074 bytes | |||
| -rw-r--r-- | res/drawable-land-xhdpi/hotseat_bg_panel.9.png | bin | 177 -> 190 bytes | |||
| -rw-r--r-- | res/layout-land/folder_cling.xml | 17 | ||||
| -rw-r--r-- | res/layout-port/search_bar.xml | 20 | ||||
| -rw-r--r-- | res/values-sw340dp-port/dimens.xml | 3 | ||||
| -rw-r--r-- | res/values/dimens.xml | 2 |
16 files changed, 20 insertions, 22 deletions
diff --git a/res/drawable-land-hdpi/bg_cling1.png b/res/drawable-land-hdpi/bg_cling1.png Binary files differnew file mode 100644 index 0000000..7123c5c --- /dev/null +++ b/res/drawable-land-hdpi/bg_cling1.png diff --git a/res/drawable-land-hdpi/bg_cling2.png b/res/drawable-land-hdpi/bg_cling2.png Binary files differnew file mode 100644 index 0000000..889b627 --- /dev/null +++ b/res/drawable-land-hdpi/bg_cling2.png diff --git a/res/drawable-land-hdpi/bg_cling3.png b/res/drawable-land-hdpi/bg_cling3.png Binary files differnew file mode 100644 index 0000000..4ff338c --- /dev/null +++ b/res/drawable-land-hdpi/bg_cling3.png diff --git a/res/drawable-land-hdpi/hotseat_bg_panel.9.png b/res/drawable-land-hdpi/hotseat_bg_panel.9.png Binary files differindex c7602cd..90177f8 100644 --- a/res/drawable-land-hdpi/hotseat_bg_panel.9.png +++ b/res/drawable-land-hdpi/hotseat_bg_panel.9.png diff --git a/res/drawable-land-mdpi/bg_cling1.png b/res/drawable-land-mdpi/bg_cling1.png Binary files differnew file mode 100644 index 0000000..f5faeb4 --- /dev/null +++ b/res/drawable-land-mdpi/bg_cling1.png diff --git a/res/drawable-land-mdpi/bg_cling2.png b/res/drawable-land-mdpi/bg_cling2.png Binary files differnew file mode 100644 index 0000000..963967d --- /dev/null +++ b/res/drawable-land-mdpi/bg_cling2.png diff --git a/res/drawable-land-mdpi/bg_cling3.png b/res/drawable-land-mdpi/bg_cling3.png Binary files differnew file mode 100644 index 0000000..921831a --- /dev/null +++ b/res/drawable-land-mdpi/bg_cling3.png diff --git a/res/drawable-land-mdpi/hotseat_bg_panel.9.png b/res/drawable-land-mdpi/hotseat_bg_panel.9.png Binary files differindex d745bb3..83c4a55 100644 --- a/res/drawable-land-mdpi/hotseat_bg_panel.9.png +++ b/res/drawable-land-mdpi/hotseat_bg_panel.9.png diff --git a/res/drawable-land-xhdpi/bg_cling1.png b/res/drawable-land-xhdpi/bg_cling1.png Binary files differnew file mode 100644 index 0000000..2282117 --- /dev/null +++ b/res/drawable-land-xhdpi/bg_cling1.png diff --git a/res/drawable-land-xhdpi/bg_cling2.png b/res/drawable-land-xhdpi/bg_cling2.png Binary files differnew file mode 100644 index 0000000..5243889 --- /dev/null +++ b/res/drawable-land-xhdpi/bg_cling2.png diff --git a/res/drawable-land-xhdpi/bg_cling3.png b/res/drawable-land-xhdpi/bg_cling3.png Binary files differnew file mode 100644 index 0000000..08475f7 --- /dev/null +++ b/res/drawable-land-xhdpi/bg_cling3.png diff --git a/res/drawable-land-xhdpi/hotseat_bg_panel.9.png b/res/drawable-land-xhdpi/hotseat_bg_panel.9.png Binary files differindex acbe24a..8718040 100644 --- a/res/drawable-land-xhdpi/hotseat_bg_panel.9.png +++ b/res/drawable-land-xhdpi/hotseat_bg_panel.9.png diff --git a/res/layout-land/folder_cling.xml b/res/layout-land/folder_cling.xml index 91d34ad..3d7f4f4 100644 --- a/res/layout-land/folder_cling.xml +++ b/res/layout-land/folder_cling.xml @@ -20,8 +20,8 @@ <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginLeft="40dp" - android:layout_marginTop="40dp"> + android:layout_marginLeft="20dp" + android:layout_marginTop="20dp"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -32,21 +32,12 @@ android:text="@string/folder_cling_title" /> <TextView style="@style/ClingText" - android:id="@+id/folder_cling_move_item" + android:id="@+id/folder_cling_create_folder" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/folder_cling_move_item" /> + android:text="@string/folder_cling_create_folder" /> </LinearLayout> </FrameLayout> - <TextView - style="@style/ClingText" - android:id="@+id/folder_cling_create_folder" - android:layout_width="340dp" - android:layout_height="wrap_content" - android:layout_marginLeft="40dp" - android:layout_marginBottom="40dp" - android:layout_gravity="bottom" - android:text="@string/folder_cling_create_folder" /> <Button style="@style/ClingButton" android:id="@+id/cling_dismiss" diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml index 468e945..dbacd3d 100644 --- a/res/layout-port/search_bar.xml +++ b/res/layout-port/search_bar.xml @@ -28,7 +28,7 @@ android:layout_height="match_parent" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" - android:layout_toLeftOf="@+id/voice_button" + android:layout_toLeftOf="@+id/voice_button_container" android:background="?android:attr/selectableItemBackground" android:onClick="onClickSearchButton" android:focusable="true" @@ -43,18 +43,24 @@ </LinearLayout> <!-- Voice search icon --> - <ImageView + <LinearLayout style="@style/SearchButton.Voice" - android:id="@+id/voice_button" - android:layout_width="wrap_content" + android:id="@+id/voice_button_container" + android:layout_width="@dimen/search_bar_height" android:layout_height="match_parent" android:layout_alignParentRight="true" android:layout_alignParentTop="true" - android:src="@drawable/ic_home_voice_search_holo" - android:adjustViewBounds="true" + android:gravity="right" android:background="?android:attr/selectableItemBackground" android:onClick="onClickVoiceButton" android:focusable="true" android:clickable="true" - android:contentDescription="@string/accessibility_voice_search_button" /> + android:contentDescription="@string/accessibility_voice_search_button"> + <ImageView + android:id="@+id/voice_button" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:src="@drawable/ic_home_voice_search_holo" + android:adjustViewBounds="true" /> + </LinearLayout> </RelativeLayout> diff --git a/res/values-sw340dp-port/dimens.xml b/res/values-sw340dp-port/dimens.xml index 3fea47b..ab8cfec 100644 --- a/res/values-sw340dp-port/dimens.xml +++ b/res/values-sw340dp-port/dimens.xml @@ -32,7 +32,8 @@ <dimen name="hotseat_left_padding">-1dp</dimen> <dimen name="hotseat_right_padding">-1dp</dimen> - <dimen name="qsb_bar_height">50dp</dimen> + <dimen name="qsb_bar_height">54dp</dimen> + <dimen name="search_bar_height">48dp</dimen> <!-- height of the bottom row of controls --> <dimen name="button_bar_height">80dip</dimen> <!-- Because portal animations go beyond the bounds of an icon, we need diff --git a/res/values/dimens.xml b/res/values/dimens.xml index e5e1b3f..90c6efa 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -20,7 +20,7 @@ <!-- Workspace --> <dimen name="qsb_bar_height">40dp</dimen> - <dimen name="search_bar_height">44dp</dimen> + <dimen name="search_bar_height">40dp</dimen> <dimen name="workspace_cell_width">80dp</dimen> <dimen name="workspace_cell_height">100dp</dimen> <dimen name="workspace_width_gap">-1dp</dimen> |
