X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=AndroidManifest.xml;h=883a672f997deaabb5bedef9b8bb4f2e1965e1fd;hb=eb06d4a9c2a1c66d312c48365052a83ca8021e62;hp=5131dd102b8aa990ac04db008f9703677550bc86;hpb=88832a3d4d48b94a3c43a6240dff75b5d486681b;p=android-x86%2Fpackages-apps-Settings.git

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5131dd102b..883a672f99 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -91,7 +91,7 @@
             android:requiredForAllUsers="true"
             android:supportsRtl="true"
             android:allowBackup="false"
-            android:usesCleartextTraffic="false">
+            android:usesCleartextTraffic="true">
 
         <!-- Settings -->
 
@@ -956,11 +956,6 @@
             <intent-filter android:priority="1">
                 <action android:name="android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="package" />
-            </intent-filter>
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.ManageApplications" />
@@ -968,6 +963,17 @@
                 android:value="true" />
         </activity>
 
+        <activity android:name=".fuelgauge.RequestIgnoreBatteryOptimizations"
+                android:label="@string/high_power_apps"
+                android:taskAffinity=""
+                android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+        </activity>
+
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name=".applications.ManageApplications"
                 android:label="@string/applications_settings"
@@ -1403,7 +1409,7 @@
         <!-- Lock screen settings -->
         <activity android:name="ConfirmDeviceCredentialActivity"
             android:exported="true"
-            android:theme="@style/Transparent">
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter android:priority="1">
                 <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1822,7 +1828,7 @@
                   android:excludeFromRecents="true"
                   android:exported="true"
                   android:permission="android.permission.MANAGE_USB"
-                  android:theme="@style/Transparent">
+                  android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar">
         </activity>
 
         <activity android:name=".bluetooth.RequestPermissionHelperActivity"