Snap for 5626917 from cd4690599b062a8f01fb8131bd8dec5df4be7936 to qt-aml-release
Change-Id: Id27a019621235a1c122f2cf20a96036c434af568
diff --git a/library/main/src/com/android/car/setupwizardlib/BaseActivity.java b/library/main/src/com/android/car/setupwizardlib/BaseActivity.java
index 3ee71ce..42137df 100644
--- a/library/main/src/com/android/car/setupwizardlib/BaseActivity.java
+++ b/library/main/src/com/android/car/setupwizardlib/BaseActivity.java
@@ -47,6 +47,7 @@
*
* @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 735c9b3..6a95a15 100644
--- a/library/main/src/com/android/car/setupwizardlib/CarSetupWizardBaseLayout.java
+++ b/library/main/src/com/android/car/setupwizardlib/CarSetupWizardBaseLayout.java
@@ -19,7 +19,6 @@
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;
@@ -206,18 +205,7 @@
if (showPrimaryToolbarButton) {
setPrimaryToolbarButtonText(primaryToolbarButtonText);
setPrimaryToolbarButtonEnabled(primaryToolbarButtonEnabled);
-
- 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);
+ stylePrimaryToolbarButton(mPrimaryToolbarButton);
} else {
setPrimaryToolbarButtonVisible(false);
}
@@ -236,12 +224,6 @@
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);
@@ -421,6 +403,7 @@
if (isFlat == mPrimaryToolbarButtonFlat) {
return;
}
+ mPrimaryToolbarButtonFlat = isFlat;
Button newPrimaryButton = createPrimaryToolbarButton(isFlat);
ViewGroup parent = (ViewGroup) findViewById(R.id.button_container);
@@ -430,7 +413,6 @@
// Update state of layout
setPrimaryToolbarButton(newPrimaryButton);
- mPrimaryToolbarButtonFlat = isFlat;
}
@VisibleForTesting
@@ -443,6 +425,7 @@
newPrimaryButton.setText(mPrimaryToolbarButton.getText());
newPrimaryButton.setOnClickListener(mPrimaryToolbarButtonOnClick);
newPrimaryButton.setLayoutParams(mPrimaryToolbarButton.getLayoutParams());
+ stylePrimaryToolbarButton(newPrimaryButton);
return newPrimaryButton;
}
@@ -719,6 +702,24 @@
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 10f5345..45cf62f 100644
--- a/library/main/src/com/android/car/setupwizardlib/CarSetupWizardDesignLayout.java
+++ b/library/main/src/com/android/car/setupwizardlib/CarSetupWizardDesignLayout.java
@@ -18,6 +18,7 @@
import android.annotation.Nullable;
import android.content.Context;
+import android.content.res.ColorStateList;
import android.util.AttributeSet;
import com.android.car.setupwizardlib.partner.PartnerConfig;
@@ -48,11 +49,19 @@
int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
- int bgColor = PartnerConfigHelper.get(context).getColor(
- getContext(),
+ PartnerConfigHelper partnerConfigHelper = PartnerConfigHelper.get(context);
+ int bgColor = partnerConfigHelper.getColor(
+ context,
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 590aa8f..554762f 100644
--- a/library/main/src/com/android/car/setupwizardlib/CarSetupWizardLayout.java
+++ b/library/main/src/com/android/car/setupwizardlib/CarSetupWizardLayout.java
@@ -18,7 +18,6 @@
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;
@@ -59,6 +58,7 @@
*
* @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,12 +236,6 @@
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 a0f2e03..443e132 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_TOOLBAR_LOADING_INDICATOR_COLOR(
- PartnerConfigKey.KEY_TOOLBAR_LOADING_INDICATOR_COLOR, ResourceType.COLOR),
+ CONFIG_LOADING_INDICATOR_COLOR(
+ PartnerConfigKey.KEY_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 618fd03..e07b883 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_TOOLBAR_LOADING_INDICATOR_COLOR,
+ PartnerConfigKey.KEY_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_TOOLBAR_LOADING_INDICATOR_COLOR = "suw_compat_toolbar_loading_indicator_color";
+ String KEY_LOADING_INDICATOR_COLOR = "suw_design_loading_indicator_color";
String KEY_LAYOUT_BG_COLOR = "suw_design_layout_bg_color";
}
