Remove the current battery usage chart and replace it with new one

Bug: 183921876
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I06f0eb5c09d07a9db0d1a93cda751e8fad672c79

res/layout/battery_chart_graph.xml

@@ -34,7 +34,7 @@
     <com.android.settings.fuelgauge.BatteryChartView
         android:id="@+id/battery_chart"
         android:layout_width="match_parent"
-        android:layout_height="151dp"
+        android:layout_height="141dp"
         android:layout_marginBottom="16dp"
         android:textAppearance="?android:attr/textAppearanceSmall"
         settings:textColor="?android:attr/textColorSecondary" />

res/layout/battery_usage_graph.xml

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="16dp"
-    android:paddingStart="@dimen/preference_no_icon_padding_start"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/charge"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:fontFamily="@*android:string/config_headlineFontFamily"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textSize="36sp"
-        android:textColor="?android:attr/colorAccent" />
-
-    <com.android.settings.widget.UsageView
-        android:id="@+id/battery_usage"
-        android:layout_width="match_parent"
-        android:layout_height="141dp"
-        android:layout_marginBottom="16dp"
-        settings:sideLabels="@array/battery_labels"
-        android:colorAccent="?android:attr/colorAccent"
-        android:gravity="end"
-        settings:textColor="?android:attr/textColorSecondary" />
-
-    <TextView
-        android:id="@+id/bottom_summary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-</LinearLayout>

src/com/android/settings/fuelgauge/BatteryChartView.java

@@ -95,6 +95,7 @@ public class BatteryChartView extends AppCompatImageView implements View.OnClick
     public void setLevels(int[] levels) {
         // We should provide trapezoid count + 1 data to draw all trapezoids.
         mLevels = levels.length == mTrapezoidCount + 1 ? levels : null;
+        setClickable(mLevels != null);
         invalidate();
     }
 

src/com/android/settings/fuelgauge/BatteryHistoryPreference.java

@@ -19,8 +19,8 @@ package com.android.settings.fuelgauge;
 import android.content.Context;
 import android.os.BatteryUsageStats;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.View;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
@@ -28,26 +28,26 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
 
 import com.android.settings.R;
-import com.android.settings.widget.UsageView;
+import com.android.settings.overlay.FeatureFactory;
 
 /**
- * Custom preference for displaying power consumption as a bar and an icon on the left for the
+ * Custom preference for displaying the battery level as chart graph.
- * subsystem/app type.
  */
 public class BatteryHistoryPreference extends Preference {
     private static final String TAG = "BatteryHistoryPreference";
 
-    private CharSequence mSummary;
-    private TextView mSummaryView;
-
-    @VisibleForTesting
-    boolean hideSummary;
     @VisibleForTesting
     BatteryInfo mBatteryInfo;
 
     public BatteryHistoryPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
-        setLayoutResource(R.layout.battery_usage_graph);
+        final boolean isChartGraphEnabled =
+            FeatureFactory.getFactory(context).getPowerUsageFeatureProvider(context)
+                   .isChartGraphEnabled(context);
+        Log.i(TAG, "isChartGraphEnabled: " + isChartGraphEnabled);
+        if (isChartGraphEnabled) {
+            setLayoutResource(R.layout.battery_chart_graph);
+        }
         setSelectable(false);
     }
 
@@ -58,22 +58,6 @@ public class BatteryHistoryPreference extends Preference {
         }, batteryUsageStats, false);
     }
 
-    public void setBottomSummary(CharSequence text) {
-        mSummary = text;
-        if (mSummaryView != null) {
-            mSummaryView.setVisibility(View.VISIBLE);
-            mSummaryView.setText(mSummary);
-        }
-        hideSummary = false;
-    }
-
-    public void hideBottomSummary() {
-        if (mSummaryView != null) {
-            mSummaryView.setVisibility(View.GONE);
-        }
-        hideSummary = true;
-    }
-
     @Override
     public void onBindViewHolder(PreferenceViewHolder view) {
         super.onBindViewHolder(view);
@@ -81,18 +65,6 @@ public class BatteryHistoryPreference extends Preference {
         if (mBatteryInfo == null) {
             return;
         }
-
-        ((TextView) view.findViewById(R.id.charge)).setText(mBatteryInfo.batteryPercentString);
-        mSummaryView = (TextView) view.findViewById(R.id.bottom_summary);
-        if (mSummary != null) {
-            mSummaryView.setText(mSummary);
-        }
-        if (hideSummary) {
-            mSummaryView.setVisibility(View.GONE);
-        }
-        UsageView usageView = (UsageView) view.findViewById(R.id.battery_usage);
-        usageView.findViewById(R.id.label_group).setAlpha(.7f);
-        mBatteryInfo.bindHistory(usageView);
         BatteryUtils.logRuntime(TAG, "onBindViewHolder", startTime);
     }
 }

src/com/android/settings/fuelgauge/PowerUsageAdvanced.java

@@ -63,9 +63,6 @@ public class PowerUsageAdvanced extends PowerUsageBase {
         mHistPref = (BatteryHistoryPreference) findPreference(KEY_BATTERY_GRAPH);
         mPowerUsageFeatureProvider = FeatureFactory.getFactory(context)
                 .getPowerUsageFeatureProvider(context);
-
-        // init the summary so other preferences won't have unnecessary move
-        updateHistPrefSummary(context);
         restoreSavedInstance(icicle);
     }
 
@@ -151,24 +148,9 @@ public class PowerUsageAdvanced extends PowerUsageBase {
             return;
         }
         updatePreference(mHistPref);
-        updateHistPrefSummary(context);
-
         mBatteryAppListPreferenceController.refreshAppListGroup(mBatteryUsageStats, mShowAllApps);
     }
 
-    private void updateHistPrefSummary(Context context) {
-        Intent batteryIntent =
-                context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
-        final boolean plugged = batteryIntent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) != 0;
-
-        if (mPowerUsageFeatureProvider.isEnhancedBatteryPredictionEnabled(context) && !plugged) {
-            mHistPref.setBottomSummary(
-                    mPowerUsageFeatureProvider.getAdvancedUsageScreenInfoString());
-        } else {
-            mHistPref.hideBottomSummary();
-        }
-    }
-
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 @Override

src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java

@@ -124,4 +124,9 @@ public interface PowerUsageFeatureProvider {
      * Checks whether smart battery feature is supported in this device
      */
     boolean isSmartBatterySupported();
+
+    /**
+     * Checks whether we should enable chart graph design or not
+     */
+    boolean isChartGraphEnabled(Context context);
 }

src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java

@@ -150,4 +150,9 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
         return mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_smart_battery_available);
     }
+
+    @Override
+    public boolean isChartGraphEnabled(Context context) {
+        return false;
+    }
 }

tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java

@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2017 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.fuelgauge;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-import com.android.settings.widget.UsageView;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class BatteryHistoryPreferenceTest {
-
-    private static final String TEST_STRING = "test";
-    @Mock
-    private PreferenceViewHolder mViewHolder;
-    @Mock
-    private BatteryInfo mBatteryInfo;
-    @Mock
-    private TextView mTextView;
-    @Mock
-    private UsageView mUsageView;
-    @Mock
-    private View mLabelView;
-    private BatteryHistoryPreference mBatteryHistoryPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        final Context context = RuntimeEnvironment.application;
-        final View itemView =
-                LayoutInflater.from(context).inflate(R.layout.battery_usage_graph, null);
-
-        mBatteryHistoryPreference = new BatteryHistoryPreference(context, null);
-        mBatteryHistoryPreference.mBatteryInfo = mBatteryInfo;
-        mViewHolder = spy(PreferenceViewHolder.createInstanceForTests(itemView));
-        when(mViewHolder.findViewById(R.id.battery_usage)).thenReturn(mUsageView);
-        when(mViewHolder.findViewById(R.id.charge)).thenReturn(mTextView);
-        when(mUsageView.findViewById(anyInt())).thenReturn(mLabelView);
-    }
-
-    @Test
-    public void testOnBindViewHolder_updateBatteryUsage() {
-        mBatteryHistoryPreference.onBindViewHolder(mViewHolder);
-
-        verify(mViewHolder).findViewById(R.id.battery_usage);
-        verify(mTextView).setText(nullable(String.class));
-        verify(mBatteryInfo).bindHistory(mUsageView);
-    }
-
-    @Test
-    public void testSetBottomSummary_updatesBottomSummaryTextIfSet() {
-        mBatteryHistoryPreference.setBottomSummary(TEST_STRING);
-        mBatteryHistoryPreference.onBindViewHolder(mViewHolder);
-
-        TextView view = (TextView) mViewHolder.findViewById(R.id.bottom_summary);
-        assertThat(view.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(view.getText()).isEqualTo(TEST_STRING);
-        assertThat(mBatteryHistoryPreference.hideSummary).isFalse();
-    }
-
-    @Test
-    public void testSetBottomSummary_leavesBottomSummaryTextBlankIfNotSet() {
-        mBatteryHistoryPreference.hideBottomSummary();
-        mBatteryHistoryPreference.onBindViewHolder(mViewHolder);
-
-        TextView view = (TextView) mViewHolder.findViewById(R.id.bottom_summary);
-        assertThat(view.getVisibility()).isEqualTo(View.GONE);
-        assertThat(view.getText()).isEqualTo("");
-        assertThat(mBatteryHistoryPreference.hideSummary).isTrue();
-    }
-}