summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorDvTonder <david.vantonder@gmail.com>2012-11-25 08:05:59 -0500
committerDvTonder <david.vantonder@gmail.com>2012-11-25 08:05:59 -0500
commit2f0ded7678df235b850339cefff1bb10021690c7 (patch)
treeb665832c4bde16cd71fbdf0dbc7314691fe9af2e /AndroidManifest.xml
parent31d93bf306ceb46b4f6cfdc86c0497a4a2565123 (diff)
downloadpackages_apps_settings-2f0ded7678df235b850339cefff1bb10021690c7.zip
packages_apps_settings-2f0ded7678df235b850339cefff1bb10021690c7.tar.gz
packages_apps_settings-2f0ded7678df235b850339cefff1bb10021690c7.tar.bz2
Settings: Forward port Performance settings
Change-Id: Ib510b35fc2763c6942737afa33873aa5d349a173
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml89
1 files changed, 49 insertions, 40 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 688facc..f55d7d3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -61,6 +61,7 @@
<uses-permission android:name="android.permission.MANAGE_USERS" />
<uses-permission android:name="android.permission.READ_PROFILE" />
<uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY" />
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<application android:label="@string/settings_label"
android:icon="@mipmap/ic_launcher_settings"
@@ -138,14 +139,6 @@
android:resource="@id/wifi_settings" />
</activity>
- <activity android:name="Settings$AnonymousStatsActivity"
- android:label="@string/anonymous_statistics_title"
- android:configChanges="orientation|keyboardHidden|screenSize"
- android:clearTaskOnLaunch="true">
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.cmstats.AnonymousStats" />
- </activity>
-
<!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name=".wifi.WifiSettings"
android:taskAffinity="com.android.settings"
@@ -1459,37 +1452,13 @@
android:theme="@style/CryptKeeperBlankTheme"
/>
- <!-- Pseudo-activity used to provide an intent-filter entry point to encryption settings -->
- <activity android:name="Settings$CryptKeeperSettingsActivity"
- android:label="@string/crypt_keeper_encrypt_title">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <action android:name="android.app.action.START_ENCRYPTION" />
- <category android:name="android.intent.category.DEFAULT" /> />
- </intent-filter>
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.CryptKeeperSettings" />
- <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
- android:resource="@id/security_settings" />
- </activity>
+ <!-- CyanogenMod activities Start -->
+ <activity android:name=".cyanogenmod.PowerWidget" />
- <activity android:name="Settings$DataUsageSummaryActivity"
- android:label="@string/data_usage_summary_title"
- android:uiOptions="none"
- android:taskAffinity=""
- android:excludeFromRecents="true">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="com.android.settings.SHORTCUT" />
- </intent-filter>
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.DataUsageSummary" />
- <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
- android:resource="@id/wireless_settings" />
- </activity>
+ <activity android:name=".cyanogenmod.SystemSettings" />
+
+ <activity android:name=".cyanogenmod.PerformanceSettings" />
- <!-- CyanogenMod activities Start -->
<activity android:name=".profiles.ProfilesSettings" />
<activity android:name=".profiles.ProfileConfig" />
@@ -1519,9 +1488,13 @@
<activity android:name=".notificationlight.BatteryLightSettings" />
- <activity android:name=".cyanogenmod.SystemSettings" />
-
- <activity android:name=".cyanogenmod.PowerWidget" />
+ <activity android:name="Settings$AnonymousStatsActivity"
+ android:label="@string/anonymous_statistics_title"
+ android:configChanges="orientation|keyboardHidden|screenSize"
+ android:clearTaskOnLaunch="true">
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.cmstats.AnonymousStats" />
+ </activity>
<activity android:name=".cyanogenmod.ChangeLog" android:label="@string/changelog_title">
<intent-filter>
@@ -1531,6 +1504,36 @@
<!-- CyanogenMod activities End -->
+ <!-- Pseudo-activity used to provide an intent-filter entry point to encryption settings -->
+ <activity android:name="Settings$CryptKeeperSettingsActivity"
+ android:label="@string/crypt_keeper_encrypt_title">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <action android:name="android.app.action.START_ENCRYPTION" />
+ <category android:name="android.intent.category.DEFAULT" /> />
+ </intent-filter>
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.CryptKeeperSettings" />
+ <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+ android:resource="@id/security_settings" />
+ </activity>
+
+ <activity android:name="Settings$DataUsageSummaryActivity"
+ android:label="@string/data_usage_summary_title"
+ android:uiOptions="none"
+ android:taskAffinity=""
+ android:excludeFromRecents="true">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="com.android.settings.SHORTCUT" />
+ </intent-filter>
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.DataUsageSummary" />
+ <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+ android:resource="@id/wireless_settings" />
+ </activity>
+
<receiver android:name=".widget.SettingsAppWidgetProvider"
android:label="@string/gadget_title"
android:exported="true"
@@ -1554,6 +1557,12 @@
</intent-filter>
</receiver>
+ <receiver android:name=".cyanogenmod.BootReceiver" android:enabled="true">
+ <intent-filter>
+ <action android:name="android.intent.action.BOOT_COMPLETED" />
+ </intent-filter>
+ </receiver>
+
<!-- Watch for ContactsContract.Profile changes and update the user's photo. -->
<receiver android:name=".users.ProfileUpdateReceiver">
<intent-filter>