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

Commit 00ffc338 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [2939596, 2938808] into oc-m2-release 

Change-Id: I12855e6cbfcc46993ea76d4009cb8d7b4f266b1a
parents 33951dbf 781be012

AndroidManifest.xml

+14 −0
Original line number Diff line number Diff line
@@ -1163,6 +1163,20 @@ 
                android:value="true" />

        </activity>



        <activity android:name="Settings$RealRunningServicesActivity"

            android:label="@string/runningservices_settings_title"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

            <intent-filter>

                <action android:name="android.intent.action.settings.RUNNING_SERVICES" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

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

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

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

                android:value="true" />

        </activity>



        <!-- Provide direct entry into manage apps showing storage usage of apps. -->

        <activity android:name="Settings$StorageUseActivity"

                android:label="@string/storageuse_settings_title"

res/values/arrays.xml

+1 −0
Original line number Diff line number Diff line
@@ -972,6 +972,7 @@ 
        <item>0</item>

        <item>5</item>

        <item>15</item>

        <item>100</item>

    </integer-array>



    <!-- Process stats memory use details: labels for memory states -->

res/xml/shortcuts.xml

+6 −0
Original line number Diff line number Diff line
@@ -36,4 +36,10 @@ 
        android:shortcutShortLabel="@string/power_usage_summary_title" >

        <intent android:action="android.intent.action.POWER_USAGE_SUMMARY" />

    </shortcut>

    <shortcut

        android:shortcutId="manifest-running-services"

        android:icon="@drawable/ic_launcher_settings"

        android:shortcutShortLabel="@string/show_running_services" >

        <intent android:action="android.intent.action.settings.RUNNING_SERVICES"/>

    </shortcut>

</shortcuts>
 
 No newline at end of file

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ public class Settings extends SettingsActivity { 
    public static class PrivacySettingsActivity extends SettingsActivity { /* empty */ }

    public static class FactoryResetActivity extends SettingsActivity { /* empty */ }

    public static class RunningServicesActivity extends SettingsActivity { /* empty */ }

    public static class RealRunningServicesActivity extends SettingsActivity { /* empty */ }

    public static class PowerUsageSummaryActivity extends SettingsActivity { /* empty */ }

    public static class BatterySaverSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AccountSyncSettingsActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import com.android.settings.applications.PictureInPictureDetails; 
import com.android.settings.applications.PictureInPictureSettings;

import com.android.settings.applications.ProcessStatsSummary;

import com.android.settings.applications.ProcessStatsUi;

import com.android.settings.applications.RunningServices;

import com.android.settings.applications.SpecialAccessSettings;

import com.android.settings.applications.UsageAccessDetails;

import com.android.settings.applications.VrListenerSettings;
@@ -139,6 +140,7 @@ public class SettingsGateway { 
     * security exception if the fragment it needs to display is not in this list.

     */

    public static final String[] ENTRY_FRAGMENTS = {

            RunningServices.class.getName(),

            WifiSettings.class.getName(),

            ConfigureWifiSettings.class.getName(),

            SavedAccessPointsWifiSettings.class.getName(),