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

Commit fde637ff authored by jackqdyulei's avatar jackqdyulei
Browse files

Add BatteryTipDialogFragment. 

This DialogFragment handles all the tip related dialogs. This cl makes:
1. All the tips parcelable.
2. Add dialog for HighUsageTip. It also need adapter to populate app
list in dialog.
3. Add and update tests

Bug: 70570352
Test: RunSettingsRoboTests
Change-Id: Ie4c986172cfc73d8746abc7457d966c8600c6145
parent ca102fac

res/layout/app_high_usage_item.xml

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

<!--

     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.

-->



<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_margin="4dp"

    android:paddingStart="?android:dialogPreferredPadding"

    android:paddingEnd="?android:dialogPreferredPadding"

    android:orientation="horizontal">

    <ImageView

        android:id="@+id/app_icon"

        android:layout_width="24dp"

        android:layout_height="24dp"

        android:layout_gravity="center_vertical"/>

    <TextView

        android:id="@+id/app_name"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_marginStart="24dp"

        android:textColor="?android:textColorPrimary"

        android:paddingEnd="7dp"/>

    <TextView

        android:id="@+id/app_screen_time"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_gravity="center_vertical"

        android:paddingEnd="16dp"

        android:textAlignment="viewEnd"

        android:textColor="?android:textColorPrimary"/>

</LinearLayout>

res/layout/recycler_view.xml

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

<!--

  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.

  -->

<android.support.v7.widget.RecyclerView

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

    android:id="@+id/recycler_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingTop="8dp"

    android:scrollbars="vertical"/>

src/com/android/settings/Utils.java

+15 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ import android.text.TextUtils; 
import android.text.format.DateUtils;

import android.text.style.TtsSpan;

import android.util.ArraySet;

import android.util.IconDrawableFactory;

import android.util.Log;

import android.util.TypedValue;

import android.view.LayoutInflater;
@@ -1382,4 +1383,18 @@ public final class Utils extends com.android.settingslib.Utils { 
        }

        return new BitmapDrawable(null, bitmap);

    }



    /**

     * Get the {@link Drawable} that represents the app icon

     */

    public static Drawable getBadgedIcon(IconDrawableFactory iconDrawableFactory,

            PackageManager packageManager, String packageName, int userId) {

        try {

            final ApplicationInfo appInfo = packageManager.getApplicationInfo(packageName,

                    PackageManager.GET_META_DATA);

            return iconDrawableFactory.getBadgedIcon(appInfo, userId);

        } catch (PackageManager.NameNotFoundException e) {

            return packageManager.getDefaultActivityIcon();

        }

    }

}

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

+2 −7
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.Utils;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.fuelgauge.anomaly.Anomaly;

import com.android.settings.fuelgauge.anomaly.AnomalyDialogFragment;
@@ -151,12 +152,6 @@ public class PowerUsageAnomalyDetails extends DashboardFragment implements 


    @VisibleForTesting

    Drawable getBadgedIcon(String packageName, int userId) {

        try {

            final ApplicationInfo appInfo = mPackageManager.getApplicationInfo(packageName,

                    PackageManager.GET_META_DATA);

            return mIconDrawableFactory.getBadgedIcon(appInfo, userId);

        } catch (PackageManager.NameNotFoundException e) {

            return mPackageManager.getDefaultActivityIcon();

        }

        return Utils.getBadgedIcon(mIconDrawableFactory, mPackageManager, packageName, userId);

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList 
                KEY_APP_LIST, lifecycle, activity, this);

        controllers.add(mBatteryAppListPreferenceController);

        mBatteryTipPreferenceController = new BatteryTipPreferenceController(context,

                KEY_BATTERY_TIP, this);

                KEY_BATTERY_TIP, this, this);

        controllers.add(mBatteryTipPreferenceController);

        controllers.add(new BatterySaverController(context, getLifecycle()));

        controllers.add(new BatteryPercentagePreferenceController(context));