Batch rename: homepage_* to contextual_* or condtion_*

Contextual cards are not bound to homepage. Remove prefix homepage from
layout and theme names.

Next step: update names for some resource values (dimen/color etc)

Bug: 130250419
Test: rebuild

Change-Id: I5e901268462aaa37e00493080ae09af001784823
This commit is contained in:
Fan Zhang
2019-04-09 16:33:58 -07:00
parent 8b3cde0fb1
commit 4cb25ed087
15 changed files with 11 additions and 11 deletions

View File

@@ -36,7 +36,7 @@
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<!--dismissal view--> <!--dismissal view-->
<include layout="@layout/homepage_dismissal_view"/> <include layout="@layout/contextual_card_dismissal_view"/>
</FrameLayout> </FrameLayout>
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>

View File

@@ -57,7 +57,7 @@
</LinearLayout> </LinearLayout>
<!--dismissal view--> <!--dismissal view-->
<include layout="@layout/homepage_dismissal_view"/> <include layout="@layout/contextual_card_dismissal_view"/>
</FrameLayout> </FrameLayout>
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>

View File

@@ -39,9 +39,9 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
*/ */
public class ConditionContextualCardRenderer implements ContextualCardRenderer { public class ConditionContextualCardRenderer implements ContextualCardRenderer {
@LayoutRes @LayoutRes
public static final int VIEW_TYPE_HALF_WIDTH = R.layout.homepage_condition_half_tile; public static final int VIEW_TYPE_HALF_WIDTH = R.layout.conditional_card_half_tile;
@LayoutRes @LayoutRes
public static final int VIEW_TYPE_FULL_WIDTH = R.layout.homepage_condition_full_tile; public static final int VIEW_TYPE_FULL_WIDTH = R.layout.conditional_card_full_tile;
private final Context mContext; private final Context mContext;
private final ControllerRendererPool mControllerRendererPool; private final ControllerRendererPool mControllerRendererPool;

View File

@@ -31,7 +31,7 @@ import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
public class ConditionFooterContextualCardRenderer implements ContextualCardRenderer { public class ConditionFooterContextualCardRenderer implements ContextualCardRenderer {
public static final int VIEW_TYPE = R.layout.homepage_condition_footer; public static final int VIEW_TYPE = R.layout.conditional_card_footer;
private static final String TAG = "ConditionFooterRenderer"; private static final String TAG = "ConditionFooterRenderer";
private final Context mContext; private final Context mContext;

View File

@@ -34,7 +34,7 @@ import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
public class ConditionHeaderContextualCardRenderer implements ContextualCardRenderer { public class ConditionHeaderContextualCardRenderer implements ContextualCardRenderer {
public static final int VIEW_TYPE = R.layout.homepage_condition_header; public static final int VIEW_TYPE = R.layout.conditional_card_header;
private static final String TAG = "ConditionHeaderRenderer"; private static final String TAG = "ConditionHeaderRenderer";
private final Context mContext; private final Context mContext;
@@ -61,7 +61,7 @@ public class ConditionHeaderContextualCardRenderer implements ContextualCardRend
view.icons.removeAllViews(); view.icons.removeAllViews();
headerCard.getConditionalCards().stream().forEach(card -> { headerCard.getConditionalCards().stream().forEach(card -> {
final ImageView icon = (ImageView) LayoutInflater.from(mContext).inflate( final ImageView icon = (ImageView) LayoutInflater.from(mContext).inflate(
R.layout.homepage_condition_header_icon, view.icons, false); R.layout.conditional_card_header_icon, view.icons, false);
icon.setImageDrawable(card.getIconDrawable()); icon.setImageDrawable(card.getIconDrawable());
view.icons.addView(icon); view.icons.addView(icon);
}); });

View File

@@ -32,7 +32,7 @@ import com.android.settings.homepage.contextualcards.ControllerRendererPool;
public class LegacySuggestionContextualCardRenderer implements ContextualCardRenderer { public class LegacySuggestionContextualCardRenderer implements ContextualCardRenderer {
@LayoutRes @LayoutRes
public static final int VIEW_TYPE = R.layout.homepage_suggestion_tile; public static final int VIEW_TYPE = R.layout.legacy_suggestion_tile;
private final Context mContext; private final Context mContext;
private final ControllerRendererPool mControllerRendererPool; private final ControllerRendererPool mControllerRendererPool;

View File

@@ -49,9 +49,9 @@ import java.util.Set;
* Card renderer for {@link ContextualCard} built as slice full card or slice half card. * Card renderer for {@link ContextualCard} built as slice full card or slice half card.
*/ */
public class SliceContextualCardRenderer implements ContextualCardRenderer, LifecycleObserver { public class SliceContextualCardRenderer implements ContextualCardRenderer, LifecycleObserver {
public static final int VIEW_TYPE_FULL_WIDTH = R.layout.homepage_slice_tile; public static final int VIEW_TYPE_FULL_WIDTH = R.layout.contextual_slice_full_tile;
public static final int VIEW_TYPE_HALF_WIDTH = R.layout.homepage_slice_half_tile; public static final int VIEW_TYPE_HALF_WIDTH = R.layout.contextual_slice_half_tile;
public static final int VIEW_TYPE_DEFERRED_SETUP = R.layout.homepage_slice_deferred_setup_tile; public static final int VIEW_TYPE_DEFERRED_SETUP = R.layout.contextual_slice_deferred_setup;
private static final String TAG = "SliceCardRenderer"; private static final String TAG = "SliceCardRenderer";