summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AndroidManifest.xml184
-rw-r--r--res/drawable-hdpi/ic_launcher_settings.pngbin0 -> 7230 bytes
-rw-r--r--res/drawable-mdpi/ic_launcher_settings.pngbin0 -> 4122 bytes
-rw-r--r--res/drawable-xhdpi/ic_launcher_settings.pngbin0 -> 11183 bytes
-rw-r--r--src/com/android/settings/applications/ManageApplications.java6
5 files changed, 179 insertions, 11 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 649e06c..cbb9bc6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -126,6 +126,19 @@
android:resource="@id/wifi_settings" />
</activity>
+ <!-- Keep compatibility with old shortcuts. -->
+ <activity-alias android:name=".wifi.WifiSettings"
+ android:label="@string/wifi_settings"
+ android:targetActivity="Settings$WifiSettingsActivity"
+ android:configChanges="orientation|keyboardHidden|screenSize"
+ android:exported="true"
+ android:clearTaskOnLaunch="true">
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.wifi.WifiSettings" />
+ <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+ android:resource="@id/wifi_settings" />
+ </activity-alias>
+
<activity android:name=".wifi.WifiPickerActivity"
android:clearTaskOnLaunch="true">
<intent-filter>
@@ -235,6 +248,18 @@
android:resource="@id/bluetooth_settings" />
</activity>
+ <!-- Keep compatibility with old shortcuts. -->
+ <activity-alias android:name=".bluetooth.BluetoothSettings"
+ android:label="@string/bluetooth_settings_title"
+ android:targetActivity="Settings$BluetoothSettingsActivity"
+ android:exported="true"
+ android:clearTaskOnLaunch="true">
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.bluetooth.BluetoothSettings" />
+ <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+ android:resource="@id/bluetooth_settings" />
+ </activity-alias>
+
<activity android:name=".bluetooth.DevicePickerActivity"
android:theme="@android:style/Theme.Holo.DialogWhenLarge"
android:label="@string/device_picker"
@@ -371,6 +396,18 @@
android:resource="@id/language_settings" />
</activity>
+ <!-- Keep compatibility with old shortcuts. -->
+ <activity-alias android:name="LanguageSettings"
+ android:label="@string/language_keyboard_settings_title"
+ android:clearTaskOnLaunch="true"
+ android:exported="true"
+ android:targetActivity="Settings$InputMethodAndLanguageSettingsActivity">
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.inputmethod.InputMethodAndLanguageSettings" />
+ <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+ android:resource="@id/language_settings" />
+ </activity-alias>
+
<activity android:name="Settings$SpellCheckersSettingsActivity"
android:label="@string/spellcheckers_settings_title"
android:clearTaskOnLaunch="true">
@@ -427,6 +464,22 @@
android:value="com.android.settings.Settings$InputMethodAndLanguageSettingsActivity" />
</activity>
+ <!-- Keep compatibility with old shortcuts. -->
+ <activity-alias android:name="UserDictionarySettings"
+ android:label="@string/user_dict_settings_titlebar"
+ android:clearTaskOnLaunch="true"
+ android:exported="true"
+ android:targetActivity="Settings$UserDictionarySettingsActivity">
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.UserDictionarySettings" />
+ <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+ android:resource="@id/language_settings" />
+ <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
+ android:resource="@string/language_keyboard_settings_title" />
+ <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
+ android:value="com.android.settings.Settings$InputMethodAndLanguageSettingsActivity" />
+ </activity-alias>
+
<activity android:name="Settings$SoundSettingsActivity"
android:label="@string/sound_settings"
android:clearTaskOnLaunch="true">
@@ -444,6 +497,18 @@
android:resource="@id/sound_settings" />
</activity>
+ <!-- Keep compatibility with old shortcuts. -->
+ <activity-alias android:name="SoundSettings"
+ android:label="@string/sound_settings"
+ android:clearTaskOnLaunch="true"
+ android:exported="true"
+ android:targetActivity="Settings$SoundSettingsActivity">
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.SoundSettings" />
+ <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+ android:resource="@id/sound_settings" />
+ </activity-alias>
+
<activity android:name="Settings$DisplaySettingsActivity"
android:label="@string/display_settings"
android:clearTaskOnLaunch="true">
@@ -461,6 +526,18 @@
android:resource="@id/display_settings" />
</activity>
+ <!-- Keep compatibility with old shortcuts. -->
+ <activity-alias android:name="DisplaySettings"
+ android:label="@string/display_settings"
+ android:clearTaskOnLaunch="true"
+ android:exported="true"
+ android:targetActivity="Settings$DisplaySettingsActivity">
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.DisplaySettings" />
+ <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+ android:resource="@id/display_settings" />
+ </activity-alias>
+
<activity android:name="Settings$DockSettingsActivity"
android:label="@string/dock_settings_title"
android:enabled="@bool/has_dock_settings"
@@ -477,6 +554,19 @@
android:resource="@id/dock_settings" />
</activity>
+ <!-- Keep compatibility with old shortcuts. -->
+ <activity-alias android:name="DockSettings"
+ android:label="@string/dock_settings_title"
+ android:enabled="@bool/has_dock_settings"
+ android:clearTaskOnLaunch="true"
+ android:exported="true"
+ android:targetActivity="Settings$DockSettingsActivity">
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.DockSettings" />
+ <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+ android:resource="@id/dock_settings" />
+ </activity-alias>
+
<activity android:name="Settings$DeviceInfoSettingsActivity"
android:theme="@android:style/Theme.Holo.DialogWhenLarge"
android:label="@string/device_info_settings">
@@ -530,6 +620,18 @@
</activity>
<!-- Keep compatibility with old shortcuts. -->
+ <activity-alias android:name=".applications.ManageApplications"
+ android:label="@string/applications_settings"
+ android:clearTaskOnLaunch="true"
+ android:exported="true"
+ android:targetActivity="Settings$ManageApplicationsActivity">
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.applications.ManageApplications" />
+ <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+ android:resource="@id/application_settings" />
+ </activity-alias>
+
+ <!-- Keep compatibility with old shortcuts. Pre-gingerbread. -->
<activity-alias android:name=".ManageApplications"
android:label="@string/manageapplications_settings_title"
android:clearTaskOnLaunch="true"
@@ -537,6 +639,32 @@
android:targetActivity="Settings$ManageApplicationsActivity">
</activity-alias>
+ <!-- Provide direct entry into manage apps showing running services.
+ This is for compatibility with old shortcuts. -->
+ <activity-alias android:name=".RunningServices"
+ android:label="@string/runningservices_settings_title"
+ android:clearTaskOnLaunch="true"
+ android:exported="true"
+ android:targetActivity="Settings$ManageApplicationsActivity">
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.applications.ManageApplications" />
+ <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+ android:resource="@id/application_settings" />
+ </activity-alias>
+
+ <!-- Provide direct entry into manage apps showing storage usage for apps.
+ This is for compatibility with old shortcuts. -->
+ <activity-alias android:name=".applications.StorageUse"
+ android:label="@string/storageuse_settings_title"
+ android:clearTaskOnLaunch="true"
+ android:exported="true"
+ android:targetActivity="Settings$ManageApplicationsActivity">
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.applications.ManageApplications" />
+ <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+ android:resource="@id/application_settings" />
+ </activity-alias>
+
<!-- Still need a top-level activity for showing app details. Aliasing
trick is so the code that is now a fragment can still be called
InstalledAppDetails. -->
@@ -545,9 +673,11 @@
android:exported="true">
</activity>
+ <!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name=".applications.InstalledAppDetails"
- android:label="@string/application_info_label"
- android:targetActivity=".applications.InstalledAppDetailsTop">
+ android:label="@string/application_info_label"
+ android:exported="true"
+ android:targetActivity=".applications.InstalledAppDetailsTop">
<intent-filter>
<action android:name="android.settings.APPLICATION_DETAILS_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
@@ -570,7 +700,7 @@
android:resource="@id/application_settings" />
</activity>
- <!-- Provide direct entry into manage apps showing running services. -->
+ <!-- Provide direct entry into manage apps showing storage usage of apps. -->
<activity android:name="Settings$StorageUseActivity"
android:label="@string/storageuse_settings_title">
<intent-filter>
@@ -621,6 +751,19 @@
android:resource="@id/security_settings" />
</activity>
+ <!-- Keep compatibility with old shortcuts. -->
+ <activity-alias android:name="SecuritySettings"
+ android:label="@string/security_settings_title"
+ android:configChanges="orientation|keyboardHidden|screenSize"
+ android:clearTaskOnLaunch="true"
+ android:exported="true"
+ android:targetActivity="Settings$SecuritySettingsActivity">
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.SecuritySettings" />
+ <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+ android:resource="@id/security_settings" />
+ </activity-alias>
+
<activity android:name="Settings$PrivacySettingsActivity"
android:label="@string/privacy_settings_title"
android:configChanges="orientation|keyboardHidden|screenSize"
@@ -673,6 +816,22 @@
android:value="com.android.settings.Settings$SecuritySettingsActivity" />
</activity>
+ <!-- Keep compatibility with old shortcuts. -->
+ <activity-alias android:name="DeviceAdminSettings"
+ android:label="@string/device_admin_settings_title"
+ android:clearTaskOnLaunch="true"
+ android:exported="true"
+ android:targetActivity="Settings$DeviceAdminSettingsActivity">
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.DeviceAdminSettings" />
+ <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+ android:resource="@id/security_settings" />
+ <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
+ android:resource="@string/security_settings_title" />
+ <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
+ android:value="com.android.settings.Settings$SecuritySettingsActivity" />
+ </activity-alias>
+
<activity android:name="DeviceAdminAdd"
android:label="@string/device_admin_add_title"
android:theme="@android:style/Theme.Holo.DialogWhenLarge"
@@ -835,6 +994,7 @@
android:resource="@id/development_settings" />
</activity>
+ <!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name="DevelopmentSettings"
android:clearTaskOnLaunch="true"
android:exported="true"
@@ -865,17 +1025,12 @@
android:value="com.android.settings.Settings$StorageSettingsActivity" />
</activity>
+ <!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name="UsbSettings"
android:clearTaskOnLaunch="true"
android:exported="true"
android:label="@string/storage_title_usb"
android:targetActivity="Settings$DevelopmentSettingsActivity">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <action android:name="android.settings.STORAGE_USB_SETTINGS" />
- <action android:name="com.android.settings.STORAGE_USB_SETTINGS" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.deviceinfo.UsbSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
@@ -1112,6 +1267,17 @@
android:resource="@id/battery_settings" />
</activity>
+ <!-- Keep compatibility with old shortcuts. -->
+ <activity-alias android:name=".fuelgauge.PowerUsageSummary"
+ android:label="@string/power_usage_summary_title"
+ android:exported="true"
+ android:targetActivity="Settings$PowerUsageSummaryActivity">
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.fuelgauge.PowerUsageSummary" />
+ <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+ android:resource="@id/battery_settings" />
+ </activity-alias>
+
<activity
android:name="Settings$ManageAccountsSettingsActivity"
android:label="@string/sync_settings">
diff --git a/res/drawable-hdpi/ic_launcher_settings.png b/res/drawable-hdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..c02bd42
--- /dev/null
+++ b/res/drawable-hdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_settings.png b/res/drawable-mdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..05cdd9a
--- /dev/null
+++ b/res/drawable-mdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_settings.png b/res/drawable-xhdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..2b2907b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_launcher_settings.png
Binary files differ
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 717c9df..948ddb0 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -560,10 +560,12 @@ public class ManageApplications extends Fragment implements
if (className == null) {
className = intent.getComponent().getClassName();
}
- if (className.equals(RunningServicesActivity.class.getName())) {
+ if (className.equals(RunningServicesActivity.class.getName())
+ || className.endsWith(".RunningServices")) {
defaultTabTag = TAB_RUNNING;
} else if (className.equals(StorageUseActivity.class.getName())
- || Intent.ACTION_MANAGE_PACKAGE_STORAGE.equals(action)) {
+ || Intent.ACTION_MANAGE_PACKAGE_STORAGE.equals(action)
+ || className.endsWith(".StorageUse")) {
mSortOrder = SORT_ORDER_SIZE;
mFilterApps = FILTER_APPS_ALL;
defaultTabTag = TAB_ALL;
generated by cgit v1.1 at 2024-09-09 09:33:40 +0000