Snap for 5617038 from 675cf3c786405f3a0be5c8da8a55aa3df7d1bb1e to qt-aml-release
Change-Id: I617b55d1bc1efed3e878280f9254804908641d2b
diff --git a/library/main/src/com/android/car/setupwizardlib/BaseActivity.java b/library/main/src/com/android/car/setupwizardlib/BaseActivity.java
index 42137df..3ee71ce 100644
--- a/library/main/src/com/android/car/setupwizardlib/BaseActivity.java
+++ b/library/main/src/com/android/car/setupwizardlib/BaseActivity.java
@@ -47,7 +47,6 @@
*
* @deprecated Use {@link BaseCompatActivity} or {@link BaseDesignActivity}.
*/
-@Deprecated
public class BaseActivity extends FragmentActivity {
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
static final String CONTENT_FRAGMENT_TAG = "CONTENT_FRAGMENT_TAG";
diff --git a/library/main/src/com/android/car/setupwizardlib/CarSetupWizardBaseLayout.java b/library/main/src/com/android/car/setupwizardlib/CarSetupWizardBaseLayout.java
index 6a95a15..735c9b3 100644
--- a/library/main/src/com/android/car/setupwizardlib/CarSetupWizardBaseLayout.java
+++ b/library/main/src/com/android/car/setupwizardlib/CarSetupWizardBaseLayout.java
@@ -19,6 +19,7 @@
import android.animation.ValueAnimator;
import android.annotation.Nullable;
import android.content.Context;
+import android.content.res.ColorStateList;
import android.content.res.TypedArray;
import android.graphics.PorterDuff;
import android.graphics.Rect;
@@ -205,7 +206,18 @@
if (showPrimaryToolbarButton) {
setPrimaryToolbarButtonText(primaryToolbarButtonText);
setPrimaryToolbarButtonEnabled(primaryToolbarButtonEnabled);
- stylePrimaryToolbarButton(mPrimaryToolbarButton);
+
+ setBackground(
+ mPrimaryToolbarButton,
+ PartnerConfig.CONFIG_TOOLBAR_PRIMARY_BUTTON_BG,
+ PartnerConfig.CONFIG_TOOLBAR_PRIMARY_BUTTON_BG_COLOR);
+
+ setButtonPadding(mPrimaryToolbarButton);
+ setButtonTypeFace(mPrimaryToolbarButton);
+ setButtonTextSize(mPrimaryToolbarButton);
+ setButtonTextColor(
+ mPrimaryToolbarButton,
+ PartnerConfig.CONFIG_TOOLBAR_PRIMARY_BUTTON_TEXT_COLOR);
} else {
setPrimaryToolbarButtonVisible(false);
}
@@ -224,6 +236,12 @@
mProgressBar = findViewById(R.id.progress_bar);
setProgressBarVisible(showProgressBar);
setProgressBarIndeterminate(indeterminateProgressBar);
+ int tintColor = mPartnerConfigHelper.getColor(
+ getContext(),
+ PartnerConfig.CONFIG_TOOLBAR_LOADING_INDICATOR_COLOR);
+ if (tintColor != 0) {
+ mProgressBar.setIndeterminateTintList(ColorStateList.valueOf(tintColor));
+ }
// Set orientation programmatically since the inflated layout uses <merge>
setOrientation(LinearLayout.VERTICAL);
@@ -403,7 +421,6 @@
if (isFlat == mPrimaryToolbarButtonFlat) {
return;
}
- mPrimaryToolbarButtonFlat = isFlat;
Button newPrimaryButton = createPrimaryToolbarButton(isFlat);
ViewGroup parent = (ViewGroup) findViewById(R.id.button_container);
@@ -413,6 +430,7 @@
// Update state of layout
setPrimaryToolbarButton(newPrimaryButton);
+ mPrimaryToolbarButtonFlat = isFlat;
}
@VisibleForTesting
@@ -425,7 +443,6 @@
newPrimaryButton.setText(mPrimaryToolbarButton.getText());
newPrimaryButton.setOnClickListener(mPrimaryToolbarButtonOnClick);
newPrimaryButton.setLayoutParams(mPrimaryToolbarButton.getLayoutParams());
- stylePrimaryToolbarButton(newPrimaryButton);
return newPrimaryButton;
}
@@ -702,24 +719,6 @@
button.setPadding(hPadding, vPadding, hPadding, vPadding);
}
- private void stylePrimaryToolbarButton(Button primaryButton) {
- if (!mPrimaryToolbarButtonFlat) {
- setBackground(
- primaryButton,
- PartnerConfig.CONFIG_TOOLBAR_PRIMARY_BUTTON_BG,
- PartnerConfig.CONFIG_TOOLBAR_PRIMARY_BUTTON_BG_COLOR);
- }
-
- setButtonPadding(primaryButton);
- setButtonTypeFace(primaryButton);
- setButtonTextSize(primaryButton);
-
- PartnerConfig textColorConfig = mPrimaryToolbarButtonFlat
- ? PartnerConfig.CONFIG_TOOLBAR_SECONDARY_BUTTON_TEXT_COLOR
- : PartnerConfig.CONFIG_TOOLBAR_PRIMARY_BUTTON_TEXT_COLOR;
- setButtonTextColor(primaryButton, textColorConfig);
- }
-
private GradientDrawable getGradientDrawable(Button button) {
Drawable drawable = button.getBackground();
if (drawable instanceof InsetDrawable) {
diff --git a/library/main/src/com/android/car/setupwizardlib/CarSetupWizardDesignLayout.java b/library/main/src/com/android/car/setupwizardlib/CarSetupWizardDesignLayout.java
index 45cf62f..10f5345 100644
--- a/library/main/src/com/android/car/setupwizardlib/CarSetupWizardDesignLayout.java
+++ b/library/main/src/com/android/car/setupwizardlib/CarSetupWizardDesignLayout.java
@@ -18,7 +18,6 @@
import android.annotation.Nullable;
import android.content.Context;
-import android.content.res.ColorStateList;
import android.util.AttributeSet;
import com.android.car.setupwizardlib.partner.PartnerConfig;
@@ -49,19 +48,11 @@
int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
- PartnerConfigHelper partnerConfigHelper = PartnerConfigHelper.get(context);
- int bgColor = partnerConfigHelper.getColor(
- context,
+ int bgColor = PartnerConfigHelper.get(context).getColor(
+ getContext(),
PartnerConfig.CONFIG_LAYOUT_BG_COLOR);
if (bgColor != 0) {
setBackgroundColor(bgColor);
}
-
- int tintColor = partnerConfigHelper.getColor(
- context,
- PartnerConfig.CONFIG_LOADING_INDICATOR_COLOR);
- if (tintColor != 0) {
- getProgressBar().setIndeterminateTintList(ColorStateList.valueOf(tintColor));
- }
}
}
diff --git a/library/main/src/com/android/car/setupwizardlib/CarSetupWizardLayout.java b/library/main/src/com/android/car/setupwizardlib/CarSetupWizardLayout.java
index 554762f..590aa8f 100644
--- a/library/main/src/com/android/car/setupwizardlib/CarSetupWizardLayout.java
+++ b/library/main/src/com/android/car/setupwizardlib/CarSetupWizardLayout.java
@@ -18,6 +18,7 @@
import android.animation.ValueAnimator;
import android.annotation.Nullable;
import android.content.Context;
+import android.content.res.ColorStateList;
import android.content.res.TypedArray;
import android.graphics.PorterDuff;
import android.graphics.Rect;
@@ -58,7 +59,6 @@
*
* @deprecated Use {@link CarSetupWizardCompatLayout} or {@link CarSetupWizardDesignLayout}.
*/
-@Deprecated
public class CarSetupWizardLayout extends LinearLayout {
private static final String TAG = CarSetupWizardLayout.class.getSimpleName();
private static final int ANIMATION_DURATION_MS = 100;
@@ -236,6 +236,12 @@
mProgressBar = findViewById(R.id.progress_bar);
setProgressBarVisible(showProgressBar);
setProgressBarIndeterminate(indeterminateProgressBar);
+ int tintColor = mPartnerConfigHelper.getColor(
+ getContext(),
+ PartnerConfig.CONFIG_TOOLBAR_LOADING_INDICATOR_COLOR);
+ if (tintColor != 0) {
+ mProgressBar.setIndeterminateTintList(ColorStateList.valueOf(tintColor));
+ }
// Set orientation programmatically since the inflated layout uses <merge>
setOrientation(LinearLayout.VERTICAL);
diff --git a/library/main/src/com/android/car/setupwizardlib/partner/PartnerConfig.java b/library/main/src/com/android/car/setupwizardlib/partner/PartnerConfig.java
index 443e132..a0f2e03 100644
--- a/library/main/src/com/android/car/setupwizardlib/partner/PartnerConfig.java
+++ b/library/main/src/com/android/car/setupwizardlib/partner/PartnerConfig.java
@@ -61,8 +61,8 @@
CONFIG_TOOLBAR_SECONDARY_BUTTON_TEXT_COLOR(
PartnerConfigKey.KEY_TOOLBAR_SECONDARY_BUTTON_TEXT_COLOR, ResourceType.COLOR),
- CONFIG_LOADING_INDICATOR_COLOR(
- PartnerConfigKey.KEY_LOADING_INDICATOR_COLOR, ResourceType.COLOR),
+ CONFIG_TOOLBAR_LOADING_INDICATOR_COLOR(
+ PartnerConfigKey.KEY_TOOLBAR_LOADING_INDICATOR_COLOR, ResourceType.COLOR),
CONFIG_LAYOUT_BG_COLOR(
PartnerConfigKey.KEY_LAYOUT_BG_COLOR, ResourceType.COLOR);
diff --git a/library/main/src/com/android/car/setupwizardlib/partner/PartnerConfigKey.java b/library/main/src/com/android/car/setupwizardlib/partner/PartnerConfigKey.java
index e07b883..618fd03 100644
--- a/library/main/src/com/android/car/setupwizardlib/partner/PartnerConfigKey.java
+++ b/library/main/src/com/android/car/setupwizardlib/partner/PartnerConfigKey.java
@@ -37,7 +37,7 @@
PartnerConfigKey.KEY_TOOLBAR_SECONDARY_BUTTON_BG,
PartnerConfigKey.KEY_TOOLBAR_SECONDARY_BUTTON_BG_COLOR,
PartnerConfigKey.KEY_TOOLBAR_SECONDARY_BUTTON_TEXT_COLOR,
- PartnerConfigKey.KEY_LOADING_INDICATOR_COLOR,
+ PartnerConfigKey.KEY_TOOLBAR_LOADING_INDICATOR_COLOR,
PartnerConfigKey.KEY_LAYOUT_BG_COLOR
})
@@ -74,7 +74,7 @@
String KEY_TOOLBAR_SECONDARY_BUTTON_TEXT_COLOR =
"suw_compat_toolbar_secondary_button_text_color";
- String KEY_LOADING_INDICATOR_COLOR = "suw_design_loading_indicator_color";
+ String KEY_TOOLBAR_LOADING_INDICATOR_COLOR = "suw_compat_toolbar_loading_indicator_color";
String KEY_LAYOUT_BG_COLOR = "suw_design_layout_bg_color";
}
