Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12c327a2 authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge changes I3ee2313c,Ibbf9eb2a 

* changes:
  Remove divider line for battery card preference
  Add CardPreference in battery settings page
parents 8fc7b3e9 56726ca0

res/layout/card_preference_layout.xml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2019 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.

  -->



<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">

    <com.google.android.material.card.MaterialCardView

        android:id="@+id/container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_margin="8dp"

        style="@style/ContextualCardStyle">

        <include layout="@layout/preference_material" />

    </com.google.android.material.card.MaterialCardView>

</FrameLayout>

res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ 


    <attr name="slicePreferenceStyle" format="reference" />



    <attr name="cardPreferenceStyle" format="reference" />



    <attr name="footerPreferenceStyle" format="reference" />



    <declare-styleable name="FixedLineSummaryPreference">

res/values/styles_preference.xml

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


    <style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.SettingsBase">

        <item name="apnPreferenceStyle">@style/ApnPreference</item>

        <item name="cardPreferenceStyle">@style/CardPreference</item>

        <item name="slicePreferenceStyle">@style/SlicePreference</item>

        <item name="seekBarPreferenceStyle">@style/SettingsSeekBarPreference</item>

        <item name="twoStateButtonPreferenceStyle">@style/TwoStateButtonPreference</item>
@@ -35,6 +36,10 @@ 
        <item name="android:layout">@layout/apn_preference_layout</item>

    </style>



    <style name="CardPreference" parent="@style/Preference.Material">

        <item name="android:layout">@layout/card_preference_layout</item>

    </style>



    <style name="SlicePreference" parent="@style/Preference.Material">

        <item name="android:layout">@layout/slice_preference_layout</item>

    </style>

res/xml/power_usage_summary.xml

+2 −4
Original line number Diff line number Diff line
@@ -28,10 +28,9 @@ 
        android:layout="@layout/battery_header"

        settings:controller="com.android.settings.fuelgauge.BatteryHeaderPreferenceController" />



    <PreferenceCategory

    <com.android.settings.widget.CardPreference

        android:key="battery_tip"

        android:title="@string/summary_placeholder"

        android:layout="@layout/preference_category_no_label"

        settings:controller="com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController" />



    <Preference
@@ -39,8 +38,7 @@ 
        android:key="battery_saver_summary"

        android:title="@string/battery_saver"

        settings:controller="com.android.settings.fuelgauge.BatterySaverController"

        settings:platform_slice="true"

        settings:allowDividerAbove="true" />

        settings:platform_slice="true" />



    <Preference

        android:fragment="com.android.settings.fuelgauge.SmartBatterySettings"

src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java

+6 −8
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.os.Bundle; 


import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.PreferenceGroup;

import androidx.preference.PreferenceScreen;



import com.android.settings.SettingsActivity;
@@ -32,6 +31,7 @@ import com.android.settings.fuelgauge.batterytip.actions.BatteryTipAction; 
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;

import com.android.settings.fuelgauge.batterytip.tips.SummaryTip;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.widget.CardPreference;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;



import java.util.HashMap;
@@ -56,7 +56,7 @@ public class BatteryTipPreferenceController extends BasePreferenceController { 
    private MetricsFeatureProvider mMetricsFeatureProvider;

    private boolean mNeedUpdate;

    @VisibleForTesting

    PreferenceGroup mPreferenceGroup;

    CardPreference mCardPreference;

    @VisibleForTesting

    Context mPrefContext;

    InstrumentedPreferenceFragment mFragment;
@@ -89,12 +89,12 @@ public class BatteryTipPreferenceController extends BasePreferenceController { 
    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mPrefContext = screen.getContext();

        mPreferenceGroup = (PreferenceGroup) screen.findPreference(getPreferenceKey());

        mCardPreference = screen.findPreference(getPreferenceKey());



        // Add summary tip in advance to avoid UI flakiness

        final SummaryTip summaryTip = new SummaryTip(BatteryTip.StateType.NEW,

                Estimate.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN);

        mPreferenceGroup.addPreference(summaryTip.buildPreference(mPrefContext));

        summaryTip.updatePreference(mCardPreference);

    }



    public void updateBatteryTips(List<BatteryTip> batteryTips) {
@@ -110,14 +110,12 @@ public class BatteryTipPreferenceController extends BasePreferenceController { 
            }

        }



        mPreferenceGroup.removeAll();

        for (int i = 0, size = batteryTips.size(); i < size; i++) {

            final BatteryTip batteryTip = mBatteryTips.get(i);

            batteryTip.sanityCheck(mContext);

            if (batteryTip.getState() != BatteryTip.StateType.INVISIBLE) {

                final Preference preference = batteryTip.buildPreference(mPrefContext);

                mBatteryTipMap.put(preference.getKey(), batteryTip);

                mPreferenceGroup.addPreference(preference);

                batteryTip.updatePreference(mCardPreference);

                mBatteryTipMap.put(mCardPreference.getKey(), batteryTip);

                batteryTip.log(mContext, mMetricsFeatureProvider);

                mNeedUpdate = batteryTip.needUpdate();

                break;