am 24d61952: Import revised translations. DO NOT MERGE

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a94258e..7879d0c 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4,8 +4,7 @@
 
     <original-package android:name="com.android.settings" />
 
-    <uses-permission android:name="com.google.android.gm.permission.WRITE_GMAIL" />
-    <uses-permission android:name="com.google.android.gm.permission.READ_GMAIL" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <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" />
@@ -48,6 +47,8 @@
     <uses-permission android:name="android.permission.READ_SYNC_STATS" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.STATUS_BAR" />
+    <uses-permission android:name="android.permission.MANAGE_USB" />
 
     <application android:label="@string/settings_label"
             android:icon="@mipmap/ic_launcher_settings"
@@ -109,7 +110,6 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.WIFI_SETTINGS" />
-                <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
@@ -124,10 +124,22 @@
                 android:value="com.android.settings.Settings$WirelessSettingsActivity" />
         </activity>
 
+        <activity android:name=".wifi.WifiPickerActivity"
+                  android:theme="@android:style/Theme.Holo"
+                  android:clearTaskOnLaunch="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name=".wifi.WifiSettingsForSetupWizardXL"
                   android:theme="@android:style/Theme.Holo.NoActionBar"
+                  android:windowBackground="@drawable/setups_bg_default"
                   android:clearTaskOnLaunch="true"
-                  android:screenOrientation="landscape"
+                  android:screenOrientation="sensorLandscape"
+                  android:windowSoftInputMode="adjustResize"
                   android:exported="true" />
 
         <activity-alias android:name=".wifi.AdvancedSettings"
@@ -267,7 +279,6 @@
         <activity android:name="Settings$VpnSettingsActivity"
                 android:theme="@android:style/Theme.Holo"
                 android:label="@string/vpn_settings_activity_title"
-                android:configChanges="orientation|keyboardHidden"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -304,6 +315,7 @@
         <activity android:name="DateTimeSettingsSetupWizard"
                   android:label="@string/date_and_time"
                   android:theme="@android:style/Theme.Holo.NoActionBar"
+                  android:windowBackground="@drawable/setups_bg_default"
                   android:screenOrientation="behind">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -343,25 +355,17 @@
                 android:resource="@id/language_settings" />
         </activity>
 
-        <activity android:name="Settings$InputMethodAndSubtypeEnablerActivity"
+        <activity android:name=".inputmethod.InputMethodAndSubtypeEnablerActivity"
                 android:theme="@android:style/Theme.Holo"
                 android:label="@string/input_methods_and_subtype_enabler_title"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER" />
+                <action android:name="android.settings.INPUT_METHOD_SUBTYPE_SETTINGS" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <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.inputmethod.InputMethodAndSubtypeEnabler" />
-            <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>
 
         <activity android:name="Settings$InputMethodConfigActivity"
@@ -381,15 +385,6 @@
                 android:resource="@id/language_settings" />
         </activity>
 
-        <activity android:name="PhysicalKeyboardSettings"
-                android:label="@string/builtin_keyboard_settings_title"
-                android:theme="@android:style/Theme.Holo.DialogWhenLarge">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
         <activity android:name="Settings$UserDictionarySettingsActivity"
                 android:theme="@android:style/Theme.Holo"
                 android:label="@string/user_dict_settings_titlebar"
@@ -452,8 +447,8 @@
         <activity android:name="Settings$DockSettingsActivity"
                 android:theme="@android:style/Theme.Holo"
                 android:label="@string/dock_settings_title"
-                android:clearTaskOnLaunch="true"
-                android:enabled="@bool/has_dock_settings">
+                android:enabled="@bool/has_dock_settings"
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.settings.DOCK_SETTINGS" />
@@ -625,14 +620,6 @@
                 android:resource="@id/security_settings" />
         </activity>
 
-        <activity android:name="CredentialInstaller"
-                android:theme="@android:style/Theme.Translucent.NoTitleBar">
-            <intent-filter>
-                <action android:name="android.credentials.SYSTEM_INSTALL" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
         <activity android:name="Settings$PrivacySettingsActivity"
                 android:theme="@android:style/Theme.Holo"
                 android:label="@string/privacy_settings_title"
@@ -650,9 +637,21 @@
                 android:resource="@id/privacy_settings" />
         </activity>
 
-        <activity android:name="DeviceAdminSettings"
+        <activity android:name="CredentialStorage"
+                android:theme="@style/Transparent"
+                android:configChanges="orientation|keyboardHidden">
+            <intent-filter>
+                <action android:name="com.android.credentials.UNLOCK" />
+                <action android:name="com.android.credentials.INSTALL" />
+                <action android:name="com.android.credentials.SET_PASSWORD" />
+                <action android:name="com.android.credentials.RESET" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="Settings$DeviceAdminSettingsActivity"
                 android:label="@string/device_admin_settings_title"
-                android:theme="@style/TallTitleBarTheme"
+                android:theme="@android:style/Theme.Holo"
                 android:clearTaskOnLaunch="true"
                 >
             <intent-filter>
@@ -661,11 +660,19 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
+            <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/location_security_settings_title" />
+            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
+                android:value="com.android.settings.Settings$SecuritySettingsActivity" />
         </activity>
 
         <activity android:name="DeviceAdminAdd"
                 android:label="@string/device_admin_add_title"
-                android:theme="@style/TallTitleBarTheme"
+                android:theme="@android:style/Theme.Holo.DialogWhenLarge"
                 android:clearTaskOnLaunch="true"
                 >
             <intent-filter>
@@ -712,11 +719,10 @@
 
 
         <!-- Lock screen settings -->
-        <activity android:name="ConfirmLockPattern"
-            android:label="@string/lockpassword_confirm_your_pattern_header"/>
+        <activity android:name="ConfirmLockPattern"/>
 
         <activity android:name="ConfirmLockPassword"
-            android:label="@string/lockpassword_confirm_your_password_header"/>>
+            android:windowSoftInputMode="stateVisible|adjustResize"/>
 
         <activity android:name="ChooseLockGeneric"
             android:label="@string/lockpassword_choose_lock_generic_header">
@@ -726,14 +732,12 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="ChooseLockPattern" android:exported="false"
-            android:label="@string/lockpassword_choose_your_pattern_header"/>
+        <activity android:name="ChooseLockPattern" android:exported="false"/>
 
         <activity android:name="ChooseLockPassword" android:exported="false"
-            android:label="@string/lockpassword_choose_your_password_header"/>
+            android:windowSoftInputMode="stateVisible|adjustResize"/>
 
-        <activity android:name="ChooseLockPatternTutorial"
-            android:label="@string/lockpassword_choose_your_pattern_header"/>
+        <activity android:name="ChooseLockPatternTutorial" android:exported="false"/>
 
         <!-- Runs in the phone process since it needs access to the Phone object -->
         <activity android:name=".deviceinfo.Status"
@@ -763,6 +767,9 @@
                 android:resource="@id/storage_settings" />
         </activity>
 
+        <activity android:name=".deviceinfo.MiscFilesHandler"
+                android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
+
         <activity android:name="ApnEditor"
                 android:label="@string/apn_edit"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge">
@@ -858,6 +865,15 @@
         </activity>
 
         <receiver
+            android:name=".bluetooth.BluetoothDiscoveryReceiver">
+            <intent-filter>
+                <action android:name="android.bluetooth.adapter.action.DISCOVERY_STARTED" />
+                <action android:name="android.bluetooth.adapter.action.DISCOVERY_FINISHED" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </receiver>
+
+        <receiver
             android:name=".bluetooth.DockEventReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.DOCK_EVENT" />
@@ -989,8 +1005,7 @@
         <activity android:name="AppWidgetPickActivity"
                 android:label="@string/widget_picker_title"
                 android:theme="@*android:style/Theme.Dialog.Alert"
-                android:finishOnCloseSystemDialogs="true"
-                android:enabled="@bool/has_powercontrol_widget">
+                android:finishOnCloseSystemDialogs="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_PICK" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1006,7 +1021,7 @@
 
         <activity android:name="Settings$PowerUsageSummaryActivity"
                 android:theme="@android:style/Theme.Holo"
-                android:label="@string/storage_settings_title">
+                android:label="@string/power_usage_summary_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
@@ -1054,6 +1069,7 @@
 
         <activity android:name="com.android.settings.accounts.AddAccountSettings"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:configChanges="orientation|keyboardHidden"
             android:label="@string/header_add_an_account">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1066,9 +1082,49 @@
             android:label="@string/header_add_an_account"
             android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
 
+        <activity android:name=".CryptKeeper"
+                  android:immersive="true"
+                  android:launchMode="singleTop"
+                  android:theme="@android:style/Theme.Holo.NoActionBar"
+                  android:windowSoftInputMode="stateAlwaysHidden">
+            <intent-filter android:priority="10">
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.HOME" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".CryptKeeper$Blank"
+            android:immersive="true"
+            android:launchMode="singleTop"
+            android:theme="@style/CryptKeeperBlankTheme"
+        />
+
+        <activity android:name=".CryptKeeperConfirm$Blank"
+            android:immersive="true"
+            android:launchMode="singleTop"
+            android:theme="@style/CryptKeeperBlankTheme"
+        />
+
+        <!-- Pseudo-activity used to provide an intent-filter entry point to encryption settings -->
+        <activity android:name="Settings$CryptKeeperSettingsActivity"
+                android:theme="@android:style/Theme.Holo"
+                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>
+
         <receiver android:name=".widget.SettingsAppWidgetProvider"
-                android:label="@string/gadget_title" android:exported="false"
-                android:enabled="@bool/has_powercontrol_widget">
+                android:label="@string/gadget_title"
+                android:exported="false"
+                android:enabled="false">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />