diff options
author | Jason Monk <jmonk@google.com> | 2015-08-07 19:13:57 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 19:13:57 +0000 |
commit | 2b35ed61ee39ae7e416a209ebd4309fbcea0c4f5 (patch) | |
tree | f8dacb7a0a4be12215c0dcbb27af73ecfa2ceec6 /res | |
parent | 9845cb89f5972078736e27efbd006796b0a613bc (diff) | |
parent | 0ac52fc3802f122559000719a1d026444f6c63f3 (diff) | |
download | android_packages_apps_PackageInstaller-2b35ed61ee39ae7e416a209ebd4309fbcea0c4f5.tar.gz android_packages_apps_PackageInstaller-2b35ed61ee39ae7e416a209ebd4309fbcea0c4f5.tar.bz2 android_packages_apps_PackageInstaller-2b35ed61ee39ae7e416a209ebd4309fbcea0c4f5.zip |
am 0ac52fc3: am 14595d69: am 0c5d3ddf: Merge "Show warning when touches are being blocked by overlays" into mnc-dev
* commit '0ac52fc3802f122559000719a1d026444f6c63f3':
Show warning when touches are being blocked by overlays
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/grant_permissions.xml | 1 | ||||
-rw-r--r-- | res/layout/header.xml | 2 | ||||
-rw-r--r-- | res/layout/permissions_frame.xml | 3 | ||||
-rwxr-xr-x | res/values/styles.xml | 2 | ||||
-rw-r--r-- | res/values/themes.xml | 4 |
5 files changed, 5 insertions, 7 deletions
diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml index 87b51d2b..b3565240 100644 --- a/res/layout/grant_permissions.xml +++ b/res/layout/grant_permissions.xml @@ -26,7 +26,6 @@ android:paddingBottom="8dip" android:paddingStart="22dip" android:paddingEnd="16dip" - android:filterTouchesWhenObscured="true" android:orientation="vertical"> <FrameLayout diff --git a/res/layout/header.xml b/res/layout/header.xml index f9b27af6..0e000a4d 100644 --- a/res/layout/header.xml +++ b/res/layout/header.xml @@ -35,7 +35,7 @@ android:layout_marginStart="@dimen/header_subsettings_margin_start" android:layout_alignWithParentIfMissing="true" android:layout_centerVertical="true" - android:textAppearance="@android:style/TextAppearance.Material.Medium" + android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@android:color/white" android:textAlignment="viewStart" /> diff --git a/res/layout/permissions_frame.xml b/res/layout/permissions_frame.xml index 5e0d9ec1..8f1f2789 100644 --- a/res/layout/permissions_frame.xml +++ b/res/layout/permissions_frame.xml @@ -22,8 +22,7 @@ <FrameLayout android:id="@+id/prefs_container" android:layout_width="match_parent" - android:layout_height="match_parent" - android:filterTouchesWhenObscured="true"> + android:layout_height="match_parent"> <TextView android:id="@+id/no_permissions" diff --git a/res/values/styles.xml b/res/values/styles.xml index 6d772910..9c166971 100755 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -24,7 +24,7 @@ <item name="android:backgroundDimEnabled">true</item> </style> - <style name="Theme.Header.Settings" parent="@android:style/Theme.Material.Settings"> + <style name="Theme.Header.Settings" parent="@android:style/Theme.DeviceDefault.Settings"> </style> <style name="PreferenceThemeOverlay.v14.Permissions"> diff --git a/res/values/themes.xml b/res/values/themes.xml index 3f8f59d9..2f9c2b55 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -16,11 +16,11 @@ --> <resources> - <style name="Settings" parent="@android:style/Theme.Material.Settings"> + <style name="Settings" parent="@android:style/Theme.DeviceDefault.Settings"> <item name="android:actionBarStyle">@style/ActionBar</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Permissions</item> </style> <style name="GrantPermissions" - parent="@android:style/Theme.Material.Light.Dialog.NoActionBar" /> + parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar" /> </resources> |