PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add compatibility aliases for shortcuts added to home screen in gingerbread.

Browse Source 
Bug: 5016573
Change-Id: I1898b2f51216354829acca11e73186465f25ec32
This commit is contained in:
Amith Yamasani
2011-11-10 15:28:59 -08:00
parent 4b94e07385
commit af9252849f
5 changed files with 179 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

180
AndroidManifest.xml
View File

@@ -126,6 +126,19 @@
android:resource="@id/wifi_settings" /> android:resource="@id/wifi_settings" />
</activity> </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" <activity android:name=".wifi.WifiPickerActivity"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true">
<intent-filter> <intent-filter>
@@ -235,6 +248,18 @@
android:resource="@id/bluetooth_settings" /> android:resource="@id/bluetooth_settings" />
</activity> </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" <activity android:name=".bluetooth.DevicePickerActivity"
android:theme="@android:style/Theme.Holo.DialogWhenLarge" android:theme="@android:style/Theme.Holo.DialogWhenLarge"
android:label="@string/device_picker" android:label="@string/device_picker"
@@ -371,6 +396,18 @@
android:resource="@id/language_settings" /> android:resource="@id/language_settings" />
</activity> </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" <activity android:name="Settings$SpellCheckersSettingsActivity"
android:label="@string/spellcheckers_settings_title" android:label="@string/spellcheckers_settings_title"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true">
@@ -427,6 +464,22 @@
android:value="com.android.settings.Settings$InputMethodAndLanguageSettingsActivity" /> android:value="com.android.settings.Settings$InputMethodAndLanguageSettingsActivity" />
</activity> </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" <activity android:name="Settings$SoundSettingsActivity"
android:label="@string/sound_settings" android:label="@string/sound_settings"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true">
@@ -444,6 +497,18 @@
android:resource="@id/sound_settings" /> android:resource="@id/sound_settings" />
</activity> </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" <activity android:name="Settings$DisplaySettingsActivity"
android:label="@string/display_settings" android:label="@string/display_settings"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true">
@@ -461,6 +526,18 @@
android:resource="@id/display_settings" /> android:resource="@id/display_settings" />
</activity> </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" <activity android:name="Settings$DockSettingsActivity"
android:label="@string/dock_settings_title" android:label="@string/dock_settings_title"
android:enabled="@bool/has_dock_settings" android:enabled="@bool/has_dock_settings"
@@ -477,6 +554,19 @@
android:resource="@id/dock_settings" /> android:resource="@id/dock_settings" />
</activity> </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" <activity android:name="Settings$DeviceInfoSettingsActivity"
android:theme="@android:style/Theme.Holo.DialogWhenLarge" android:theme="@android:style/Theme.Holo.DialogWhenLarge"
android:label="@string/device_info_settings"> android:label="@string/device_info_settings">
@@ -530,6 +620,18 @@
</activity> </activity>
<!-- Keep compatibility with old shortcuts. --> <!-- 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" <activity-alias android:name=".ManageApplications"
android:label="@string/manageapplications_settings_title" android:label="@string/manageapplications_settings_title"
android:clearTaskOnLaunch="true" android:clearTaskOnLaunch="true"
@@ -537,6 +639,32 @@
android:targetActivity="Settings$ManageApplicationsActivity"> android:targetActivity="Settings$ManageApplicationsActivity">
</activity-alias> </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 <!-- 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 trick is so the code that is now a fragment can still be called
InstalledAppDetails. --> InstalledAppDetails. -->
@@ -545,8 +673,10 @@
android:exported="true"> android:exported="true">
</activity> </activity>
<!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name=".applications.InstalledAppDetails" <activity-alias android:name=".applications.InstalledAppDetails"
android:label="@string/application_info_label" android:label="@string/application_info_label"
android:exported="true"
android:targetActivity=".applications.InstalledAppDetailsTop"> android:targetActivity=".applications.InstalledAppDetailsTop">
<intent-filter> <intent-filter>
<action android:name="android.settings.APPLICATION_DETAILS_SETTINGS" /> <action android:name="android.settings.APPLICATION_DETAILS_SETTINGS" />
@@ -570,7 +700,7 @@
android:resource="@id/application_settings" /> android:resource="@id/application_settings" />
</activity> </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" <activity android:name="Settings$StorageUseActivity"
android:label="@string/storageuse_settings_title"> android:label="@string/storageuse_settings_title">
<intent-filter> <intent-filter>
@@ -621,6 +751,19 @@
android:resource="@id/security_settings" /> android:resource="@id/security_settings" />
</activity> </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" <activity android:name="Settings$PrivacySettingsActivity"
android:label="@string/privacy_settings_title" android:label="@string/privacy_settings_title"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
@@ -673,6 +816,22 @@
android:value="com.android.settings.Settings$SecuritySettingsActivity" /> android:value="com.android.settings.Settings$SecuritySettingsActivity" />
</activity> </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" <activity android:name="DeviceAdminAdd"
android:label="@string/device_admin_add_title" android:label="@string/device_admin_add_title"
android:theme="@android:style/Theme.Holo.DialogWhenLarge" android:theme="@android:style/Theme.Holo.DialogWhenLarge"
@@ -835,6 +994,7 @@
android:resource="@id/development_settings" /> android:resource="@id/development_settings" />
</activity> </activity>
<!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name="DevelopmentSettings" <activity-alias android:name="DevelopmentSettings"
android:clearTaskOnLaunch="true" android:clearTaskOnLaunch="true"
android:exported="true" android:exported="true"
@@ -865,17 +1025,12 @@
android:value="com.android.settings.Settings$StorageSettingsActivity" /> android:value="com.android.settings.Settings$StorageSettingsActivity" />
</activity> </activity>
<!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name="UsbSettings" <activity-alias android:name="UsbSettings"
android:clearTaskOnLaunch="true" android:clearTaskOnLaunch="true"
android:exported="true" android:exported="true"
android:label="@string/storage_title_usb" android:label="@string/storage_title_usb"
android:targetActivity="Settings$DevelopmentSettingsActivity"> 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" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.deviceinfo.UsbSettings" /> android:value="com.android.settings.deviceinfo.UsbSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
@@ -1112,6 +1267,17 @@
android:resource="@id/battery_settings" /> android:resource="@id/battery_settings" />
</activity> </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 <activity
android:name="Settings$ManageAccountsSettingsActivity" android:name="Settings$ManageAccountsSettingsActivity"
android:label="@string/sync_settings"> android:label="@string/sync_settings">

BIN
res/drawable-hdpi/ic_launcher_settings.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
res/drawable-mdpi/ic_launcher_settings.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
res/drawable-xhdpi/ic_launcher_settings.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

6
src/com/android/settings/applications/ManageApplications.java
View File

@@ -560,10 +560,12 @@ public class ManageApplications extends Fragment implements
if (className == null) { if (className == null) {
className = intent.getComponent().getClassName(); className = intent.getComponent().getClassName();
} }
if (className.equals(RunningServicesActivity.class.getName())) { if (className.equals(RunningServicesActivity.class.getName())
|| className.endsWith(".RunningServices")) {
defaultTabTag = TAB_RUNNING; defaultTabTag = TAB_RUNNING;
} else if (className.equals(StorageUseActivity.class.getName()) } 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; mSortOrder = SORT_ORDER_SIZE;
mFilterApps = FILTER_APPS_ALL; mFilterApps = FILTER_APPS_ALL;
defaultTabTag = TAB_ALL; defaultTabTag = TAB_ALL;