Import translations. DO NOT MERGE

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a39c489..80092b2 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -352,6 +352,10 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".EnableWifiTether"
+            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+            android:excludeFromRecents="true" />
+
         <activity android:name="Settings$TetherSettingsActivity"
                 android:label="@string/tether_settings_title_all"
                 android:taskAffinity="">
@@ -1110,6 +1114,9 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".SetupRedactionInterstitial"
+            android:theme="@style/SetupWizardDisableAppStartingTheme"/>
+
         <activity android:name=".notification.RedactionInterstitial"/>
 
         <activity android:name=".notification.RedactionSettingsStandalone"
@@ -1160,11 +1167,23 @@
             android:excludeFromRecents="true"
         />
 
+        <activity android:name="SetupChooseLockPattern"
+            android:exported="false"
+            android:theme="@style/SetupWizardDisableAppStartingTheme" />
+
         <activity android:name="ChooseLockPattern" android:exported="false"/>
 
+        <activity android:name="SetupChooseLockPassword"
+            android:exported="false"
+            android:theme="@style/SetupWizardDisableAppStartingTheme"
+            android:windowSoftInputMode="stateVisible|adjustResize" />
+
         <activity android:name="ChooseLockPassword" android:exported="false"
             android:windowSoftInputMode="stateVisible|adjustResize"/>
 
+        <activity android:name=".SetupEncryptionInterstitial"
+            android:theme="@style/SetupWizardDisableAppStartingTheme"/>
+
         <activity android:name=".EncryptionInterstitial"/>
 
         <!-- Runs in the phone process since it needs access to the Phone object -->
@@ -2019,6 +2038,15 @@
                 android:resource="@id/sim_settings" />
         </activity>
 
+        <activity android:name=".sim.SimDialogActivity"
+                android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar"
+                android:label="@string/sim_settings_title">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
         <provider
             android:name=".search.SettingsSearchIndexablesProvider"
             android:authorities="com.android.settings"