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

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

Merge "Add high power whitelist for apps" into mnc-dev

parents 32ba436b 1eb54eb2

AndroidManifest.xml

+9 −0
Original line number Diff line number Diff line
@@ -923,6 +923,15 @@ 
                android:value="true" />

        </activity>



        <activity android:name="Settings$HighPowerApplicationsActivity"

                android:label="@string/high_power_apps"

                android:taskAffinity="">

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.applications.ManageApplications" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>



        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name=".applications.ManageApplications"

                android:label="@string/applications_settings"

res/layout/power_usage_detail_item_text.xml→res/layout/horizontal_preference.xml

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

<!-- Copyright (C) 2009 The Android Open Source Project

<!--

     Copyright (C) 2015 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.
@@ -14,35 +15,29 @@ 
     limitations under the License.

-->



<RelativeLayout

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



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

    android:layout_width="match_parent"

    android:layout_height="wrap_content">

    android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:paddingTop="3dp"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">



    <!--Label for the item-->

    <TextView

        android:id="@+id/label"

        android:layout_width="wrap_content"

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

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

        android:layout_height="wrap_content"

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

        android:textStyle="bold"

        android:singleLine="true"

        android:ellipsize="middle"

        android:layout_alignParentStart="true"

        android:layout_toStartOf="@+id/value"

        android:layout_marginBottom="4dip"

        android:layout_marginTop="4dip"

        android:layout_marginEnd="4dip"/>

        android:layout_width="wrap_content"

        android:layout_weight="1" />



    <TextView

        android:id="@+id/value"

        android:layout_width="wrap_content"

        android:id="@android:id/summary"

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

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

        android:layout_height="wrap_content"

        android:layout_alignParentEnd="true"

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

        android:textStyle="normal"

        android:singleLine="true"

        android:layout_marginBottom="4dip"

        android:layout_marginTop="4dip" />



</RelativeLayout>
 
        android:layout_width="wrap_content"

        android:layout_weight="1"

        android:gravity="end" />



</LinearLayout>

res/layout/power_usage_action_item.xml

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

<!-- Copyright (C) 2009 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:minHeight="?android:attr/listPreferredItemHeight"

    android:gravity="center_vertical"

    android:paddingStart="4dip"

    android:focusable="true"

    android:orientation="vertical"

    android:paddingEnd="?android:attr/scrollbarSize">



    <TextView android:id="@+id/summary"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="2dip"

            android:paddingBottom="4dip"

            android:ellipsize="marquee"

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



    <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal">

        <!-- Spacer -->

        <View

                android:id="@+id/buttons_spacer_left"

                android:layout_width="0dip"

                android:layout_height="wrap_content"

                android:layout_weight="0.7"

                android:visibility="invisible" />



        <Button

                android:id="@+id/action_button"

                android:layout_width="150dip"

                android:paddingEnd="6dip"

                android:layout_weight="0.3"

                android:layout_height="wrap_content"/>

    </LinearLayout>

</LinearLayout>

res/layout/power_usage_details.xml

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

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

-->



<ScrollView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipToPadding="false"

    android:scrollbarStyle="@integer/preference_scrollbar_style">



    <LinearLayout

        android:id="@+id/all_details"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

        android:paddingTop="5dip"

        android:paddingBottom="5dip"

        android:orientation="vertical">



        <include layout="@layout/app_percentage_item" />



        <!-- Force stop and report buttons -->

        <LinearLayout

                android:id="@+id/two_buttons_panel"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:paddingBottom="6dip"

                android:orientation="vertical">

            <include

                    layout="@layout/two_buttons_panel"/>

        </LinearLayout>



        <TextView

                style="?android:attr/listSeparatorTextViewStyle"

                android:text="@string/details_subtitle" />



        <LinearLayout

                android:id="@+id/details"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:paddingStart="6dip"

                android:orientation="vertical">



            <!-- Insert detail items here -->



        </LinearLayout>



        <LinearLayout

                android:id="@+id/controls"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical">



            <TextView

                    android:id="@+id/controls_title"

                    style="?android:attr/listSeparatorTextViewStyle"

                    android:layout_marginTop="6dip"

                    android:text="@string/controls_subtitle" />



            <!-- Controls go here ... -->



        </LinearLayout>



        <LinearLayout

                android:id="@+id/messages"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical">



            <TextView

                    android:id="@+id/messages_title"

                    style="?android:attr/listSeparatorTextViewStyle"

                    android:layout_marginTop="6dip" />



            <!-- Messages go here ... -->



        </LinearLayout>



        <TextView

                android:id="@+id/packages_section_title"

                style="?android:attr/listSeparatorTextViewStyle"

                android:layout_marginTop="6dip"

                android:text="@string/packages_subtitle" />



        <LinearLayout

                android:id="@+id/packages_section"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:paddingStart="6dip"

                android:orientation="vertical">



            <!-- Insert detail items here -->



        </LinearLayout>



    </LinearLayout>

</ScrollView>

res/layout/power_usage_message_item.xml

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

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

-->



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

        android:id="@+id/message"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="2dip"

        android:minHeight="?android:attr/listPreferredItemHeight"

        android:paddingStart="4dip"

        android:paddingEnd="?android:attr/scrollbarSize"

        android:paddingBottom="4dip"

        android:ellipsize="marquee"

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