summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSetup Wizard Team <android-setup-team-eng@google.com>2020-09-02 16:29:34 +0800
committerNicole Huang <nicolehuang@google.com>2020-09-03 15:22:34 +0800
commita2444957eb927d03f9b02713c13cba5a17f58ebf (patch)
tree132f7757fdaf12cb3fd025c0887f9a678b01d13f
parent499b4ac0d17a7ee72ec0c18a971129dbc3557d6f (diff)
downloadsetupdesign-a2444957eb927d03f9b02713c13cba5a17f58ebf.tar.gz
Import updated Android Setupdesign Library 329667015
Copied from google3/third_party/java_src/android_libs/setupdesign Test: mm Included changes: - 329667015 create default value for dark mode - 329498228 [SetupDesign] Prepare the default value for the navigatio... - 329232090 [Stencil][Darkmode] Export the API that return the flag f... - 329218068 Migrate references of android.support.annotation to andro... PiperOrigin-RevId: 329667015 Change-Id: Ieb3915fb66dce67d6e144dc641af7eaa99e78b71
-rw-r--r--main/res/values-v27/styles.xml7
-rw-r--r--main/res/values/colors.xml8
-rw-r--r--main/res/values/styles.xml3
-rw-r--r--main/src/com/google/android/setupdesign/DividerItemDecoration.java2
-rw-r--r--main/src/com/google/android/setupdesign/GlifLayout.java8
-rw-r--r--main/src/com/google/android/setupdesign/SetupWizardItemsLayout.java2
-rw-r--r--main/src/com/google/android/setupdesign/accessibility/LinkAccessibilityHelper.java4
-rw-r--r--main/src/com/google/android/setupdesign/items/Item.java4
-rw-r--r--main/src/com/google/android/setupdesign/items/RecyclerItemAdapter.java2
-rw-r--r--main/src/com/google/android/setupdesign/items/ReflectionInflater.java4
-rw-r--r--main/src/com/google/android/setupdesign/items/SimpleInflater.java2
-rw-r--r--main/src/com/google/android/setupdesign/span/LinkSpan.java2
-rw-r--r--main/src/com/google/android/setupdesign/template/HeaderMixin.java6
-rw-r--r--main/src/com/google/android/setupdesign/template/IconMixin.java4
-rw-r--r--main/src/com/google/android/setupdesign/template/IllustrationProgressMixin.java2
-rw-r--r--main/src/com/google/android/setupdesign/template/ListMixin.java6
-rw-r--r--main/src/com/google/android/setupdesign/template/ListViewScrollHandlingDelegate.java4
-rw-r--r--main/src/com/google/android/setupdesign/template/ProgressBarMixin.java2
-rw-r--r--main/src/com/google/android/setupdesign/template/RecyclerMixin.java6
-rw-r--r--main/src/com/google/android/setupdesign/template/RecyclerViewScrollHandlingDelegate.java4
-rw-r--r--main/src/com/google/android/setupdesign/template/RequireScrollMixin.java6
-rw-r--r--main/src/com/google/android/setupdesign/template/ScrollViewScrollHandlingDelegate.java4
-rw-r--r--main/src/com/google/android/setupdesign/util/HeaderAreaStyler.java2
-rw-r--r--main/src/com/google/android/setupdesign/util/Partner.java2
-rw-r--r--main/src/com/google/android/setupdesign/util/TextViewPartnerStyler.java4
-rw-r--r--main/src/com/google/android/setupdesign/util/ThemeHelper.java13
-rw-r--r--main/src/com/google/android/setupdesign/view/BottomScrollView.java2
-rw-r--r--main/src/com/google/android/setupdesign/view/CheckableLinearLayout.java2
-rw-r--r--main/src/com/google/android/setupdesign/view/IllustrationVideoView.java6
-rw-r--r--main/src/com/google/android/setupdesign/view/NavigationBar.java2
-rw-r--r--main/src/com/google/android/setupdesign/view/NavigationBarButton.java2
31 files changed, 76 insertions, 51 deletions
diff --git a/main/res/values-v27/styles.xml b/main/res/values-v27/styles.xml
index d3906b8..ba6507f 100644
--- a/main/res/values-v27/styles.xml
+++ b/main/res/values-v27/styles.xml
@@ -28,4 +28,11 @@
<item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
<item name="sucLightSystemNavBar" tools:ignore="NewApi">?android:attr/windowLightNavigationBar</item>
</style>
+
+ <style name="SudThemeGlifV3" parent="SudBaseThemeGlifV3">
+ <item name="android:navigationBarColor">@color/sud_glif_v3_nav_bar_color_dark</item>
+ <item name="android:navigationBarDividerColor" tools:ignore="NewApi">@color/sud_glif_v3_nav_bar_divider_color_dark</item>
+ <item name="android:windowLightNavigationBar" tools:ignore="NewApi">false</item>
+ <item name="sucLightSystemNavBar" tools:ignore="NewApi">?android:attr/windowLightNavigationBar</item>
+ </style>
</resources>
diff --git a/main/res/values/colors.xml b/main/res/values/colors.xml
index a386eb5..da9bb0c 100644
--- a/main/res/values/colors.xml
+++ b/main/res/values/colors.xml
@@ -42,18 +42,22 @@
<!-- GLIF colors -->
<color name="sud_color_accent_glif_dark">#ff4285f4</color>
<color name="sud_color_accent_glif_light">#ff4285f4</color>
- <color name="sud_color_accent_glif_v3_light">#ff1a73e8</color>
<color name="sud_color_accent_glif_v3_dark">#ff8ab4f8</color>
+ <color name="sud_color_accent_glif_v3_light">#ff1a73e8</color>
<color name="sud_glif_background_color_dark">#ff000000</color>
<color name="sud_glif_background_color_light">#ffffffff</color>
<color name="sud_glif_edit_text_bg_dark_color">#ff202124</color>
<color name="sud_glif_edit_text_bg_light_color">#0a000000</color>
<color name="sud_glif_v3_dialog_background_color_dark">#ff3c4043</color>
+ <color name="sud_glif_v3_nav_bar_color_dark">#ff000000</color>
<color name="sud_glif_v3_nav_bar_color_light">#ffffffff</color>
+ <color name="sud_glif_v3_nav_bar_divider_color_dark">#00000000</color>
<color name="sud_glif_v3_nav_bar_divider_color_light">#1f000000</color>
+ <color name="sud_glif_v3_text_color_dark">#ffffffff</color>
+ <color name="sud_glif_v3_text_color_light">#de000000</color>
<!-- Color for error text -->
- <color name="sud_color_error_text_light">#ffd93025</color> <!-- Google red 600 -->
<color name="sud_color_error_text_dark">#fff28b82</color> <!-- Google red 300 -->
+ <color name="sud_color_error_text_light">#ffd93025</color> <!-- Google red 600 -->
</resources>
diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml
index 4da3516..33fc940 100644
--- a/main/res/values/styles.xml
+++ b/main/res/values/styles.xml
@@ -225,7 +225,7 @@
<item name="sucLightStatusBar" tools:targetApi="m">?android:attr/windowLightStatusBar</item>
</style>
- <style name="SudThemeGlifV3" parent="SudThemeGlifV2">
+ <style name="SudBaseThemeGlifV3" parent="SudThemeGlifV2">
<item name="colorAccent">@color/sud_color_accent_glif_v3_dark</item>
<item name="colorBackgroundFloating">@color/sud_glif_v3_dialog_background_color_dark</item>
<item name="android:datePickerDialogTheme">@style/SudDateTimePickerDialogTheme</item>
@@ -235,6 +235,7 @@
<item name="sudButtonCornerRadius">@dimen/sud_glif_v3_button_corner_radius</item>
<item name="sudButtonFontFamily">@string/sudFontSecondaryMedium</item>
</style>
+ <style name="SudThemeGlifV3" parent="SudBaseThemeGlifV3" />
<style name="SudBaseThemeGlifV3.Light" parent="SudThemeGlifV2.Light">
<item name="colorAccent">@color/sud_color_accent_glif_v3_light</item>
diff --git a/main/src/com/google/android/setupdesign/DividerItemDecoration.java b/main/src/com/google/android/setupdesign/DividerItemDecoration.java
index fa0166f..abc7753 100644
--- a/main/src/com/google/android/setupdesign/DividerItemDecoration.java
+++ b/main/src/com/google/android/setupdesign/DividerItemDecoration.java
@@ -21,10 +21,10 @@ import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
-import androidx.annotation.IntDef;
import androidx.core.view.ViewCompat;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
+import androidx.annotation.IntDef;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/main/src/com/google/android/setupdesign/GlifLayout.java b/main/src/com/google/android/setupdesign/GlifLayout.java
index cb49618..9d02308 100644
--- a/main/src/com/google/android/setupdesign/GlifLayout.java
+++ b/main/src/com/google/android/setupdesign/GlifLayout.java
@@ -23,10 +23,6 @@ import android.content.res.TypedArray;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Build.VERSION_CODES;
-import androidx.annotation.ColorInt;
-import androidx.annotation.LayoutRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
@@ -35,6 +31,10 @@ import android.view.ViewStub;
import android.widget.ProgressBar;
import android.widget.ScrollView;
import android.widget.TextView;
+import androidx.annotation.ColorInt;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import com.google.android.setupcompat.PartnerCustomizationLayout;
import com.google.android.setupcompat.partnerconfig.PartnerConfig;
import com.google.android.setupcompat.partnerconfig.PartnerConfigHelper;
diff --git a/main/src/com/google/android/setupdesign/SetupWizardItemsLayout.java b/main/src/com/google/android/setupdesign/SetupWizardItemsLayout.java
index 2f3dd86..28f95fb 100644
--- a/main/src/com/google/android/setupdesign/SetupWizardItemsLayout.java
+++ b/main/src/com/google/android/setupdesign/SetupWizardItemsLayout.java
@@ -17,9 +17,9 @@
package com.google.android.setupdesign;
import android.content.Context;
-import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.widget.ListAdapter;
+import androidx.annotation.Nullable;
import com.google.android.setupdesign.items.ItemAdapter;
/** @deprecated Use {@link SetupWizardListLayout} instead. */
diff --git a/main/src/com/google/android/setupdesign/accessibility/LinkAccessibilityHelper.java b/main/src/com/google/android/setupdesign/accessibility/LinkAccessibilityHelper.java
index ad0de80..1a55b25 100644
--- a/main/src/com/google/android/setupdesign/accessibility/LinkAccessibilityHelper.java
+++ b/main/src/com/google/android/setupdesign/accessibility/LinkAccessibilityHelper.java
@@ -19,8 +19,6 @@ package com.google.android.setupdesign.accessibility;
import android.graphics.Rect;
import android.os.Build;
import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
import androidx.core.view.AccessibilityDelegateCompat;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
import androidx.core.view.accessibility.AccessibilityNodeProviderCompat;
@@ -33,6 +31,8 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.accessibility.AccessibilityEvent;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
import androidx.customview.widget.ExploreByTouchHelper;
import java.util.List;
diff --git a/main/src/com/google/android/setupdesign/items/Item.java b/main/src/com/google/android/setupdesign/items/Item.java
index e5d173f..0a79be9 100644
--- a/main/src/com/google/android/setupdesign/items/Item.java
+++ b/main/src/com/google/android/setupdesign/items/Item.java
@@ -20,8 +20,6 @@ import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
-import androidx.annotation.ColorInt;
-import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.View;
@@ -29,6 +27,8 @@ import android.view.ViewGroup.LayoutParams;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
import com.google.android.setupdesign.R;
/**
diff --git a/main/src/com/google/android/setupdesign/items/RecyclerItemAdapter.java b/main/src/com/google/android/setupdesign/items/RecyclerItemAdapter.java
index 3526bf5..2492a9b 100644
--- a/main/src/com/google/android/setupdesign/items/RecyclerItemAdapter.java
+++ b/main/src/com/google/android/setupdesign/items/RecyclerItemAdapter.java
@@ -21,12 +21,12 @@ import android.graphics.Rect;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
-import androidx.annotation.VisibleForTesting;
import androidx.recyclerview.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.VisibleForTesting;
import com.google.android.setupcompat.partnerconfig.PartnerConfig;
import com.google.android.setupcompat.partnerconfig.PartnerConfigHelper;
import com.google.android.setupdesign.R;
diff --git a/main/src/com/google/android/setupdesign/items/ReflectionInflater.java b/main/src/com/google/android/setupdesign/items/ReflectionInflater.java
index 329d240..8123c18 100644
--- a/main/src/com/google/android/setupdesign/items/ReflectionInflater.java
+++ b/main/src/com/google/android/setupdesign/items/ReflectionInflater.java
@@ -17,10 +17,10 @@
package com.google.android.setupdesign.items;
import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.InflateException;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import java.lang.reflect.Constructor;
import java.util.HashMap;
diff --git a/main/src/com/google/android/setupdesign/items/SimpleInflater.java b/main/src/com/google/android/setupdesign/items/SimpleInflater.java
index c7e370a..0c7d1d9 100644
--- a/main/src/com/google/android/setupdesign/items/SimpleInflater.java
+++ b/main/src/com/google/android/setupdesign/items/SimpleInflater.java
@@ -18,11 +18,11 @@ package com.google.android.setupdesign.items;
import android.content.res.Resources;
import android.content.res.XmlResourceParser;
-import androidx.annotation.NonNull;
import android.util.AttributeSet;
import android.util.Log;
import android.util.Xml;
import android.view.InflateException;
+import androidx.annotation.NonNull;
import java.io.IOException;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
diff --git a/main/src/com/google/android/setupdesign/span/LinkSpan.java b/main/src/com/google/android/setupdesign/span/LinkSpan.java
index 7f1f02b..7d91012 100644
--- a/main/src/com/google/android/setupdesign/span/LinkSpan.java
+++ b/main/src/com/google/android/setupdesign/span/LinkSpan.java
@@ -19,7 +19,6 @@ package com.google.android.setupdesign.span;
import android.content.Context;
import android.content.ContextWrapper;
import android.os.Build;
-import androidx.annotation.Nullable;
import android.text.Selection;
import android.text.Spannable;
import android.text.TextPaint;
@@ -27,6 +26,7 @@ import android.text.style.ClickableSpan;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
+import androidx.annotation.Nullable;
/**
* A clickable span that will listen for click events and send it back to the context. To use this
diff --git a/main/src/com/google/android/setupdesign/template/HeaderMixin.java b/main/src/com/google/android/setupdesign/template/HeaderMixin.java
index 0a6eb9e..99c5c63 100644
--- a/main/src/com/google/android/setupdesign/template/HeaderMixin.java
+++ b/main/src/com/google/android/setupdesign/template/HeaderMixin.java
@@ -18,13 +18,13 @@ package com.google.android.setupdesign.template;
import android.content.res.ColorStateList;
import android.content.res.TypedArray;
-import androidx.annotation.AttrRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.ViewParent;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import com.google.android.setupcompat.internal.TemplateLayout;
import com.google.android.setupcompat.template.Mixin;
import com.google.android.setupdesign.R;
diff --git a/main/src/com/google/android/setupdesign/template/IconMixin.java b/main/src/com/google/android/setupdesign/template/IconMixin.java
index abd31a1..1217488 100644
--- a/main/src/com/google/android/setupdesign/template/IconMixin.java
+++ b/main/src/com/google/android/setupdesign/template/IconMixin.java
@@ -22,12 +22,12 @@ import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
-import androidx.annotation.ColorInt;
-import androidx.annotation.DrawableRes;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
import android.widget.ImageView;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
import com.google.android.setupcompat.internal.TemplateLayout;
import com.google.android.setupcompat.template.Mixin;
import com.google.android.setupdesign.R;
diff --git a/main/src/com/google/android/setupdesign/template/IllustrationProgressMixin.java b/main/src/com/google/android/setupdesign/template/IllustrationProgressMixin.java
index ac64436..558d000 100644
--- a/main/src/com/google/android/setupdesign/template/IllustrationProgressMixin.java
+++ b/main/src/com/google/android/setupdesign/template/IllustrationProgressMixin.java
@@ -23,11 +23,11 @@ import static android.view.View.VISIBLE;
import android.annotation.TargetApi;
import android.content.Context;
import android.os.Build.VERSION_CODES;
-import androidx.annotation.Nullable;
import android.view.View;
import android.view.ViewStub;
import android.widget.ProgressBar;
import android.widget.TextView;
+import androidx.annotation.Nullable;
import com.google.android.setupcompat.partnerconfig.PartnerConfig;
import com.google.android.setupcompat.partnerconfig.PartnerConfig.ResourceType;
import com.google.android.setupcompat.partnerconfig.PartnerConfigHelper;
diff --git a/main/src/com/google/android/setupdesign/template/ListMixin.java b/main/src/com/google/android/setupdesign/template/ListMixin.java
index 38928aa..f88fa94 100644
--- a/main/src/com/google/android/setupdesign/template/ListMixin.java
+++ b/main/src/com/google/android/setupdesign/template/ListMixin.java
@@ -21,14 +21,14 @@ import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Build.VERSION_CODES;
-import androidx.annotation.AttrRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.HeaderViewListAdapter;
import android.widget.ListAdapter;
import android.widget.ListView;
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import com.google.android.setupcompat.internal.TemplateLayout;
import com.google.android.setupcompat.template.Mixin;
import com.google.android.setupdesign.R;
diff --git a/main/src/com/google/android/setupdesign/template/ListViewScrollHandlingDelegate.java b/main/src/com/google/android/setupdesign/template/ListViewScrollHandlingDelegate.java
index 2040c6b..3c7fdfd 100644
--- a/main/src/com/google/android/setupdesign/template/ListViewScrollHandlingDelegate.java
+++ b/main/src/com/google/android/setupdesign/template/ListViewScrollHandlingDelegate.java
@@ -16,12 +16,12 @@
package com.google.android.setupdesign.template;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.util.Log;
import android.widget.AbsListView;
import android.widget.ListAdapter;
import android.widget.ListView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import com.google.android.setupdesign.template.RequireScrollMixin.ScrollHandlingDelegate;
/**
diff --git a/main/src/com/google/android/setupdesign/template/ProgressBarMixin.java b/main/src/com/google/android/setupdesign/template/ProgressBarMixin.java
index 7e55d51..ec3980c 100644
--- a/main/src/com/google/android/setupdesign/template/ProgressBarMixin.java
+++ b/main/src/com/google/android/setupdesign/template/ProgressBarMixin.java
@@ -19,10 +19,10 @@ package com.google.android.setupdesign.template;
import android.content.res.ColorStateList;
import android.os.Build;
import android.os.Build.VERSION_CODES;
-import androidx.annotation.Nullable;
import android.view.View;
import android.view.ViewStub;
import android.widget.ProgressBar;
+import androidx.annotation.Nullable;
import com.google.android.setupcompat.internal.TemplateLayout;
import com.google.android.setupcompat.template.Mixin;
import com.google.android.setupdesign.R;
diff --git a/main/src/com/google/android/setupdesign/template/RecyclerMixin.java b/main/src/com/google/android/setupdesign/template/RecyclerMixin.java
index 11e9144..83f9d58 100644
--- a/main/src/com/google/android/setupdesign/template/RecyclerMixin.java
+++ b/main/src/com/google/android/setupdesign/template/RecyclerMixin.java
@@ -21,14 +21,14 @@ import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Build.VERSION_CODES;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView.Adapter;
import androidx.recyclerview.widget.RecyclerView.ViewHolder;
import android.util.AttributeSet;
import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import com.google.android.setupcompat.internal.TemplateLayout;
import com.google.android.setupcompat.template.Mixin;
import com.google.android.setupdesign.DividerItemDecoration;
@@ -172,7 +172,7 @@ public class RecyclerMixin implements Mixin {
* @return The adapter, or {@code null} if the recycler view has no adapter.
*/
public Adapter<? extends ViewHolder> getAdapter() {
- @SuppressWarnings("unchecked") // RecyclerView.getAdapter returns raw type :(
+ // RecyclerView.getAdapter returns raw type :(
final RecyclerView.Adapter<? extends ViewHolder> adapter = recyclerView.getAdapter();
if (adapter instanceof HeaderAdapter) {
return ((HeaderAdapter<? extends ViewHolder>) adapter).getWrappedAdapter();
diff --git a/main/src/com/google/android/setupdesign/template/RecyclerViewScrollHandlingDelegate.java b/main/src/com/google/android/setupdesign/template/RecyclerViewScrollHandlingDelegate.java
index 71094cf..b7a8d4a 100644
--- a/main/src/com/google/android/setupdesign/template/RecyclerViewScrollHandlingDelegate.java
+++ b/main/src/com/google/android/setupdesign/template/RecyclerViewScrollHandlingDelegate.java
@@ -16,10 +16,10 @@
package com.google.android.setupdesign.template;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import com.google.android.setupdesign.template.RequireScrollMixin.ScrollHandlingDelegate;
/**
diff --git a/main/src/com/google/android/setupdesign/template/RequireScrollMixin.java b/main/src/com/google/android/setupdesign/template/RequireScrollMixin.java
index f1c7cbe..62c503c 100644
--- a/main/src/com/google/android/setupdesign/template/RequireScrollMixin.java
+++ b/main/src/com/google/android/setupdesign/template/RequireScrollMixin.java
@@ -19,12 +19,12 @@ package com.google.android.setupdesign.template;
import android.content.Context;
import android.os.Handler;
import android.os.Looper;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
import com.google.android.setupcompat.internal.TemplateLayout;
import com.google.android.setupcompat.template.FooterButton;
import com.google.android.setupcompat.template.Mixin;
diff --git a/main/src/com/google/android/setupdesign/template/ScrollViewScrollHandlingDelegate.java b/main/src/com/google/android/setupdesign/template/ScrollViewScrollHandlingDelegate.java
index 0fbe5ce..852656f 100644
--- a/main/src/com/google/android/setupdesign/template/ScrollViewScrollHandlingDelegate.java
+++ b/main/src/com/google/android/setupdesign/template/ScrollViewScrollHandlingDelegate.java
@@ -16,10 +16,10 @@
package com.google.android.setupdesign.template;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.util.Log;
import android.widget.ScrollView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import com.google.android.setupdesign.template.RequireScrollMixin.ScrollHandlingDelegate;
import com.google.android.setupdesign.view.BottomScrollView;
import com.google.android.setupdesign.view.BottomScrollView.BottomScrollListener;
diff --git a/main/src/com/google/android/setupdesign/util/HeaderAreaStyler.java b/main/src/com/google/android/setupdesign/util/HeaderAreaStyler.java
index cd5135d..86aad71 100644
--- a/main/src/com/google/android/setupdesign/util/HeaderAreaStyler.java
+++ b/main/src/com/google/android/setupdesign/util/HeaderAreaStyler.java
@@ -17,11 +17,11 @@
package com.google.android.setupdesign.util;
import android.content.Context;
-import androidx.annotation.Nullable;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.annotation.Nullable;
import com.google.android.setupcompat.partnerconfig.PartnerConfig;
import com.google.android.setupcompat.partnerconfig.PartnerConfigHelper;
import com.google.android.setupdesign.util.TextViewPartnerStyler.TextPartnerConfigs;
diff --git a/main/src/com/google/android/setupdesign/util/Partner.java b/main/src/com/google/android/setupdesign/util/Partner.java
index aee5070..3f0207e 100644
--- a/main/src/com/google/android/setupdesign/util/Partner.java
+++ b/main/src/com/google/android/setupdesign/util/Partner.java
@@ -26,6 +26,7 @@ import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
+import android.util.Log;
import androidx.annotation.AnyRes;
import androidx.annotation.ArrayRes;
import androidx.annotation.ColorRes;
@@ -33,7 +34,6 @@ import androidx.annotation.DrawableRes;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.annotation.VisibleForTesting;
-import android.util.Log;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
diff --git a/main/src/com/google/android/setupdesign/util/TextViewPartnerStyler.java b/main/src/com/google/android/setupdesign/util/TextViewPartnerStyler.java
index 552102e..fb6246a 100644
--- a/main/src/com/google/android/setupdesign/util/TextViewPartnerStyler.java
+++ b/main/src/com/google/android/setupdesign/util/TextViewPartnerStyler.java
@@ -18,10 +18,10 @@ package com.google.android.setupdesign.util;
import android.content.Context;
import android.graphics.Typeface;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.util.TypedValue;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import com.google.android.setupcompat.partnerconfig.PartnerConfig;
import com.google.android.setupcompat.partnerconfig.PartnerConfigHelper;
diff --git a/main/src/com/google/android/setupdesign/util/ThemeHelper.java b/main/src/com/google/android/setupdesign/util/ThemeHelper.java
index 4247d99..3114857 100644
--- a/main/src/com/google/android/setupdesign/util/ThemeHelper.java
+++ b/main/src/com/google/android/setupdesign/util/ThemeHelper.java
@@ -17,7 +17,10 @@
package com.google.android.setupdesign.util;
import android.app.Activity;
+import android.content.Context;
import android.content.Intent;
+import androidx.annotation.NonNull;
+import com.google.android.setupcompat.partnerconfig.PartnerConfigHelper;
import com.google.android.setupcompat.util.WizardManagerHelper;
/** The helper class holds the constant names of themes and util functions */
@@ -125,4 +128,14 @@ public class ThemeHelper {
public static void applyTheme(Activity activity) {
ThemeResolver.getDefault().applyTheme(activity);
}
+
+ /**
+ * Checks whether SetupWizard support the DayNight theme during setup flow; if returns false setup
+ * flow is always light theme.
+ *
+ * @return true if the setupwizard is listening to system DayNight theme setting.
+ */
+ public static boolean isSetupWizardDayNightEnabled(@NonNull Context context) {
+ return PartnerConfigHelper.isSetupWizardDayNightEnabled(context);
+ }
}
diff --git a/main/src/com/google/android/setupdesign/view/BottomScrollView.java b/main/src/com/google/android/setupdesign/view/BottomScrollView.java
index 83527b0..c376c36 100644
--- a/main/src/com/google/android/setupdesign/view/BottomScrollView.java
+++ b/main/src/com/google/android/setupdesign/view/BottomScrollView.java
@@ -17,10 +17,10 @@
package com.google.android.setupdesign.view;
import android.content.Context;
-import androidx.annotation.VisibleForTesting;
import android.util.AttributeSet;
import android.view.View;
import android.widget.ScrollView;
+import androidx.annotation.VisibleForTesting;
/**
* An extension of ScrollView that will invoke a listener callback when the ScrollView needs
diff --git a/main/src/com/google/android/setupdesign/view/CheckableLinearLayout.java b/main/src/com/google/android/setupdesign/view/CheckableLinearLayout.java
index b12a20f..34d6ae3 100644
--- a/main/src/com/google/android/setupdesign/view/CheckableLinearLayout.java
+++ b/main/src/com/google/android/setupdesign/view/CheckableLinearLayout.java
@@ -19,10 +19,10 @@ package com.google.android.setupdesign.view;
import android.annotation.TargetApi;
import android.content.Context;
import android.os.Build.VERSION_CODES;
-import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.widget.Checkable;
import android.widget.LinearLayout;
+import androidx.annotation.Nullable;
/**
* A LinearLayout which is checkable. This will set the checked state when {@link
diff --git a/main/src/com/google/android/setupdesign/view/IllustrationVideoView.java b/main/src/com/google/android/setupdesign/view/IllustrationVideoView.java
index f2f1e23..e8253a0 100644
--- a/main/src/com/google/android/setupdesign/view/IllustrationVideoView.java
+++ b/main/src/com/google/android/setupdesign/view/IllustrationVideoView.java
@@ -28,15 +28,15 @@ import android.media.MediaPlayer.OnPreparedListener;
import android.media.MediaPlayer.OnSeekCompleteListener;
import android.net.Uri;
import android.os.Build.VERSION_CODES;
-import androidx.annotation.Nullable;
-import androidx.annotation.RawRes;
-import androidx.annotation.VisibleForTesting;
import android.util.AttributeSet;
import android.util.Log;
import android.view.Surface;
import android.view.TextureView;
import android.view.TextureView.SurfaceTextureListener;
import android.view.View;
+import androidx.annotation.Nullable;
+import androidx.annotation.RawRes;
+import androidx.annotation.VisibleForTesting;
import com.google.android.setupdesign.R;
import java.io.IOException;
diff --git a/main/src/com/google/android/setupdesign/view/NavigationBar.java b/main/src/com/google/android/setupdesign/view/NavigationBar.java
index 9d978f0..996bbbc 100644
--- a/main/src/com/google/android/setupdesign/view/NavigationBar.java
+++ b/main/src/com/google/android/setupdesign/view/NavigationBar.java
@@ -21,12 +21,12 @@ import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Color;
import android.os.Build.VERSION_CODES;
-import androidx.annotation.StyleableRes;
import android.util.AttributeSet;
import android.view.ContextThemeWrapper;
import android.view.View;
import android.widget.Button;
import android.widget.LinearLayout;
+import androidx.annotation.StyleableRes;
import com.google.android.setupdesign.R;
/**
diff --git a/main/src/com/google/android/setupdesign/view/NavigationBarButton.java b/main/src/com/google/android/setupdesign/view/NavigationBarButton.java
index 44a5b85..3421d09 100644
--- a/main/src/com/google/android/setupdesign/view/NavigationBarButton.java
+++ b/main/src/com/google/android/setupdesign/view/NavigationBarButton.java
@@ -23,9 +23,9 @@ import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
import android.os.Build;
-import androidx.annotation.NonNull;
import android.util.AttributeSet;
import android.widget.Button;
+import androidx.annotation.NonNull;
/**
* Button for navigation bar, which includes tinting of its compound drawables to be used for dark