diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 02:00:43 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 15:44:26 +0000 |
| commit | 90852d4675c9b7df6faf036efb7fe73b5f816293 (patch) | |
| tree | 18ea2755ab5ea68669a7951d5a07daadc4870b0a /AndroidManifest.xml | |
| parent | 3dbac3fff036f5a464f6322200c59f9934ebf610 (diff) | |
| parent | 310423e73156dab1c7c8f50dc67fdbc326cd37f7 (diff) | |
| download | packages_apps_Settings-90852d4675c9b7df6faf036efb7fe73b5f816293.zip packages_apps_Settings-90852d4675c9b7df6faf036efb7fe73b5f816293.tar.gz packages_apps_Settings-90852d4675c9b7df6faf036efb7fe73b5f816293.tar.bz2 | |
Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
Conflicts:
res/values-fr/strings.xml
res/values-it/strings.xml
res/values-ja/strings.xml
res/values-nl/strings.xml
res/values-pl/strings.xml
res/values-ro/strings.xml
res/values-ru/strings.xml
res/values-zh-rCN/strings.xml
res/values/bools.xml
res/values/strings.xml
res/xml/development_prefs.xml
src/com/android/settings/DevelopmentSettings.java
src/com/android/settings/DeviceInfoSettings.java
src/com/android/settings/DisplaySettings.java
Change-Id: I9fd9e793cf6097d950f8a1e30771c8bdf5067906
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6ebbd51..f616e20 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -93,7 +93,7 @@ android:requiredForAllUsers="true" android:supportsRtl="true" android:allowBackup="false" - android:usesCleartextTraffic="false"> + android:usesCleartextTraffic="true"> <!-- Screen color Settings Controls --> <activity android:name=".ScreenColorSettings" android:label="@string/screencolor" @@ -1423,7 +1423,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" /> @@ -1842,7 +1842,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" @@ -2486,6 +2486,19 @@ android:resource="@id/notification_settings" /> </activity> + <!-- Show Manual (from settings item) --> + <activity android:name="ManualDisplayActivity" + android:label="@string/manual" + android:taskAffinity="" + android:enabled="@bool/config_show_manual"> + <intent-filter> + <action android:name="android.settings.SHOW_MANUAL" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" + android:value="true" /> + </activity> + <!-- Show regulatory info (from settings item or dialing "*#07#") --> <activity android:name="RegulatoryInfoDisplayActivity" android:label="@string/regulatory_information" |