diff options
| author | Jason Monk <jmonk@google.com> | 2015-08-06 16:08:03 -0400 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2015-08-07 12:43:02 -0400 |
| commit | 5c07dcb0698725e7949b030665d21f96c916f3b8 (patch) | |
| tree | 52ef0f442d18c0b5f21e0425704ecd43c88ac77f /res | |
| parent | cea90ebdaf0156d4796735f9581982a545c81b31 (diff) | |
| download | android_packages_apps_PackageInstaller-5c07dcb0698725e7949b030665d21f96c916f3b8.tar.gz android_packages_apps_PackageInstaller-5c07dcb0698725e7949b030665d21f96c916f3b8.tar.bz2 android_packages_apps_PackageInstaller-5c07dcb0698725e7949b030665d21f96c916f3b8.zip | |
Show warning when touches are being blocked by overlays
Bug: 22317719
Change-Id: I5f6526bcce382ae6fabe32d3f8842567d8dc8701
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> |