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

Commit 3a03b722 authored by jackqdyulei's avatar jackqdyulei
Browse files

Delete the estimated time in battery usage graph 

Bug: 31012673
Test: RunSettingsRoboTests
Change-Id: Icac85a5fc523b70904e048d17eace30c91fe54ee
parent e39e8350

res/layout/battery_usage_graph.xml

+3 −8
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
    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">
@@ -26,22 +27,16 @@ 
        android:id="@+id/charge"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginBottom="16dp"

        android:textAppearance="?android:attr/textAppearanceLarge"

        android:textSize="36sp"

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



    <TextView

        android:id="@+id/estimation"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingBottom="8dp"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textColor="?android:attr/textColorSecondary" />



    <com.android.settingslib.graph.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"

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

+4 −5
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings.fuelgauge; 
import android.content.Context;

import android.os.Bundle;

import android.os.SystemClock;

import android.support.annotation.VisibleForTesting;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceViewHolder;

import android.util.AttributeSet;
@@ -36,7 +37,8 @@ import com.android.settingslib.graph.UsageView; 
 */

public class BatteryHistoryPreference extends Preference {



    private BatteryInfo mBatteryInfo;

    @VisibleForTesting

    BatteryInfo mBatteryInfo;



    public BatteryHistoryPreference(Context context, AttributeSet attrs) {

        super(context, attrs);
@@ -57,11 +59,8 @@ public class BatteryHistoryPreference extends Preference { 
        if (mBatteryInfo == null) {

            return;

        }

        view.setDividerAllowedAbove(true);



        ((TextView) view.findViewById(R.id.charge)).setText(mBatteryInfo.batteryPercentString);

        ((TextView) view.findViewById(R.id.estimation)).setText(

                mBatteryInfo.remainingLabel != null ?

                        mBatteryInfo.remainingLabel : mBatteryInfo.statusLabel);

        UsageView usageView = (UsageView) view.findViewById(R.id.battery_usage);

        usageView.findViewById(R.id.label_group).setAlpha(.7f);

        mBatteryInfo.bindHistory(usageView);

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

0 → 100644
+90 −0
Original line number Diff line number Diff line 
/*

 * 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 android.content.Context;

import android.os.PowerManager;

import android.support.v7.preference.PreferenceViewHolder;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.TextView;



import com.android.settings.R;

import com.android.settings.SettingsRobolectricTestRunner;

import com.android.settings.TestConfig;

import com.android.settingslib.BatteryInfo;

import com.android.settingslib.graph.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.RuntimeEnvironment;

import org.robolectric.annotation.Config;

import org.robolectric.util.ReflectionHelpers;



import static org.mockito.AdditionalMatchers.not;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;



import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;





@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

public class BatteryHistoryPreferenceTest {

    @Mock

    private PreferenceViewHolder mViewHolder;

    @Mock

    private BatteryInfo mBatteryInfo;

    @Mock

    private TextView mTextView;

    @Mock

    private View mItemView;

    @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(new PreferenceViewHolder(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(anyString());

        verify(mBatteryInfo).bindHistory(mUsageView);

    }

}