Revert "Merging from ub-launcher3-master @ build 6294827"
Revert "Merging from ub-launcher3-master @ build 6294827"
Revert submission 10673936-merge_ub-launcher3-master_6294827
Reason for revert: b/151611270
Reverted Changes:
I38a587a1b:Merging from ub-launcher3-master @ build 6294827
I74ae8bea8:Merging from ub-launcher3-master @ build 6294827
I115742e03:Merging from ub-launcher3-master @ build 6294827
Iceb1e8523:Merging from ub-launcher3-master @ build 6294827
Ie242e3907:Merging from ub-launcher3-master @ build 6294827
I609b18fdd:Merging from ub-launcher3-master @ build 6294827
Change-Id: I67e017bd01a39939bff7c45a634b8fefa2533cba
diff --git a/Android.mk b/Android.mk
index 987c875..c5be43b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,7 +26,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_ANDROID_LIBRARIES := WallpaperPicker2CommonDepsLib
-LOCAL_STATIC_JAVA_LIBRARIES := styleprotosnano SystemUI-statsd SystemUISharedLib
+LOCAL_STATIC_JAVA_LIBRARIES := styleprotosnano SystemUI-statsd
LOCAL_PROGUARD_ENABLED := disabled
LOCAL_PACKAGE_NAME := ThemePicker
diff --git a/res/color/option_border_color.xml b/res/color/option_border_color.xml
new file mode 100644
index 0000000..ec5ab97
--- /dev/null
+++ b/res/color/option_border_color.xml
@@ -0,0 +1,28 @@
+<?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
new file mode 100644
index 0000000..6ce76c7
--- /dev/null
+++ b/res/drawable/option_border.xml
@@ -0,0 +1,25 @@
+<?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
new file mode 100644
index 0000000..943920e
--- /dev/null
+++ b/res/drawable/option_border_edge.xml
@@ -0,0 +1,34 @@
+<?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 40af303..5910ab6 100755
--- a/res/layout/activity_customization_picker_main.xml
+++ b/res/layout/activity_customization_picker_main.xml
@@ -36,6 +36,4 @@
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 c6b2a3f..48bdefb 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -40,5 +40,7 @@
<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 437e4ea..f370ce7 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,6 +19,7 @@
<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>
@@ -28,6 +29,8 @@
<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>
@@ -55,5 +58,7 @@
<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 827ffec..5813b93 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -16,6 +16,7 @@
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>
@@ -85,6 +86,8 @@
<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. -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index eb88140..d612a32 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -38,10 +38,6 @@
<item name="android:windowNoTitle">true</item>
<item name="android:fitsSystemWindows">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
-
- <item name="android:windowBackground">@android:color/transparent</item>
- <item name="android:windowContentOverlay">@null</item>
- <item name="android:windowDisablePreview">true</item>
</style>
<!-- Bottom nav -->