summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml43
1 files changed, 31 insertions, 12 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 78c0f5b..7e002aa 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -350,7 +350,7 @@
</intent-filter>
</activity>
- <activity android:name="ManageApplications"
+ <activity android:name=".applications.ManageApplications"
android:label="@string/manageapplications_settings_title"
android:clearTaskOnLaunch="true"
android:configChanges="orientation|keyboardHidden">
@@ -365,15 +365,22 @@
</intent-filter>
</activity>
- <activity android:name="InstalledAppDetails" android:label="@string/application_info_label">
+ <!-- Keep compatibility with old shortcuts. -->
+ <activity-alias android:name=".ManageApplications"
+ android:targetActivity=".applications.ManageApplications"
+ android:exported="true" />
+
+ <activity android:name=".applications.InstalledAppDetails"
+ android:label="@string/application_info_label">
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
+ <action android:name="android.settings.APPLICATION_DETAILS_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.VOICE_LAUNCH" />
+ <data android:scheme="package" />
</intent-filter>
</activity>
- <activity android:name="RunningServices"
+ <!--
+ <activity android:name=".applications.RunningServices"
android:label="@string/runningservices_settings_title"
android:clearTaskOnLaunch="true">
<intent-filter>
@@ -384,6 +391,24 @@
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
</activity>
+ -->
+
+ <!-- Provide direct entry into manage apps showing running services. -->
+ <activity-alias android:name=".RunningServices"
+ android:targetActivity=".applications.ManageApplications">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.MONKEY" />
+ <category android:name="android.intent.category.VOICE_LAUNCH" />
+ <category android:name="com.android.settings.SHORTCUT" />
+ </intent-filter>
+ </activity-alias>
+
+ <activity android:name=".applications.RunningServiceDetails"
+ android:theme="@android:style/Theme.NoTitleBar"
+ android:label="@string/runningservicedetails_settings_title">
+ </activity>
<activity android:name="SecuritySettings"
android:label="@string/location_security_settings_title"
@@ -687,13 +712,6 @@
</intent-filter>
</activity>
- <activity android:name=".battery_history.BatteryHistory" android:label="@string/battery_history_label">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
- </intent-filter>
- </activity>
-
<activity android:name="Display" android:label="@string/display_label"
android:configChanges="fontScale">
<intent-filter>
@@ -763,6 +781,7 @@
</activity>
<activity android:name=".fuelgauge.PowerUsageSummary"
+ android:theme="@android:style/Theme.NoTitleBar"
android:label="@string/power_usage_summary_title"
android:clearTaskOnLaunch="true"
>