PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change sticky card UI back to homepage card style" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-10 08:25:47 +00:00
committed by Android (Google) Code Review
parent 378ca1dac4 b85cfc812b
commit e5110e9388
3 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/layout/contextual_slice_sticky_tile.xml
View File

@@ -15,12 +15,11 @@
limitations under the License.
-->
<LinearLayout
<com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
style="@style/StickyCardStyle">
style="@style/ContextualCardStyle">
<androidx.slice.widget.SliceView
android:id="@+id/slice_view"
@@ -28,9 +27,6 @@
style="@style/ContextualCardSliceViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/contextual_card_vertical_margin"
android:importantForAccessibility="no"/>
<include layout="@layout/horizontal_divider"/>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>

6
res/values/styles.xml
View File

@@ -462,12 +462,6 @@
<item name="rippleColor">?android:attr/colorControlHighlight</item>
</style>
<style name="StickyCardStyle">
<item name="android:layout_marginBottom">@dimen/contextual_card_vertical_margin</item>
<item name="android:layout_marginStart">@dimen/contextual_card_side_margin</item>
<item name="android:layout_marginEnd">@dimen/contextual_card_side_margin</item>
</style>
<style name="SearchBarStyle">
<item name="android:layout_margin">@dimen/search_bar_margin</item>
<item name="cardCornerRadius">@*android:dimen/config_dialogCornerRadius</item>

6
src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java
View File

@@ -16,8 +16,6 @@
package com.android.settings.homepage.contextualcards.slices;
import static com.android.settings.homepage.contextualcards.slices.SliceContextualCardRenderer.VIEW_TYPE_STICKY;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.view.View;
@@ -77,9 +75,7 @@ class SliceFullCardRendererHelper {
// Customize slice view for Settings
cardHolder.sliceView.setShowTitleItems(true);
if (card.isLargeCard()) {
if (holder.getItemViewType() != VIEW_TYPE_STICKY) {
cardHolder.sliceView.setShowHeaderDivider(true);
}
cardHolder.sliceView.setShowHeaderDivider(true);
cardHolder.sliceView.setShowActionDividers(true);
}
}