summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorTodd Volkert <tvolkert@google.com>2015-07-14 00:42:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-14 00:42:29 +0000
commit2631309cd66c74575ede64b1c11135b8acce6bfe (patch)
tree20cf4956b54a67d5ce39b88db733dce233ee3d42 /res
parent5df7e6ee28dff92fe6aa4068203619afade95e20 (diff)
parentfeff15ea38f4d85f5f4529e09baed1a12aff2bf7 (diff)
downloadandroid_packages_apps_PackageInstaller-2631309cd66c74575ede64b1c11135b8acce6bfe.tar.gz
android_packages_apps_PackageInstaller-2631309cd66c74575ede64b1c11135b8acce6bfe.tar.bz2
android_packages_apps_PackageInstaller-2631309cd66c74575ede64b1c11135b8acce6bfe.zip
am feff15ea: am dc2b0ed3: am c5fe8336: Merge "Don\'t flash "No apps" while loading permissions screens on TV" into mnc-dev
* commit 'feff15ea38f4d85f5f4529e09baed1a12aff2bf7': 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>