Merge changes from topics "add_boarder", "wallpaper_bottom_bar" into ub-launcher3-master
* changes:
Add the border to the selected wallpaper.
Implement the bottom action bar for the wallpaper section.
diff --git a/res/color/option_border_color.xml b/res/color/option_border_color.xml
deleted file mode 100644
index ec5ab97..0000000
--- a/res/color/option_border_color.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2019 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.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:state_activated="true"
- android:color="?android:colorAccent" />
- <item
- android:state_activated="false"
- android:alpha="0.24"
- android:color="?android:colorAccent" />
- <item
- android:alpha="0.05"
- android:color="@color/option_border_default"/>
-</selector>
diff --git a/res/drawable/option_border.xml b/res/drawable/option_border.xml
deleted file mode 100644
index 6ce76c7..0000000
--- a/res/drawable/option_border.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- Copyright (C) 2019 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.
--->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="?android:attr/colorControlHighlight">
- <item android:id="@android:id/mask">
- <shape android:shape="rectangle">
- <solid android:color="@android:color/white"/>
- <corners android:radius="4dp" />
- </shape>
- </item>
- <item android:drawable="@drawable/option_border_edge" />
-</ripple>
diff --git a/res/drawable/option_border_edge.xml b/res/drawable/option_border_edge.xml
deleted file mode 100644
index 943920e..0000000
--- a/res/drawable/option_border_edge.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2019 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.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_activated="true">
- <shape android:shape="rectangle">
- <stroke
- android:color="@color/option_border_color"
- android:width="@dimen/option_selected_border_width" />
- <corners android:radius="4dp" />
- </shape>
- </item>
- <item android:state_activated="false">
- <shape android:shape="rectangle">
- <stroke
- android:color="@color/option_border_color"
- android:width="@dimen/option_border_width" />
- <corners android:radius="4dp" />
- </shape>
- </item>
-</selector>
diff --git a/res/layout/activity_customization_picker_main.xml b/res/layout/activity_customization_picker_main.xml
index 5910ab6..40af303 100755
--- a/res/layout/activity_customization_picker_main.xml
+++ b/res/layout/activity_customization_picker_main.xml
@@ -36,4 +36,6 @@
app:labelVisibilityMode="labeled"
app:menu="@menu/bottom_navigation_menu"/>
+ <include layout="@layout/bottom_action_bar" />
+
</FrameLayout>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 48bdefb..c6b2a3f 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -40,7 +40,5 @@
<color name="divider_color">@color/white_14_alpha</color>
- <color name="edit_background_base">@color/material_white_100</color>
-
<color name="cover_title_color">@color/white_88_alpha</color>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f370ce7..437e4ea 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,7 +19,6 @@
<color name="icon_background">#FF4285f4</color>
<color name="black_14_alpha">#24000000</color>
<color name="white_14_alpha">#24FFFFFF</color>
- <color name="google_grey700">#5f6368</color>
<color name="status_bar_color">#ffffffff</color>
@@ -29,8 +28,6 @@
<color name="shape_thumbnail_color">#b2b2b2</color>
<color name="icon_thumbnail_color">@color/black_87_alpha</color>
- <color name="option_border_default">@color/edit_background_base</color>
-
<color name="clockface_preview_background">@android:color/black</color>
<color name="theme_preview_icon_color">@color/google_grey700</color>
@@ -58,7 +55,5 @@
<color name="divider_color">@color/black_14_alpha</color>
- <color name="edit_background_base">@color/google_grey700</color>
-
<color name="cover_title_color">@color/black_87_alpha</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 5813b93..827ffec 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -16,7 +16,6 @@
limitations under the License.
-->
<resources>
- <dimen name="bottom_navbar_height">56dp</dimen>
<dimen name="bottom_navbar_font_text_size">12sp</dimen>
<dimen name="tip_dot_size">8dp</dimen>
@@ -86,8 +85,6 @@
<dimen name="component_color_chip_container_size">33dp</dimen>
<dimen name="component_shape_thumb_size">72dp</dimen>
- <dimen name="option_border_width">2dp</dimen>
- <dimen name="option_selected_border_width">3dp</dimen>
<dimen name="component_options_title_size">18sp</dimen>
<!-- For a corner radius of this size or larger, we'll preview a rounded qsb widget. -->