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

Commit 0896fa3b authored by Fan Zhang's avatar Fan Zhang
Browse files

Revert "Remove battery saver condition." 

This reverts commit 44b28f4a.
Bug: 121115306
Test: robotests

Reason for revert: Change of design

Change-Id: Ia2b9131595d582fd8300367f729fde2b3de81b6e
parent 6498d8f6

res/drawable/ic_battery_saver_accent_24dp.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<!--

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

  -->



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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorAccent">

    <path

        android:fillColor="#FF000000"

        android:pathData="M15,14l-2,0l0,2l-2,0l0,-2l-2,0l0,-2l2,0l0,-2l2,0l0,2l2,0z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M16.2,22.5H7.8c-1.3,0 -2.3,-1 -2.3,-2.3V5.8c0,-1.3 1,-2.3 2.3,-2.3h0.7v-2h7v2h0.7c1.3,0 2.3,1.1 2.3,2.3v14.3C18.5,21.5 17.5,22.5 16.2,22.5zM7.8,5.5c-0.2,0 -0.3,0.2 -0.3,0.3v14.3c0,0.2 0.2,0.3 0.3,0.3h8.3c0.2,0 0.3,-0.1 0.3,-0.3V5.8c0,-0.2 -0.1,-0.3 -0.3,-0.3h-2.7v-2h-3v2H7.8z"/>

</vector>

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -9094,6 +9094,12 @@ 
    <!-- Summary of condition that do not disturb is on [CHAR LIMIT=36] -->

    <string name="condition_zen_summary">Impacts what you hear and see</string>









    <!-- Title of condition that battery saver is on [CHAR LIMIT=30] -->









    <string name="condition_battery_title">Battery Saver is on</string>

















    <!-- Summary of condition that battery saver is on [CHAR LIMIT=NONE] -->









    <string name="condition_battery_summary">Features restricted</string>

















    <!-- Title of condition that cellular data is off [CHAR LIMIT=50] -->









    <string name="condition_cellular_title">Mobile data is off</string>

































src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java
0 → 100644



+108
−0






























Original line number
Diff line number
Diff line









/*









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









 */



















package com.android.settings.homepage.contextualcards.conditional;



















import android.content.Context;









import android.os.PowerManager;



















import com.android.internal.logging.nano.MetricsProto;









import com.android.settings.R;









import com.android.settings.core.SubSettingLauncher;









import com.android.settings.fuelgauge.BatterySaverReceiver;









import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings;









import com.android.settings.homepage.contextualcards.ContextualCard;









import com.android.settingslib.fuelgauge.BatterySaverUtils;



















import java.util.Objects;



















public class BatterySaverConditionController implements ConditionalCardController,









        BatterySaverReceiver.BatterySaverListener {









    static final int ID = Objects.hash("BatterySaverConditionController");



















    private final Context mAppContext;









    private final ConditionManager mConditionManager;









    private final BatterySaverReceiver mReceiver;









    private final PowerManager mPowerManager;



















    public BatterySaverConditionController(Context appContext, ConditionManager conditionManager) {









        mAppContext = appContext;









        mConditionManager = conditionManager;









        mPowerManager = appContext.getSystemService(PowerManager.class);









        mReceiver = new BatterySaverReceiver(appContext);









        mReceiver.setBatterySaverListener(this);









    }



















    @Override









    public long getId() {









        return ID;









    }



















    @Override









    public boolean isDisplayable() {









        return mPowerManager.isPowerSaveMode();









    }



















    @Override









    public void onPrimaryClick(Context context) {









        new SubSettingLauncher(context)









                .setDestination(BatterySaverSettings.class.getName())









                .setSourceMetricsCategory(MetricsProto.MetricsEvent.DASHBOARD_SUMMARY)









                .setTitleRes(R.string.battery_saver)









                .launch();









    }



















    @Override









    public void onActionClick() {









        BatterySaverUtils.setPowerSaveMode(mAppContext, false,









                /*needFirstTimeWarning*/ false);









    }



















    @Override









    public ContextualCard buildContextualCard() {









        return new ConditionalContextualCard.Builder()









                .setConditionId(ID)









                .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_BATTERY_SAVER)









                .setActionText(mAppContext.getText(R.string.condition_turn_off))









                .setName(mAppContext.getPackageName() + "/"









                        + mAppContext.getText(R.string.condition_battery_title))









                .setTitleText(mAppContext.getText(R.string.condition_battery_title).toString())









                .setSummaryText(mAppContext.getText(R.string.condition_battery_summary).toString())









                .setIconDrawable(mAppContext.getDrawable(R.drawable.ic_battery_saver_accent_24dp))









                .setIsHalfWidth(true)









                .build();









    }



















    @Override









    public void startMonitoringStateChange() {









        mReceiver.setListening(true);









    }



















    @Override









    public void stopMonitoringStateChange() {









        mReceiver.setListening(false);









    }



















    @Override









    public void onPowerSaveModeChanged() {









        mConditionManager.onConditionChanged();









    }



















    @Override









    public void onBatteryChanged(boolean pluggedIn) {



















    }









}
























src/com/android/settings/homepage/contextualcards/conditional/ConditionManager.java



+1
−0






























Original line number
Diff line number
Diff line







@@ -154,6 +154,7 @@ public class ConditionManager {







        mCardControllers.add(new AirplaneModeConditionController(mAppContext, this /* manager */));









        mCardControllers.add(









                new BackgroundDataConditionController(mAppContext, this /* manager */));









        mCardControllers.add(new BatterySaverConditionController(mAppContext, this /* manager */));









        mCardControllers.add(new CellularDataConditionController(mAppContext, this /* manager */));









        mCardControllers.add(new DndConditionCardController(mAppContext, this /* manager */));









        mCardControllers.add(new HotspotConditionController(mAppContext, this /* manager */));
































src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySlice.java→src/com/android/settings/homepage/contextualcards/deviceinfo/BatteryInfoSlice.java



+3
−3






























Original line number
Diff line number
Diff line







@@ -42,15 +42,15 @@ import com.android.settings.slices.SliceBuilderUtils;







/**









 * Utility class to build a Battery Slice, and handle all associated actions.









 */









public class BatterySlice implements CustomSliceable {









    private static final String TAG = "BatterySlice";









public class BatteryInfoSlice implements CustomSliceable {









    private static final String TAG = "BatteryInfoSlice";



















    private final Context mContext;



















    private BatteryInfo mBatteryInfo;









    private boolean mIsBatteryInfoLoading;



















    public BatterySlice(Context context) {









    public BatteryInfoSlice(Context context) {









        mContext = context;









    }