OSDN Git Service

Fix the tethering help page.
[android-x86/packages-apps-Settings.git] / AndroidManifest.xml
index 80c9766..78c0f5b 100644 (file)
 
         <activity android:name=".vpn.VpnSettings"
                 android:configChanges="orientation|keyboardHidden"
-                android:launchMode="singleTask">
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.net.vpn.SETTINGS" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
         </activity>
-        
+
         <activity android:name="VoiceInputOutputSettings"
                 android:label="@string/voice_input_output_settings">
             <intent-filter>
             android:theme="@android:style/Theme.NoTitleBar">
         </activity>
 
-        <activity android:name="ChooseLockGeneric"
-                android:theme="@android:style/Theme.NoDisplay">
+        <activity android:name="ChooseLockGeneric">
             <intent-filter>
                 <action android:name="android.app.action.SET_NEW_PASSWORD" />
                 <category android:name="android.intent.category.DEFAULT" />
         </activity>
 
         <activity android:name="ChooseLockPattern"
-                android:label="@string/lockpattern_change_lock_pattern_label">
+                android:label="@string/lockpattern_change_lock_pattern_label"
+                android:exported="false">
         </activity>
 
         <activity android:name="ChooseLockPassword"
                 android:label="@string/lockpattern_change_lock_pin_label"
-            android:theme="@android:style/Theme.NoTitleBar">
+            android:theme="@android:style/Theme.NoTitleBar"
+            android:exported="false">
         </activity>
 
         <activity android:name="ChooseLockPatternTutorial"
             <intent-filter>
                 <action android:name="android.intent.action.DOCK_EVENT" />
                 <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
+                <action android:name="android.bluetooth.headset.action.STATE_CHANGED" />
+                <action android:name="android.bluetooth.a2dp.action.SINK_STATE_CHANGED" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>