diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-02-13 13:54:58 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-02-15 00:07:30 +0000 |
| commit | 20a2aaa9595e9ab958d27eb430af6560e24ba78c (patch) | |
| tree | d810cc69bfa5db15a0d8833cfc73a4618a0eee73 /AndroidManifest.xml | |
| parent | f0ad93f3b99b9fd7c5191dc9fa91c59809d48870 (diff) | |
| parent | 29a4eb7a33da12a957b3305138ada69140d8ab75 (diff) | |
| download | packages_apps_settings-20a2aaa9595e9ab958d27eb430af6560e24ba78c.zip packages_apps_settings-20a2aaa9595e9ab958d27eb430af6560e24ba78c.tar.gz packages_apps_settings-20a2aaa9595e9ab958d27eb430af6560e24ba78c.tar.bz2 | |
Merge commit 'android-4.2.2_r1' into mr1.1-staging
Conflicts:
AndroidManifest.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-es/strings.xml
res/values-fi/strings.xml
res/values-hu/strings.xml
res/values-it/strings.xml
res/values-iw/strings.xml
res/values-nl/strings.xml
res/values-ru/strings.xml
res/values-zh-rCN/strings.xml
res/values/strings.xml
src/com/android/settings/ChooseLockGeneric.java
src/com/android/settings/ChooseLockPatternTutorial.java
src/com/android/settings/DeviceInfoSettings.java
src/com/android/settings/Settings.java
Change-Id: I275be467a401ad6dcc7966924358a5adb0773b75
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bd78ce7..72be71b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -62,6 +62,7 @@ <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" /> + <uses-permission android:name="android.permission.SET_TIME" /> <application android:label="@string/settings_label" android:icon="@mipmap/ic_launcher_settings" @@ -253,6 +254,7 @@ </activity-alias> <activity android:name="Settings$ApnSettingsActivity" android:label="@string/apn_settings" + android:uiOptions="none" android:configChanges="orientation|keyboardHidden|screenSize" android:launchMode="singleTask" android:clearTaskOnLaunch="true"> <intent-filter> @@ -306,6 +308,7 @@ <activity android:name="Settings$TetherSettingsActivity" android:label="@string/tether_settings_title_all" + android:uiOptions="none" android:taskAffinity="" android:excludeFromRecents="true"> <intent-filter> @@ -327,6 +330,7 @@ <!-- Keep compatibility with old shortcuts. --> <activity-alias android:name=".TetherSettings" android:label="@string/tether_settings_title_all" + android:uiOptions="none" android:clearTaskOnLaunch="true" android:exported="true" android:targetActivity="Settings$TetherSettingsActivity"> @@ -765,6 +769,7 @@ <activity android:name="Settings$LocationSettingsActivity" android:label="@string/location_settings_title" + android:uiOptions="none" android:configChanges="orientation|keyboardHidden|screenSize" android:taskAffinity="" android:excludeFromRecents="true"> @@ -960,8 +965,6 @@ <activity android:name="ChooseLockPassword" android:exported="false" android:windowSoftInputMode="stateVisible|adjustResize"/> - <activity android:name="ChooseLockPatternTutorial" android:exported="false"/> - <!-- Anonymous Statistics --> <receiver android:name=".cmstats.ReportingServiceManager" android:enabled="true" @@ -1588,6 +1591,22 @@ android:resource="@id/wireless_settings" /> </activity> + <activity android:name="Settings$DreamSettingsActivity" + android:label="@string/screensaver_settings_title" + android:taskAffinity="" + android:excludeFromRecents="true"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <action android:name="android.settings.DREAM_SETTINGS" /> + <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.DreamSettings" /> + <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" + android:resource="@id/display_settings" /> + </activity> + <receiver android:name=".widget.SettingsAppWidgetProvider" android:label="@string/gadget_title" android:exported="true" |