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

Commit 6fce81a6 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 508fedc4: Improvements to manage apps / running services: 

Merge commit '508fedc4' into gingerbread-plus-aosp

* commit '508fedc4':
  Improvements to manage apps / running services:
parents 9248082d 508fedc4

AndroidManifest.xml

+7 −7
Original line number Diff line number Diff line
@@ -380,10 +380,10 @@ 
            </intent-filter>

        </activity>



        <!--

        <activity android:name=".applications.RunningServices"

        <!-- Provide direct entry into manage apps showing running services. -->

        <activity-alias android:name=".RunningServices"

                android:label="@string/runningservices_settings_title"

                  android:clearTaskOnLaunch="true">

            android:targetActivity=".applications.ManageApplications">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -391,11 +391,11 @@ 
                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

        </activity>

        -->

        </activity-alias>

        

        <!-- Provide direct entry into manage apps showing running services. -->

        <activity-alias android:name=".RunningServices"

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

                android:label="@string/storageuse_settings_title"

            android:targetActivity=".applications.ManageApplications">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

res/layout/compute_sizes.xml→res/layout/manage_applications.xml

+16 −8
Original line number Diff line number Diff line
@@ -18,12 +18,20 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent" >



    <ListView 

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

        android:id="@android:id/list"

    <FrameLayout android:id="@+id/list_container"

            android:layout_width="match_parent"

            android:layout_height="match_parent">

        <ListView android:id="@android:id/list"

            android:drawSelectorOnTop="false"

            android:layout_width="match_parent"

            android:layout_height="match_parent" />

        <TextView android:id="@android:id/empty"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:gravity="center"

                android:text="@string/no_applications"

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

    </FrameLayout>



    <view class="com.android.settings.applications.RunningProcessesView"

            android:id="@+id/running_processes"

res/values/strings.xml

+9 −1
Original line number Diff line number Diff line
@@ -1687,7 +1687,8 @@ 
    <string name="filter_apps_onsdcard">On SD card</string>

    <!-- Manage applications, text telling using an application is disabled. -->

    <string name="disabled">Disabled</string>

    <string name="loading">Loading\u2026</string>

    <!-- Text shown when there are no applications to display. -->

    <string name="no_applications">No applications.</string>

    <!-- Manage app screen, shown when the activity is busy recomputing the size of each app -->

    <string name="recompute_size">Recomputing size\u2026</string>

    <!-- Manage applications, individual application screen, confirmation dialog title. Displays when user selects to "Clear data". -->
@@ -1750,12 +1751,19 @@ found in the list of installed applications.</string> 
    <!-- Manage applications. application installation location summary -->

    <string name="app_install_location_summary">Change the preferred installation location for new applications.</string>



    <!-- Services settings screen, setting option name for the user to go to the screen to view app storage use -->

    <string name="storageuse_settings_title">Storage use</string>

    <!-- Services settings screen, setting option summary for the user to go to the screen to app storage use -->

    <string name="storageuse_settings_summary">View storage used by applications</string>



    <!-- Services settings screen, setting option name for the user to go to the screen to view running services -->

    <string name="runningservices_settings_title">Running services</string>

    <!-- Services settings screen, setting option summary for the user to go to the screen to view running services  -->

    <string name="runningservices_settings_summary">View and control currently running services</string>

    <!-- Label for a service item when it is restarting -->

    <string name="service_restarting">Restarting</string>

    <!-- Text shown when there are no services running -->

    <string name="no_running_services">Nothing running.</string>

    <!-- Running services, description for a service in the started state -->

    <string name="service_started_by_app">Started by application.</string>

    <!-- Running services, description for a service in the started state -->

res/xml/application_settings.xml

+8 −0
Original line number Diff line number Diff line
@@ -59,6 +59,14 @@ 
                android:targetClass="com.android.settings.RunningServices" />

    </PreferenceScreen>



    <PreferenceScreen

            android:title="@string/storageuse_settings_title"

            android:summary="@string/storageuse_settings_summary">

        <intent android:action="android.intent.action.MAIN"

                android:targetPackage="com.android.settings"

                android:targetClass="com.android.settings.applications.StorageUse" />

    </PreferenceScreen>



    <PreferenceScreen

            android:key="power_usage"

            android:title="@string/power_usage_summary_title"

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

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ public class ApplicationsState { 
        if (entry.icon != null) {

            return;

        }

        synchronized (mEntriesMap) {

        synchronized (entry) {

            if (entry.icon == null) {

                entry.icon = entry.info.loadIcon(mPm);

            }