am 985f5efc: Add "settings" to a bunch of screens. Fix 2110077, 2115734, 2101651

[android-x86/packages-apps-Settings.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e61d375..152c636 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <uses-permission android:name="com.google.android.providers.gmail.permission.READ_GMAIL" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
+    <uses-permission android:name="android.permission.DEVICE_POWER" />
     <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -65,7 +66,7 @@
         <!-- Wireless Controls -->
 
         <activity android:name="WirelessSettings" 
-                android:label="@string/radio_controls_title"
+                android:label="@string/wireless_networks_settings_title"
                 >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -159,8 +160,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="DateTimeSettingsSetupWizard" android:label="@string/date_and_time">
-            android:screenOrientation="portrait"
+        <activity android:name="DateTimeSettingsSetupWizard" android:label="@string/date_and_time"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -181,7 +182,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="LanguageSettings" android:label="@string/language_picker_title"
+        <activity android:name="LanguageSettings"
+                android:label="@string/language_keyboard_settings_title"
                 android:clearTaskOnLaunch="true"
                 >
             <intent-filter>
@@ -214,7 +216,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="SoundAndDisplaySettings" android:label="@string/sound_and_display_settings"
+        <activity android:name="SoundAndDisplaySettings"
+                android:label="@string/sound_and_display_settings_title"
                 android:clearTaskOnLaunch="true"
                 >
             <intent-filter>
@@ -291,7 +294,8 @@
             </intent-filter>
         </activity>
         
-        <activity android:name="SecuritySettings" android:label="@string/security_settings_title"
+        <activity android:name="SecuritySettings"
+                android:label="@string/location_security_settings_title"
                 android:configChanges="orientation|keyboardHidden"
                 android:clearTaskOnLaunch="true"
                 >
@@ -299,7 +303,6 @@
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.SECURITY_SETTINGS" />
                 <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
-                <action android:name="android.security.ADD_CREDENTIAL" />
                 <action android:name="android.security.UNLOCK_CREDENTIAL_STORAGE" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
@@ -316,8 +319,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="AccessibilitySettings" android:label="@string/accessibility_settings_title"
-                android:theme="@android:style/Theme.NoTitleBar">
+        <activity android:name="AccessibilitySettings"
+                android:label="@string/accessibility_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.ACCESSIBILITY_SETTINGS" />
@@ -372,7 +375,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".deviceinfo.Memory" android:label="@string/storage_settings_title">
+        <activity android:name=".deviceinfo.Memory"
+                android:label="@string/storage_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.INTERNAL_STORAGE_SETTINGS" />
@@ -444,7 +448,7 @@
                   android:label="@string/bluetooth_connect_specific_profiles_title" />
 
         <activity android:name=".bluetooth.BluetoothPairingDialog"
-                  android:label="@string/bluetooth_pairing_dialog"
+                  android:label="@string/bluetooth_pairing_request"
                   android:excludeFromRecents="true"
                   android:theme="@*android:style/Theme.Dialog.Alert">
             <intent-filter>