diff options
32 files changed, 39 insertions, 27 deletions
diff --git a/res/drawable-hdpi/ic_home_google_logo_normal_holo.png b/res/drawable-hdpi/ic_home_google_logo_normal_holo.png Binary files differnew file mode 100644 index 000000000..af783164d --- /dev/null +++ b/res/drawable-hdpi/ic_home_google_logo_normal_holo.png diff --git a/res/drawable-hdpi/ic_home_search_normal_holo.png b/res/drawable-hdpi/ic_home_search_normal_holo.png Binary files differnew file mode 100644 index 000000000..3f64d6823 --- /dev/null +++ b/res/drawable-hdpi/ic_home_search_normal_holo.png diff --git a/res/drawable-hdpi/ic_home_voice_search_holo.png b/res/drawable-hdpi/ic_home_voice_search_holo.png Binary files differnew file mode 100644 index 000000000..dae54464a --- /dev/null +++ b/res/drawable-hdpi/ic_home_voice_search_holo.png diff --git a/res/drawable-hdpi/ic_search_normal_holo.png b/res/drawable-hdpi/ic_search_normal_holo.png Binary files differdeleted file mode 100644 index d888214ec..000000000 --- a/res/drawable-hdpi/ic_search_normal_holo.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_voice_search_holo.png b/res/drawable-hdpi/ic_voice_search_holo.png Binary files differdeleted file mode 100644 index d1ec7e3a8..000000000 --- a/res/drawable-hdpi/ic_voice_search_holo.png +++ /dev/null diff --git a/res/drawable-land-hdpi/ic_home_voice_search_holo.png b/res/drawable-land-hdpi/ic_home_voice_search_holo.png Binary files differnew file mode 100644 index 000000000..5a7fc99e4 --- /dev/null +++ b/res/drawable-land-hdpi/ic_home_voice_search_holo.png diff --git a/res/drawable-land-mdpi/ic_home_voice_search_holo.png b/res/drawable-land-mdpi/ic_home_voice_search_holo.png Binary files differnew file mode 100644 index 000000000..ee7dde52c --- /dev/null +++ b/res/drawable-land-mdpi/ic_home_voice_search_holo.png diff --git a/res/drawable-land-xhdpi/ic_home_voice_search_holo.png b/res/drawable-land-xhdpi/ic_home_voice_search_holo.png Binary files differnew file mode 100644 index 000000000..56bbbbb06 --- /dev/null +++ b/res/drawable-land-xhdpi/ic_home_voice_search_holo.png diff --git a/res/drawable-mdpi/ic_home_google_logo_normal_holo.png b/res/drawable-mdpi/ic_home_google_logo_normal_holo.png Binary files differnew file mode 100644 index 000000000..f298f61c7 --- /dev/null +++ b/res/drawable-mdpi/ic_home_google_logo_normal_holo.png diff --git a/res/drawable-mdpi/ic_home_search_normal_holo.png b/res/drawable-mdpi/ic_home_search_normal_holo.png Binary files differnew file mode 100644 index 000000000..7367c380c --- /dev/null +++ b/res/drawable-mdpi/ic_home_search_normal_holo.png diff --git a/res/drawable-mdpi/ic_home_voice_search_holo.png b/res/drawable-mdpi/ic_home_voice_search_holo.png Binary files differnew file mode 100644 index 000000000..f211a7b9c --- /dev/null +++ b/res/drawable-mdpi/ic_home_voice_search_holo.png diff --git a/res/drawable-mdpi/ic_search_normal_holo.png b/res/drawable-mdpi/ic_search_normal_holo.png Binary files differdeleted file mode 100644 index 9eb214a9d..000000000 --- a/res/drawable-mdpi/ic_search_normal_holo.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_voice_search_holo.png b/res/drawable-mdpi/ic_voice_search_holo.png Binary files differdeleted file mode 100644 index 34097b712..000000000 --- a/res/drawable-mdpi/ic_voice_search_holo.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_home_google_logo_normal_holo.png b/res/drawable-xhdpi/ic_home_google_logo_normal_holo.png Binary files differnew file mode 100644 index 000000000..8079ee5b9 --- /dev/null +++ b/res/drawable-xhdpi/ic_home_google_logo_normal_holo.png diff --git a/res/drawable-xhdpi/ic_home_search_normal_holo.png b/res/drawable-xhdpi/ic_home_search_normal_holo.png Binary files differnew file mode 100644 index 000000000..0fe1cd133 --- /dev/null +++ b/res/drawable-xhdpi/ic_home_search_normal_holo.png diff --git a/res/drawable-xhdpi/ic_home_voice_search_holo.png b/res/drawable-xhdpi/ic_home_voice_search_holo.png Binary files differnew file mode 100644 index 000000000..1fc5cc8bb --- /dev/null +++ b/res/drawable-xhdpi/ic_home_voice_search_holo.png diff --git a/res/drawable-xhdpi/ic_search_google_logo_normal_holo.png b/res/drawable-xhdpi/ic_search_google_logo_normal_holo.png Binary files differdeleted file mode 100644 index b4978ae4d..000000000 --- a/res/drawable-xhdpi/ic_search_google_logo_normal_holo.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_search_normal_holo.png b/res/drawable-xhdpi/ic_search_normal_holo.png Binary files differdeleted file mode 100644 index 0f4caad91..000000000 --- a/res/drawable-xhdpi/ic_search_normal_holo.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_voice_search_holo.png b/res/drawable-xhdpi/ic_voice_search_holo.png Binary files differdeleted file mode 100644 index a4152186d..000000000 --- a/res/drawable-xhdpi/ic_voice_search_holo.png +++ /dev/null diff --git a/res/layout-land/search_bar.xml b/res/layout-land/search_bar.xml index 452a80c22..a1c87e4b2 100644 --- a/res/layout-land/search_bar.xml +++ b/res/layout-land/search_bar.xml @@ -25,7 +25,7 @@ android:id="@+id/search_button" android:layout_width="match_parent" android:layout_height="wrap_content" - android:src="@drawable/ic_search_normal_holo" + android:src="@drawable/ic_home_search_normal_holo" android:adjustViewBounds="true" android:background="?android:attr/selectableItemBackground" android:onClick="onClickSearchButton" @@ -47,7 +47,7 @@ android:id="@+id/voice_button" android:layout_width="match_parent" android:layout_height="wrap_content" - android:src="@drawable/ic_voice_search_holo" + android:src="@drawable/ic_home_voice_search_holo" android:adjustViewBounds="true" android:background="?android:attr/selectableItemBackground" android:onClick="onClickVoiceButton" diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index b45800ef5..963770076 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -25,13 +25,6 @@ <!-- Keep these behind the workspace so that they are not visible when we go into AllApps --> <include - android:id="@+id/qsb_divider" - layout="@layout/workspace_divider" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/qsb_bar_height" - android:layout_gravity="top" /> - <include android:id="@+id/dock_divider" layout="@layout/workspace_divider" android:layout_width="match_parent" diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml index d548453ac..468e94508 100644 --- a/res/layout-port/search_bar.xml +++ b/res/layout-port/search_bar.xml @@ -18,7 +18,9 @@ xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" style="@style/SearchDropTargetBar" android:layout_width="match_parent" - android:layout_height="@dimen/qsb_bar_height"> + android:layout_height="@dimen/search_bar_height" + android:layout_gravity="bottom|center_horizontal" + android:background="@drawable/search_frame"> <!-- Global search icon --> <LinearLayout style="@style/SearchButton" @@ -36,19 +38,19 @@ android:id="@+id/search_button" android:layout_width="wrap_content" android:layout_height="match_parent" - android:src="@drawable/ic_search_normal_holo" + android:src="@drawable/ic_home_search_normal_holo" android:adjustViewBounds="true" /> </LinearLayout> <!-- Voice search icon --> <ImageView - style="@style/SearchButton" + style="@style/SearchButton.Voice" android:id="@+id/voice_button" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentRight="true" android:layout_alignParentTop="true" - android:src="@drawable/ic_voice_search_holo" + android:src="@drawable/ic_home_voice_search_holo" android:adjustViewBounds="true" android:background="?android:attr/selectableItemBackground" android:onClick="onClickVoiceButton" diff --git a/res/layout-sw600dp/search_bar.xml b/res/layout-sw600dp/search_bar.xml index 44ac14cdf..f8b950c59 100644 --- a/res/layout-sw600dp/search_bar.xml +++ b/res/layout-sw600dp/search_bar.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" - android:src="@drawable/ic_search_normal_holo" + android:src="@drawable/ic_home_search_normal_holo" android:background="?android:attr/selectableItemBackground" android:onClick="onClickSearchButton" android:focusable="true" @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toRightOf="@+id/search_divider" - android:src="@drawable/ic_voice_search_holo" + android:src="@drawable/ic_home_voice_search_holo" android:background="?android:attr/selectableItemBackground" android:onClick="onClickVoiceButton" android:focusable="true" diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml index 104da63d6..bb155bdf6 100644 --- a/res/values-land/styles.xml +++ b/res/values-land/styles.xml @@ -60,6 +60,10 @@ <item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item> <item name="android:paddingLeft">@dimen/toolbar_button_horizontal_padding</item> <item name="android:paddingRight">@dimen/toolbar_button_horizontal_padding</item> + <item name="android:shadowColor">#DD000000</item> + <item name="android:shadowDx">0.0</item> + <item name="android:shadowDy">1.0</item> + <item name="android:shadowRadius">4.0</item> </style> <style name="TabIndicator.AppsCustomize"> diff --git a/res/values-port/styles.xml b/res/values-port/styles.xml index 9c5cf7fee..d4736406c 100644 --- a/res/values-port/styles.xml +++ b/res/values-port/styles.xml @@ -18,6 +18,11 @@ --> <resources> +<!-- QSB --> + <style name="SearchButton.Voice"> + <item name="android:paddingLeft">8dp</item> + </style> + <!-- Workspace --> <style name="WorkspaceScreen"> <item name="android:layout_width">wrap_content</item> diff --git a/res/values-sw340dp-land/dimens.xml b/res/values-sw340dp-land/dimens.xml index b08159b50..9b062cd19 100644 --- a/res/values-sw340dp-land/dimens.xml +++ b/res/values-sw340dp-land/dimens.xml @@ -22,8 +22,8 @@ <dimen name="workspace_bottom_padding">-1dp</dimen> <dimen name="workspace_left_padding">-1dp</dimen> <dimen name="workspace_right_padding">-1dp</dimen> - <dimen name="workspace_divider_padding_top">20dp</dimen> - <dimen name="workspace_divider_padding_bottom">20dp</dimen> + <dimen name="workspace_divider_padding_top">8dp</dimen> + <dimen name="workspace_divider_padding_bottom">8dp</dimen> <dimen name="hotseat_width_gap">0dp</dimen> <dimen name="hotseat_height_gap">0dp</dimen> diff --git a/res/values-sw340dp-port/dimens.xml b/res/values-sw340dp-port/dimens.xml index 4894fc43f..a73bb401a 100644 --- a/res/values-sw340dp-port/dimens.xml +++ b/res/values-sw340dp-port/dimens.xml @@ -22,8 +22,8 @@ <dimen name="workspace_bottom_padding">-1dp</dimen> <dimen name="workspace_left_padding">-1dp</dimen> <dimen name="workspace_right_padding">-1dp</dimen> - <dimen name="workspace_divider_padding_left">20dp</dimen> - <dimen name="workspace_divider_padding_right">20dp</dimen> + <dimen name="workspace_divider_padding_left">8dp</dimen> + <dimen name="workspace_divider_padding_right">8dp</dimen> <dimen name="hotseat_width_gap">0dp</dimen> <dimen name="hotseat_height_gap">0dp</dimen> diff --git a/res/values-sw340dp-port/styles.xml b/res/values-sw340dp-port/styles.xml index 84d43df8e..51395b568 100644 --- a/res/values-sw340dp-port/styles.xml +++ b/res/values-sw340dp-port/styles.xml @@ -21,8 +21,15 @@ <!-- Workspace --> <style name="QSBBar"> <item name="android:orientation">horizontal</item> - <item name="android:layout_width">320dp</item> + <item name="android:layout_width">match_parent</item> <item name="android:layout_height">@dimen/qsb_bar_height</item> <item name="android:layout_gravity">top|center_horizontal</item> + <item name="android:layout_marginLeft">@dimen/workspace_divider_padding_left</item> + <item name="android:layout_marginRight">@dimen/workspace_divider_padding_right</item> + </style> + <style name="SearchButton"> + <item name="android:layout_gravity">center_vertical</item> + <item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item> + <item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item> </style> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 512419a9a..e5e1b3f03 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -20,6 +20,7 @@ <!-- Workspace --> <dimen name="qsb_bar_height">40dp</dimen> + <dimen name="search_bar_height">44dp</dimen> <dimen name="workspace_cell_width">80dp</dimen> <dimen name="workspace_cell_height">100dp</dimen> <dimen name="workspace_width_gap">-1dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index b510566e9..9372dbeef 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -145,10 +145,10 @@ <item name="android:paddingRight">25dp</item> <item name="android:textColor">#FFFFFFFF</item> <item name="android:textSize">16sp</item> - <item name="android:shadowColor">#393939</item> + <item name="android:shadowColor">#DD000000</item> <item name="android:shadowDx">0.0</item> - <item name="android:shadowDy">0.0</item> - <item name="android:shadowRadius">2.0</item> + <item name="android:shadowDy">1.0</item> + <item name="android:shadowRadius">4.0</item> </style> <style name="TabIndicator"> diff --git a/src/com/android/launcher2/BubbleTextView.java b/src/com/android/launcher2/BubbleTextView.java index e25ce5cc9..79e27b0d3 100644 --- a/src/com/android/launcher2/BubbleTextView.java +++ b/src/com/android/launcher2/BubbleTextView.java @@ -43,8 +43,8 @@ public class BubbleTextView extends TextView { static final float SHADOW_LARGE_RADIUS = 4.0f; static final float SHADOW_SMALL_RADIUS = 1.75f; static final float SHADOW_Y_OFFSET = 2.0f; - static final int SHADOW_LARGE_COLOUR = 0xCC000000; - static final int SHADOW_SMALL_COLOUR = 0xBB000000; + static final int SHADOW_LARGE_COLOUR = 0xDD000000; + static final int SHADOW_SMALL_COLOUR = 0xCC000000; static final float PADDING_H = 8.0f; static final float PADDING_V = 3.0f; diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 28fdb90d3..a4dcaa1c0 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2572,7 +2572,7 @@ public final class Launcher extends Activity if (activityName != null) { int coi = getCurrentOrientationIndexForGlobalIcons(); sGlobalSearchIcon[coi] = updateButtonWithIconFromExternalActivity( - R.id.search_button, activityName, R.drawable.ic_search_normal_holo); + R.id.search_button, activityName, R.drawable.ic_home_search_normal_holo); searchButton.setVisibility(View.VISIBLE); if (searchDivider != null) searchDivider.setVisibility(View.VISIBLE); } else { @@ -2596,7 +2596,7 @@ public final class Launcher extends Activity if (activityName != null) { int coi = getCurrentOrientationIndexForGlobalIcons(); sVoiceSearchIcon[coi] = updateButtonWithIconFromExternalActivity( - R.id.voice_button, activityName, R.drawable.ic_voice_search_holo); + R.id.voice_button, activityName, R.drawable.ic_home_voice_search_holo); if (searchDivider != null) searchDivider.setVisibility(View.VISIBLE); voiceButton.setVisibility(View.VISIBLE); } else { |
