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

[Expressive Battery] Implement the expressive style for anomaly hint chip

Browse Source 
For expressive style:
- Update the padding start & end of pref with anomaly hint
- Add the new background res to update anomaly hint style to outlined
- Reduce the vertical space between pref text and anomaly hint.

Bug: 349652542
Test: visual
Flag: com.android.settingslib.widget.theme.flags.is_expressive_design_enabled
Change-Id: Iec9240d2edba5042c5a1f740b662db75bea41d0e
This commit is contained in:
mxyyiyi
2025-02-10 16:05:25 +08:00
parent a2bdafaf5e
commit 4f9e8cb751
5 changed files with 114 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
res/drawable-v35/expressive_battery_hints_chip_bg.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2025 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/settingslib_expressive_radius_medium" />
<stroke android:width="1dp" android:color="@color/settingslib_materialColorOutline" />
</shape>

21
res/drawable-v35/expressive_battery_hints_chip_bg_ripple.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2025 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:attr/colorControlHighlight">
<item android:drawable="@drawable/expressive_battery_hints_chip_bg"/>
</ripple>

43
res/layout-v35/expressive_warning_frame_preference.xml Normal file
View File

@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?><!--
~ Copyright (C) 2025 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:orientation="vertical">
<include layout="@layout/settingslib_expressive_preference"
android:id="@+id/preference_frame"/>
<LinearLayout
android:id="@+id/warning_chip_frame"
android:visibility="gone"
android:clickable="false"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/settingslib_expressive_space_small1"
android:layout_marginTop="-8dp">
<Space
android:id="@+id/warning_padding_placeholder"
android:layout_width="@dimen/settingslib_expressive_space_medium3"
android:layout_height="1px"
android:layout_marginEnd="@dimen/settingslib_expressive_space_extrasmall6"/>
<include layout="@layout/power_anomaly_hints"/>
</LinearLayout>
</LinearLayout>

5
res/layout/power_anomaly_hints.xml
View File

@@ -17,13 +17,12 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical|start"
android:padding="8dp"
android:background="@drawable/battery_hints_chip_bg_ripple">
android:id="@+id/warning_chip"
android:padding="8dp">
<ImageView
android:layout_width="16dp"

34
src/com/android/settings/fuelgauge/WarningFramePreference.java
View File

@@ -21,8 +21,6 @@ import android.content.Context;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.Space;
import android.widget.TextView;
import androidx.preference.Preference;
@@ -30,6 +28,7 @@ import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
import com.android.settingslib.Utils;
import com.android.settingslib.widget.SettingsThemeHelper;
/**
* Custom preference for displaying the {@link Preference} with an optional hint chip.
@@ -37,12 +36,23 @@ import com.android.settingslib.Utils;
public class WarningFramePreference extends Preference {
private final int mTitleColorNormal;
private final int mSummaryColorNormal;
private final int mWarningChipBackgroundResId;
private final boolean mIsExpressiveTheme;
@Nullable private CharSequence mHintText;
public WarningFramePreference(Context context, AttributeSet attrs) {
super(context, attrs);
setLayoutResource(R.layout.warning_frame_preference);
mIsExpressiveTheme = SettingsThemeHelper.isExpressiveTheme(context);
int layoutResId =
mIsExpressiveTheme
? R.layout.expressive_warning_frame_preference
: R.layout.warning_frame_preference;
setLayoutResource(layoutResId);
mWarningChipBackgroundResId =
mIsExpressiveTheme
? R.drawable.expressive_battery_hints_chip_bg_ripple
: R.drawable.battery_hints_chip_bg_ripple;
mTitleColorNormal =
Utils.getColorAttrDefaultColor(context, android.R.attr.textColorPrimary);
mSummaryColorNormal =
@@ -61,14 +71,22 @@ public class WarningFramePreference extends Preference {
public void onBindViewHolder(PreferenceViewHolder view) {
super.onBindViewHolder(view);
final LinearLayout warningChipFrame =
(LinearLayout) view.findViewById(R.id.warning_chip_frame);
final Space warningPaddingPlaceHolder =
warningChipFrame.findViewById(R.id.warning_padding_placeholder);
warningPaddingPlaceHolder.setVisibility(getIcon() != null ? View.VISIBLE : View.GONE);
if (mIsExpressiveTheme) {
final View preferenceFrame = view.findViewById(R.id.preference_frame);
preferenceFrame.setBackground(null);
preferenceFrame.setPadding(0, 0, 0, 0);
}
final View warningChipFrame = view.findViewById(R.id.warning_chip_frame);
warningChipFrame
.findViewById(R.id.warning_padding_placeholder)
.setVisibility(getIcon() != null ? View.VISIBLE : View.GONE);
if (!TextUtils.isEmpty(mHintText)) {
((TextView) warningChipFrame.findViewById(R.id.warning_info)).setText(mHintText);
warningChipFrame.setVisibility(View.VISIBLE);
warningChipFrame
.findViewById(R.id.warning_chip)
.setBackgroundResource(mWarningChipBackgroundResId);
} else {
warningChipFrame.setVisibility(View.GONE);
}