diff options
32 files changed, 103 insertions, 23 deletions
diff --git a/res/drawable-hdpi/quantum_panel.9.png b/res/drawable-hdpi/quantum_panel.9.png Binary files differdeleted file mode 100644 index b4ac9c0a0..000000000 --- a/res/drawable-hdpi/quantum_panel.9.png +++ /dev/null diff --git a/res/drawable-hdpi/quantum_panel_bitmap.9.png b/res/drawable-hdpi/quantum_panel_bitmap.9.png Binary files differnew file mode 100644 index 000000000..c3319290f --- /dev/null +++ b/res/drawable-hdpi/quantum_panel_bitmap.9.png diff --git a/res/drawable-hdpi/quantum_panel_dark.9.png b/res/drawable-hdpi/quantum_panel_dark.9.png Binary files differdeleted file mode 100644 index abaf23026..000000000 --- a/res/drawable-hdpi/quantum_panel_dark.9.png +++ /dev/null diff --git a/res/drawable-hdpi/quantum_panel_dark_bitmap.9.png b/res/drawable-hdpi/quantum_panel_dark_bitmap.9.png Binary files differnew file mode 100644 index 000000000..0145d36b7 --- /dev/null +++ b/res/drawable-hdpi/quantum_panel_dark_bitmap.9.png diff --git a/res/drawable-mdpi/quantum_panel.9.png b/res/drawable-mdpi/quantum_panel.9.png Binary files differdeleted file mode 100644 index c5a6eb735..000000000 --- a/res/drawable-mdpi/quantum_panel.9.png +++ /dev/null diff --git a/res/drawable-mdpi/quantum_panel_bitmap.9.png b/res/drawable-mdpi/quantum_panel_bitmap.9.png Binary files differnew file mode 100644 index 000000000..86be568fd --- /dev/null +++ b/res/drawable-mdpi/quantum_panel_bitmap.9.png diff --git a/res/drawable-mdpi/quantum_panel_dark.9.png b/res/drawable-mdpi/quantum_panel_dark.9.png Binary files differdeleted file mode 100644 index 7728a7268..000000000 --- a/res/drawable-mdpi/quantum_panel_dark.9.png +++ /dev/null diff --git a/res/drawable-mdpi/quantum_panel_dark_bitmap.9.png b/res/drawable-mdpi/quantum_panel_dark_bitmap.9.png Binary files differnew file mode 100644 index 000000000..70429b9fc --- /dev/null +++ b/res/drawable-mdpi/quantum_panel_dark_bitmap.9.png diff --git a/res/drawable-v21/quantum_panel.xml b/res/drawable-v21/quantum_panel.xml new file mode 100644 index 000000000..d1c078335 --- /dev/null +++ b/res/drawable-v21/quantum_panel.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<inset xmlns:android="http://schemas.android.com/apk/res/android" + android:drawable="@drawable/quantum_panel_shape" + android:insetBottom="@dimen/quantum_panel_outer_padding" + android:insetLeft="@dimen/quantum_panel_outer_padding" + android:insetRight="@dimen/quantum_panel_outer_padding" + android:insetTop="@dimen/quantum_panel_outer_padding" /> diff --git a/res/drawable-v21/quantum_panel_dark.xml b/res/drawable-v21/quantum_panel_dark.xml new file mode 100644 index 000000000..405ad5173 --- /dev/null +++ b/res/drawable-v21/quantum_panel_dark.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<inset xmlns:android="http://schemas.android.com/apk/res/android" + android:drawable="@drawable/quantum_panel_shape_dark" + android:insetBottom="@dimen/quantum_panel_outer_padding" + android:insetLeft="@dimen/quantum_panel_outer_padding" + android:insetRight="@dimen/quantum_panel_outer_padding" + android:insetTop="@dimen/quantum_panel_outer_padding" /> diff --git a/res/drawable-xhdpi/quantum_panel.9.png b/res/drawable-xhdpi/quantum_panel.9.png Binary files differdeleted file mode 100644 index 1797ad500..000000000 --- a/res/drawable-xhdpi/quantum_panel.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/quantum_panel_bitmap.9.png b/res/drawable-xhdpi/quantum_panel_bitmap.9.png Binary files differnew file mode 100644 index 000000000..13bdf09ec --- /dev/null +++ b/res/drawable-xhdpi/quantum_panel_bitmap.9.png diff --git a/res/drawable-xhdpi/quantum_panel_dark.9.png b/res/drawable-xhdpi/quantum_panel_dark.9.png Binary files differdeleted file mode 100644 index 4c1868b55..000000000 --- a/res/drawable-xhdpi/quantum_panel_dark.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/quantum_panel_dark_bitmap.9.png b/res/drawable-xhdpi/quantum_panel_dark_bitmap.9.png Binary files differnew file mode 100644 index 000000000..ac2e423f2 --- /dev/null +++ b/res/drawable-xhdpi/quantum_panel_dark_bitmap.9.png diff --git a/res/drawable-xxhdpi/quantum_panel.9.png b/res/drawable-xxhdpi/quantum_panel.9.png Binary files differdeleted file mode 100644 index d7ba87416..000000000 --- a/res/drawable-xxhdpi/quantum_panel.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/quantum_panel_bitmap.9.png b/res/drawable-xxhdpi/quantum_panel_bitmap.9.png Binary files differnew file mode 100644 index 000000000..b44269ea9 --- /dev/null +++ b/res/drawable-xxhdpi/quantum_panel_bitmap.9.png diff --git a/res/drawable-xxhdpi/quantum_panel_dark.9.png b/res/drawable-xxhdpi/quantum_panel_dark.9.png Binary files differdeleted file mode 100644 index 17ba0f116..000000000 --- a/res/drawable-xxhdpi/quantum_panel_dark.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/quantum_panel_dark_bitmap.9.png b/res/drawable-xxhdpi/quantum_panel_dark_bitmap.9.png Binary files differnew file mode 100644 index 000000000..7979cf747 --- /dev/null +++ b/res/drawable-xxhdpi/quantum_panel_dark_bitmap.9.png diff --git a/res/drawable-xxxhdpi/quantum_panel_bitmap.9.png b/res/drawable-xxxhdpi/quantum_panel_bitmap.9.png Binary files differnew file mode 100644 index 000000000..bc887fe91 --- /dev/null +++ b/res/drawable-xxxhdpi/quantum_panel_bitmap.9.png diff --git a/res/drawable-xxxhdpi/quantum_panel_dark_bitmap.9.png b/res/drawable-xxxhdpi/quantum_panel_dark_bitmap.9.png Binary files differnew file mode 100644 index 000000000..7cfd6e477 --- /dev/null +++ b/res/drawable-xxxhdpi/quantum_panel_dark_bitmap.9.png diff --git a/res/drawable/apps_list_search_bg.xml b/res/drawable/apps_list_search_bg.xml index 63c4d5591..9bb6d81b2 100644 --- a/res/drawable/apps_list_search_bg.xml +++ b/res/drawable/apps_list_search_bg.xml @@ -16,7 +16,7 @@ --> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <solid android:color="#ffffff" /> + <solid android:color="@color/quantum_panel_bg_color" /> <corners android:bottomLeftRadius="2dp" android:bottomRightRadius="2dp" /> diff --git a/res/drawable/apps_search_bg.xml b/res/drawable/apps_search_bg.xml index 405e8447c..57eb5825e 100644 --- a/res/drawable/apps_search_bg.xml +++ b/res/drawable/apps_search_bg.xml @@ -16,7 +16,7 @@ --> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <solid android:color="#ffffff" /> + <solid android:color="@color/quantum_panel_bg_color" /> <corners android:topLeftRadius="2dp" android:topRightRadius="2dp" /> diff --git a/res/drawable/quantum_panel.xml b/res/drawable/quantum_panel.xml new file mode 100644 index 000000000..1f4fb711b --- /dev/null +++ b/res/drawable/quantum_panel.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<nine-patch xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/quantum_panel_bitmap" /> diff --git a/res/drawable/quantum_panel_dark.xml b/res/drawable/quantum_panel_dark.xml new file mode 100644 index 000000000..6642e78ac --- /dev/null +++ b/res/drawable/quantum_panel_dark.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<nine-patch xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/quantum_panel_dark_bitmap" /> diff --git a/res/drawable/apps_list_bg.xml b/res/drawable/quantum_panel_shape.xml index 0e56684b5..108361576 100644 --- a/res/drawable/apps_list_bg.xml +++ b/res/drawable/quantum_panel_shape.xml @@ -16,7 +16,7 @@ --> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <solid android:color="#ffffff" /> + <solid android:color="@color/quantum_panel_bg_color" /> <corners android:radius="2dp" /> </shape>
\ No newline at end of file diff --git a/res/drawable/apps_reveal_bg.xml b/res/drawable/quantum_panel_shape_dark.xml index 07505a596..c3821c416 100644 --- a/res/drawable/apps_reveal_bg.xml +++ b/res/drawable/quantum_panel_shape_dark.xml @@ -16,6 +16,7 @@ --> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <solid android:color="#ffffff" /> - <corners android:radius="2dp" /> + <solid android:color="@color/quantum_panel_bg_color_dark" /> + <corners + android:radius="2dp" /> </shape>
\ No newline at end of file diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml index ab349179c..d75d6cd3b 100644 --- a/res/layout/user_folder.xml +++ b/res/layout/user_folder.xml @@ -14,11 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. --> - <com.android.launcher3.Folder xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:background="@drawable/quantum_panel" android:elevation="5dp" android:orientation="vertical" > diff --git a/res/layout/widgets_view.xml b/res/layout/widgets_view.xml index 5cdf56048..b91ca2618 100644 --- a/res/layout/widgets_view.xml +++ b/res/layout/widgets_view.xml @@ -30,15 +30,17 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:visibility="invisible" - android:focusable="false" /> + android:elevation="15dp" + android:focusable="false" + android:visibility="invisible" /> <LinearLayout android:id="@+id/widgets_content" android:layout_width="match_parent" android:layout_height="match_parent" android:clipChildren="false" - android:orientation="vertical"> + android:elevation="15dp" + android:orientation="vertical" > <com.android.launcher3.widget.WidgetsContainerRecyclerView android:id="@+id/widgets_list_view" diff --git a/res/values/colors.xml b/res/values/colors.xml index 6395c5aec..0ba55f326 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -32,6 +32,9 @@ <color name="workspace_icon_text_color">#FFF</color> <color name="quantum_panel_text_color">#FF666666</color> + <color name="quantum_panel_bg_color">#FFF5F5F5</color> + <color name="quantum_panel_bg_color_dark">#FF243036</color> + <color name="outline_color">#FFFFFFFF</color> <color name="widget_text_panel">#FF374248</color> @@ -39,7 +42,7 @@ <color name="apps_view_scrollbar_thumb_color">#009688</color> <color name="apps_view_section_text_color">#009688</color> - <!-- Widgetss view --> + <!-- Widgets view --> <color name="widgets_view_section_text_color">#FFFFFF</color> <color name="widgets_view_item_text_color">#C4C4C4</color> <color name="widgets_cell_color">#263238</color> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 8a8514a4b..2fa16e7a2 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -103,11 +103,13 @@ <dimen name="shortcut_preview_padding_right">0dp</dimen> <dimen name="shortcut_preview_padding_top">0dp</dimen> +<!-- Theme --> + <dimen name="quantum_panel_outer_padding">4dp</dimen> + <!-- Folders --> <!-- The amount that the preview contents are inset from the preview background --> <dimen name="folder_preview_padding">4dp</dimen> <dimen name="folder_name_padding">10dp</dimen> - <dimen name="folder_shadow_padding">8dp</dimen> <!-- Sizes for managed profile badges --> <dimen name="profile_badge_size">24dp</dimen> diff --git a/src/com/android/launcher3/AppsContainerView.java b/src/com/android/launcher3/AppsContainerView.java index 989026e36..a74670be0 100644 --- a/src/com/android/launcher3/AppsContainerView.java +++ b/src/com/android/launcher3/AppsContainerView.java @@ -35,6 +35,7 @@ import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; import android.widget.FrameLayout; import android.widget.TextView; + import com.android.launcher3.util.Thunk; import java.util.List; @@ -380,12 +381,13 @@ public class AppsContainerView extends BaseContainerView implements DragSource, // Update the background of the reveal view and list to be inset with the fixed bound // insets instead of the default insets + // TODO: Use quantum_panel instead of quantum_panel_shape. mAppsRecyclerView.setBackground(new InsetDrawable( getContext().getResources().getDrawable( - hasSearchBar ? R.drawable.apps_list_search_bg : R.drawable.apps_list_bg), + hasSearchBar ? R.drawable.apps_list_search_bg : R.drawable.quantum_panel_shape), inset, 0, inset, 0)); getRevealView().setBackground(new InsetDrawable( - getContext().getResources().getDrawable(R.drawable.apps_reveal_bg), + getContext().getResources().getDrawable(R.drawable.quantum_panel_shape), inset, 0, inset, 0)); } diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 377e8eeff..6e5941cf2 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -27,7 +27,6 @@ import android.content.res.Resources; import android.graphics.Point; import android.graphics.PointF; import android.graphics.Rect; -import android.graphics.drawable.InsetDrawable; import android.os.Build; import android.text.InputType; import android.text.Selection; @@ -183,15 +182,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList // name is complete, we have something to focus on, thus hiding the cursor and giving // reliable behavior when clicking the text field (since it will always gain focus on click). setFocusableInTouchMode(true); - - if (Utilities.isLmpOrAbove()) { - int padding = getResources().getDimensionPixelSize(R.dimen.folder_shadow_padding); - setBackground(new InsetDrawable( - getResources().getDrawable(R.drawable.apps_list_bg), - padding, padding, padding, padding)); - } else { - setBackgroundResource(R.drawable.quantum_panel); - } } @Override |
