am c4dba451: am b26bec1a: am 83930bc3: am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s...

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4360443..99133a5 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -197,7 +197,8 @@
                 android:theme="@style/SetupWizardDisableAppStartingTheme"
                 android:label="@string/wifi_setup_wizard_title"
                 android:icon="@drawable/empty_icon"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:windowSoftInputMode="adjustNothing">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.net.wifi.SETUP_WIFI_NETWORK" />
@@ -351,6 +352,16 @@
             </intent-filter>
         </activity>
 
+        <service android:name=".TetherService"
+            android:exported="true"
+            android:permission="android.permission.CONNECTIVITY_INTERNAL" />
+        <receiver
+            android:name=".HotspotOffReceiver" >
+            <intent-filter>
+                <action android:name="android.net.wifi.WIFI_AP_STATE_CHANGED" />
+            </intent-filter>
+        </receiver>
+
         <activity android:name="Settings$TetherSettingsActivity"
                 android:label="@string/tether_settings_title_all"
                 android:taskAffinity="">
@@ -1102,7 +1113,8 @@
 
         <!-- Lock screen settings -->
         <activity android:name="ConfirmDeviceCredentialActivity"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/Transparent">
             <intent-filter>
                 <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1110,6 +1122,7 @@
         </activity>
 
         <activity android:name=".SetupRedactionInterstitial"
+            android:taskAffinity="com.android.wizard"
             android:theme="@style/SetupWizardDisableAppStartingTheme"/>
 
         <activity android:name=".notification.RedactionInterstitial"/>
@@ -1139,7 +1152,7 @@
         <activity android:name="SetupChooseLockGeneric"
             android:taskAffinity="com.android.wizard"
             android:theme="@style/SetupWizardDisableAppStartingTheme"
-            android:label="@string/lockpassword_choose_lock_generic_header">
+            android:label="@string/lock_settings_picker_title">
             <intent-filter>
                 <action android:name="com.android.settings.SETUP_LOCK_SCREEN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1164,12 +1177,14 @@
 
         <activity android:name="SetupChooseLockPattern"
             android:exported="false"
+            android:taskAffinity="com.android.wizard"
             android:theme="@style/SetupWizardDisableAppStartingTheme" />
 
         <activity android:name="ChooseLockPattern" android:exported="false"/>
 
         <activity android:name="SetupChooseLockPassword"
             android:exported="false"
+            android:taskAffinity="com.android.wizard"
             android:theme="@style/SetupWizardDisableAppStartingTheme"
             android:windowSoftInputMode="stateVisible|adjustResize" />
 
@@ -1177,6 +1192,7 @@
             android:windowSoftInputMode="stateVisible|adjustResize"/>
 
         <activity android:name=".SetupEncryptionInterstitial"
+            android:taskAffinity="com.android.wizard"
             android:theme="@style/SetupWizardDisableAppStartingTheme"/>
 
         <activity android:name=".EncryptionInterstitial"/>
@@ -2033,6 +2049,14 @@
                 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" />
+            </intent-filter>
+        </activity>
+
         <provider
             android:name=".search.SettingsSearchIndexablesProvider"
             android:authorities="com.android.settings"