summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorTodd Volkert <tvolkert@google.com>2015-07-13 23:37:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-13 23:37:39 +0000
commitfeff15ea38f4d85f5f4529e09baed1a12aff2bf7 (patch)
tree3adedf2940a94937d5fba2e9df9f74cb8ae797cd /res
parent3b0e55597d7a214f74be3a5bbf473a8a8c82724a (diff)
parentdc2b0ed3e30a02ca37c047e7210e696216910d08 (diff)
downloadandroid_packages_apps_PackageInstaller-feff15ea38f4d85f5f4529e09baed1a12aff2bf7.tar.gz
android_packages_apps_PackageInstaller-feff15ea38f4d85f5f4529e09baed1a12aff2bf7.tar.bz2
android_packages_apps_PackageInstaller-feff15ea38f4d85f5f4529e09baed1a12aff2bf7.zip
am dc2b0ed3: am c5fe8336: Merge "Don\'t flash "No apps" while loading permissions screens on TV" into mnc-dev
* commit 'dc2b0ed3e30a02ca37c047e7210e696216910d08': Don't flash "No apps" while loading permissions screens on TV
Diffstat (limited to 'res')
-rw-r--r--res/layout-television/permissions_frame.xml22
1 files changed, 14 insertions, 8 deletions
diff --git a/res/layout-television/permissions_frame.xml b/res/layout-television/permissions_frame.xml
index 14cb0883..da0b2555 100644
--- a/res/layout-television/permissions_frame.xml
+++ b/res/layout-television/permissions_frame.xml
@@ -22,20 +22,26 @@
android:filterTouchesWhenObscured="true">
<FrameLayout
- android:id="@+id/prefs_container"
android:layout_width="@dimen/lb_action_section_width"
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:background="@color/lb_action_fragment_background">
- <TextView
- android:id="@+id/no_permissions"
+ <FrameLayout
+ android:id="@+id/prefs_container"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:text="@string/no_permissions"
- android:gravity="center"
- android:textAppearance="@android:style/TextAppearance.Large"
- />
+ android:layout_height="match_parent">
+
+ <TextView
+ android:id="@+id/no_permissions"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:text="@string/no_permissions"
+ android:gravity="center"
+ android:textAppearance="@android:style/TextAppearance.Large"
+ />
+
+ </FrameLayout>
</FrameLayout>