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

Commit 50972605 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Disable ignore battery optimization items that can't change" into mnc-dev

parents 4a6b9095 443513cc

res/layout/app_item.xml

+10 −5
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ 
    android:paddingTop="16dp"

    android:paddingBottom="16dp"

    android:gravity="top"

    android:columnCount="3">

    android:columnCount="3"

    android:duplicateParentState="true">



    <ImageView

        android:id="@android:id/icon"
@@ -30,7 +31,8 @@ 
        android:layout_gravity="center"

        android:scaleType="fitXY"

        android:layout_marginEnd="16dip"

        android:contentDescription="@null" />

        android:contentDescription="@null"

        android:duplicateParentState="true" />



    <TextView

        android:id="@android:id/title"
@@ -41,7 +43,8 @@ 
        android:ellipsize="marquee"

        android:textAppearance="@android:style/TextAppearance.Material.Subhead"

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

        android:textAlignment="viewStart" />

        android:textAlignment="viewStart"

        android:duplicateParentState="true" />



    <TextView

        android:id="@android:id/summary"
@@ -54,7 +57,8 @@ 
        android:singleLine="true"

        android:ellipsize="marquee"

        android:textAppearance="@android:style/TextAppearance.Material.Subhead"

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

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

        android:duplicateParentState="true" />



    <FrameLayout

        android:id="@android:id/widget_frame"
@@ -63,6 +67,7 @@ 
        android:layout_toEndOf="@android:id/icon"

        android:layout_below="@android:id/title"

        android:layout_alignParentEnd="true"

        android:layout_gravity="fill_horizontal|top" />

        android:layout_gravity="fill_horizontal|top"

        android:duplicateParentState="true" />



</RelativeLayout>

res/layout/widget_text_views.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="horizontal">

    android:orientation="horizontal"

    android:duplicateParentState="true">



    <TextView

        android:id="@+id/widget_text1"

src/com/android/settings/applications/ManageApplications.java

+11 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import com.android.settings.Utils; 
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;

import com.android.settings.applications.AppStateUsageBridge.UsageState;

import com.android.settings.fuelgauge.HighPowerDetail;

import com.android.settings.fuelgauge.PowerWhitelistBackend;

import com.android.settings.notification.AppNotificationSettings;

import com.android.settings.notification.NotificationBackend;

import com.android.settings.notification.NotificationBackend.AppRow;
@@ -1011,6 +1012,15 @@ public class ManageApplications extends InstrumentedFragment 
            return false;

        }



        @Override

        public boolean isEnabled(int position) {

            if (mManageApplications.mListType != LIST_TYPE_HIGH_POWER) {

                return true;

            }

            ApplicationsState.AppEntry entry = mEntries.get(position);

            return !PowerWhitelistBackend.getInstance().isSysWhitelisted(entry.info.packageName);

        }



        public View getView(int position, View convertView, ViewGroup parent) {

            // A ViewHolder keeps references to children views to avoid unnecessary calls

            // to findViewById() on each row.
@@ -1042,6 +1052,7 @@ public class ManageApplications extends InstrumentedFragment 
            }

            mActive.remove(convertView);

            mActive.add(convertView);

            convertView.setEnabled(isEnabled(position));

            return convertView;

        }